From 9f944bf3c5e3b7cb390a4e908551c5ab47e52d7a Mon Sep 17 00:00:00 2001
From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Sun, 4 Sep 2016 07:45:02 +0200
Subject: [PATCH] Uncheck item from menu on NavigationView before closing
drawer.
---
.../information/activity/MainTabsActivity.java | 27 ++++++++--------------
app/src/main/res/menu/weather_main_menu.xml | 3 ---
2 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/app/src/main/java/name/gumartinm/weather/information/activity/MainTabsActivity.java b/app/src/main/java/name/gumartinm/weather/information/activity/MainTabsActivity.java
index fd3a004..e95a96c 100644
--- a/app/src/main/java/name/gumartinm/weather/information/activity/MainTabsActivity.java
+++ b/app/src/main/java/name/gumartinm/weather/information/activity/MainTabsActivity.java
@@ -150,14 +150,14 @@ public class MainTabsActivity extends AppCompatActivity {
}
@Override
- protected void onPostCreate(Bundle savedInstanceState) {
+ protected void onPostCreate(final Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
- // Sync the toggle state after onRestoreInstanceState has occurred.
+
mDrawerToggle.syncState();
}
@Override
- public void onConfigurationChanged(Configuration newConfig) {
+ public void onConfigurationChanged(final Configuration newConfig) {
super.onConfigurationChanged(newConfig);
this.mDrawerToggle.onConfigurationChanged(newConfig);
@@ -165,9 +165,8 @@ public class MainTabsActivity extends AppCompatActivity {
/* Called whenever we call invalidateOptionsMenu() */
@Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- // If the nav drawer is open, hide action items related to the content view
- boolean drawerOpen = this.mDrawerLayout.isDrawerOpen(this.mNavigationView);
+ public boolean onPrepareOptionsMenu(final Menu menu) {
+ final boolean drawerOpen = this.mDrawerLayout.isDrawerOpen(this.mNavigationView);
if (!drawerOpen) {
this.mToolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
}
@@ -176,8 +175,6 @@ public class MainTabsActivity extends AppCompatActivity {
}
private ActionBarDrawerToggle doDrawerToggle(final DrawerLayout drawerLayout, final Toolbar toolbar) {
- // ActionBarDrawerToggle ties together the the proper interactions
- // between the sliding drawer and the action bar app icon
return new ActionBarDrawerToggle(
this,
drawerLayout,
@@ -225,28 +222,22 @@ public class MainTabsActivity extends AppCompatActivity {
@Override
public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
- //Checking if the item is in checked state or not, if not make it in checked state
- if(item.isChecked()) {
- item.setChecked(false);
- }
+ item.setChecked(false);
final int itemId = item.getItemId();
if (itemId == R.id.weather_menu_settings) {
- //Closing drawer on item click
MainTabsActivity.this.mDrawerLayout.closeDrawers();
- Intent intent = new Intent(MainTabsActivity.this.getApplicationContext(), PreferencesActivity.class);
+ final Intent intent = new Intent(MainTabsActivity.this.getApplicationContext(), PreferencesActivity.class);
MainTabsActivity.this.startActivity(intent);
return true;
} else if (itemId == R.id.weather_menu_map) {
- //Closing drawer on item click
MainTabsActivity.this.mDrawerLayout.closeDrawers();
- Intent intent = new Intent(MainTabsActivity.this.getApplicationContext(), MapActivity.class);
+ final Intent intent = new Intent(MainTabsActivity.this.getApplicationContext(), MapActivity.class);
MainTabsActivity.this.startActivity(intent);
return true;
} else if (itemId == R.id.weather_menu_about) {
- //Closing drawer on item click
MainTabsActivity.this.mDrawerLayout.closeDrawers();
- Intent intent = new Intent(MainTabsActivity.this.getApplicationContext(), AboutActivity.class);
+ final Intent intent = new Intent(MainTabsActivity.this.getApplicationContext(), AboutActivity.class);
MainTabsActivity.this.startActivity(intent);
return true;
} else {
diff --git a/app/src/main/res/menu/weather_main_menu.xml b/app/src/main/res/menu/weather_main_menu.xml
index acd3b60..4ff2601 100644
--- a/app/src/main/res/menu/weather_main_menu.xml
+++ b/app/src/main/res/menu/weather_main_menu.xml
@@ -16,8 +16,6 @@
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <group android:checkableBehavior="single">
-
<item android:id="@+id/weather_menu_map"
android:icon="@drawable/ic_add_location_white_24dp"
android:visible="true"
@@ -44,6 +42,5 @@
android:titleCondensed="@string/weather_about_action">
</item>
- </group>
</menu>
--
2.1.4