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

Merge branch 'bottomNavFix' of s416084/find-my-tutor-android into develop

Browse Source
This commit is contained in:
Adam Domagalski 2019-01-06 14:39:21 +00:00 committed by Gogs
commit e2f15ea772
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -29,7 +29,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

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

@ -266,7 +266,6 @@ public abstract class BaseActivity
setUpNav(); setUpNav();
actionBarDrawerToggle.syncState(); actionBarDrawerToggle.syncState();
} }
@Override @Override
@ -423,7 +422,7 @@ public abstract class BaseActivity
} }
private void updateNavigationBarState() { public void updateNavigationBarState() {
int actionId = getNavigationMenuItemId(); int actionId = getNavigationMenuItemId();
selectBottomNavigationBarItem(actionId); selectBottomNavigationBarItem(actionId);
} }

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

@ -5,6 +5,7 @@ import android.app.AlertDialog;
import android.app.FragmentTransaction; import android.app.FragmentTransaction;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle; import android.os.Bundle;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
@ -269,11 +270,10 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.hide(SharingFragment.this); fragmentTransaction.hide(SharingFragment.this);
fragmentTransaction.commit(); fragmentTransaction.commit();
((MapActivity) getActivity()).updateNavigationBarState();
return true; return true;
}); });
statusSwitch.setOnPreferenceChangeListener((preference, newValue) -> { statusSwitch.setOnPreferenceChangeListener((preference, newValue) -> true);
return true;
});
/** Status list change listener **/ /** Status list change listener **/
statusList.setOnPreferenceChangeListener((preference, newValue) -> { statusList.setOnPreferenceChangeListener((preference, newValue) -> {
ListPreference lp = (ListPreference) preference; ListPreference lp = (ListPreference) preference;

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

@ -231,6 +231,7 @@ public class UsersListFragment extends Fragment {
List<User> list = new ArrayList<User>(); List<User> list = new ArrayList<User>();
list.add(user); list.add(user);
((MapActivity) getActivity()).filterMarkers(list); ((MapActivity) getActivity()).filterMarkers(list);
((MapActivity) getActivity()).updateNavigationBarState();
}); });
} }
alertDialog = alertDialogBuilderUserInput.create(); alertDialog = alertDialogBuilderUserInput.create();