s416084/find-my-tutor-android
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

redesigned sharing tab, hooked to the backend, minor language upgrades, added status switch handling to the background task #41

Merged
s416084 merged 7 commits from sendFeedbackAndBugToDrawer into develop 2018-11-21 08:49:44 +01:00
Conversation 0 Commits 7 Files Changed 6 +5 -1
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8eedc565c - Show all commits

1
app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
View File

@ -138,6 +138,7 @@ public abstract class BaseActivity
if (!isTutor) { if (!isTutor) {
navigationView.findViewById(R.id.nav_profile).setVisibility(View.GONE); navigationView.findViewById(R.id.nav_profile).setVisibility(View.GONE);
drawerNavigationView.getMenu().setGroupVisible(R.id.drawer_group_tutor, false);
} }
} }

2
app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java
View File

@ -45,6 +45,8 @@ public class SharingFragment extends PreferenceFragment {
locationLevelMapping.put(0, SharingLevel.PRESENCE.toString()); locationLevelMapping.put(0, SharingLevel.PRESENCE.toString());
locationLevelMapping.put(1, SharingLevel.APPROXIMATED.toString()); locationLevelMapping.put(1, SharingLevel.APPROXIMATED.toString());
locationLevelMapping.put(2, SharingLevel.EXACT.toString()); locationLevelMapping.put(2, SharingLevel.EXACT.toString());
locationLevelMapping.put(3, SharingLevel.MANUAL.toString());
addPreferencesFromResource(R.layout.pref_sharing); addPreferencesFromResource(R.layout.pref_sharing);
Preference manualStatus = findPreference("key_manual_status"); Preference manualStatus = findPreference("key_manual_status");

3
app/src/main/java/com/uam/wmi/findmytutor/utils/SharingLevel.java
View File

@ -3,7 +3,8 @@ package com.uam.wmi.findmytutor.utils;
public enum SharingLevel { public enum SharingLevel {
PRESENCE("presence"), PRESENCE("presence"),
APPROXIMATED("approximated"), APPROXIMATED("approximated"),
EXACT("exact"); EXACT("exact"),
MANUAL("manuak");
private final String text; private final String text;