Commit a34c10d8 authored by Lucas Braz Cunha's avatar Lucas Braz Cunha

Merge Fix

Signed-off-by: Lucas Braz Cunha's avatarLucas B. Cunha <lbc16@inf.ufpr.br>
parent 4f7b0a84
......@@ -53,11 +53,12 @@
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="portrait" />
<activity android:name=".CitizenListActivity" />
<activity android:name=".SchedulesActivity" />
<activity android:name=".ScheduleConfirmationActivity" />
<activity android:name=".DependentUpdateActivity" />
<activity android:name=".NewDependentActivity" />
<activity android:name=".RetrievalFailureActivity" />
<activity android:name=".RetrievalSuccessActivity"></activity>
<activity android:name=".RetrievalSuccessActivity"/>
</application>
</manifest>
\ No newline at end of file
......@@ -2,11 +2,11 @@ package br.ufpr.c3sl.agendador.agendador;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.view.menu.MenuBuilder;
import android.support.v7.widget.ActionMenuView;
import android.support.v7.widget.RecyclerView;
......@@ -18,7 +18,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import br.ufpr.c3sl.agendador.agendador.helpers.ObscuredSharedPreferences;
import br.ufpr.c3sl.agendador.agendador.helpers.UserPhotoHelper;
import br.ufpr.c3sl.agendador.agendador.helpers.UserImgHelper;
import br.ufpr.c3sl.agendador.agendador.helpers.Utils;
public class SchedulesActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
......@@ -71,7 +72,7 @@ public class SchedulesActivity extends AppCompatActivity implements NavigationVi
ImageView drawerProfilePicture = (ImageView) headerView.findViewById(R.id.img_drawerheader_citizen_photo);
UserPhotoHelper userPhotoHelper = new UserPhotoHelper(getBaseContext());
UserImgHelper userImgHelper = new UserImgHelper(getBaseContext());
TextView drawerCitizenName = (TextView) headerView.findViewById(R.id.tv_drawerheader_citizen_name);
......@@ -81,10 +82,11 @@ public class SchedulesActivity extends AppCompatActivity implements NavigationVi
drawerCityName.setText(citizenCity);
if(userPhotoHelper.existsPhoto()){
userPhotoHelper.updateImgView(drawerProfilePicture, userPhotoHelper.getPhotoFileUri());
if(userImgHelper.existsPhoto(Utils.USR_PICT_FILE_NAME, osb.getLong(Utils.ID, 0))){
drawerProfilePicture.setImageBitmap(userImgHelper.getRoundBitmap(userImgHelper.getFileUri(Utils.USR_PICT_FILE_NAME, osb.getLong(Utils.ID, 0))));
}
drawerHamburger.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -113,11 +115,15 @@ public class SchedulesActivity extends AppCompatActivity implements NavigationVi
startActivity(intent);
return true;
case R.id.nav_schedule:
intent = new Intent(this, TermActivity.class);
intent = new Intent(this, CitizenListActivity.class);
startActivity(intent);
return true;
case R.id.nav_check_schedules:
return true;
case R.id.nav_dependants:
intent = new Intent(this, DependentsListActivity.class);
startActivity(intent);
return true;
default:
}
......
......@@ -179,6 +179,7 @@ public class SchedulingActivity extends AppCompatActivity implements SchedulingV
}
});
LinearLayout ll_fields = (LinearLayout) findViewById(R.id.ll_scheduling_fields);
TextView tv_citizen = (TextView) findViewById(R.id.tv_scheduling_citizen);
......
......@@ -21,7 +21,7 @@
android:layout_gravity="start"
android:fitsSystemWindows="true"
app:headerLayout="@layout/nav_drawer_header"
app:menu="@menu/activity_home_drawer" />
app:menu="@menu/activitys_menu_drawer" />
......
......@@ -28,7 +28,7 @@
android:background="@color/colorWhite">
<LinearLayout
android:id="@+id/ll_schedules_fields"
android:id="@+id/ll_scheduling_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment