sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed non-selected navigation items

Browse Source
This commit is contained in:
Caesar2011
2018-10-24 00:43:39 +02:00
parent dddfe3b1d2
commit 359330bb9d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/de/sebse/fuplanner/MainActivity.java
View File

@@ -412,10 +412,10 @@ public class MainActivity extends AppCompatActivity
}, log::e); }, log::e);
break; break;
case FRAGMENT_MODULES: case FRAGMENT_MODULES:
mNavigationView.setCheckedItem(R.id.nav_modules); mNavigationView.getMenu().findItem(R.id.nav_modules).setChecked(true);
break; break;
case FRAGMENT_SCHEDULE: case FRAGMENT_SCHEDULE:
mNavigationView.setCheckedItem(R.id.nav_schedule); mNavigationView.getMenu().findItem(R.id.nav_schedule).setChecked(true);
break; break;
case FRAGMENT_CANTEENS_DETAILS: case FRAGMENT_CANTEENS_DETAILS:
getCanteenBrowser().getCanteens(success -> { getCanteenBrowser().getCanteens(success -> {
@@ -429,10 +429,10 @@ public class MainActivity extends AppCompatActivity
}, log::e); }, log::e);
break; break;
case FRAGMENT_CANTEENS: case FRAGMENT_CANTEENS:
mNavigationView.setCheckedItem(R.id.nav_canteens); mNavigationView.getMenu().findItem(R.id.nav_canteens).setChecked(true);
break; break;
case FRAGMENT_PREFERENCES: case FRAGMENT_PREFERENCES:
mNavigationView.setCheckedItem(R.id.nav_settings); mNavigationView.getMenu().findItem(R.id.nav_settings).setChecked(true);
break; break;
default: // FRAGMENT_STARTUP / FRAGMENT_LOGIN default: // FRAGMENT_STARTUP / FRAGMENT_LOGIN
break; break;
@@ -561,7 +561,6 @@ public class MainActivity extends AppCompatActivity
@Override @Override
public void refreshNavigation() { public void refreshNavigation() {
boolean isLoggedIn = getKVV().isLoggedIn() || mOfflineMode; boolean isLoggedIn = getKVV().isLoggedIn() || mOfflineMode;
log.d("refreshNavigation2", getKVV().isLoggedIn(), mOfflineMode);
setNavigationHeader(isLoggedIn); setNavigationHeader(isLoggedIn);
mNavigationView.getMenu().clear(); mNavigationView.getMenu().clear();
if (isLoggedIn) if (isLoggedIn)
@@ -569,5 +568,6 @@ public class MainActivity extends AppCompatActivity
else else
mNavigationView.inflateMenu(R.menu.activity_main_drawer); mNavigationView.inflateMenu(R.menu.activity_main_drawer);
afterAnyMenuInflate(isLoggedIn); afterAnyMenuInflate(isLoggedIn);
setNavigationSelection(fragmentPage, fragmentData);
} }
} }