From 7939cd9adf2e3ade2ef06becfcbeece6e7b0a909 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Mon, 23 Sep 2013 20:42:54 +0200
Subject: [PATCH] More drawer tweaks

---
 .../src/com/cradle/iitc_mobile/IITC_Mobile.java   | 13 +++++++++++++
 .../cradle/iitc_mobile/IITC_NavigationHelper.java | 15 +++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 70716074..59c83b85 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -411,6 +411,19 @@ public class IITC_Mobile extends Activity {
         return true;
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        if (mNavigationHelper != null) {
+            boolean visible = !mNavigationHelper.isDrawerOpened();
+
+            for (int i = 0; i < menu.size(); i++)
+                if (menu.getItem(i).getItemId() != R.id.action_settings)
+                    menu.getItem(i).setVisible(visible);
+        }
+
+        return super.onPrepareOptionsMenu(menu);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (mNavigationHelper.onOptionsItemSelected(item))
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
index ae425dfa..898dbc5f 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
@@ -140,13 +140,16 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
                 mActionBar.setHomeButtonEnabled(true);// Make icon clickable
                 mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
 
-                if (mPane != Pane.MAP)
-                    setDrawerIndicatorEnabled(false);
-                else
+                if (mPane == Pane.MAP || mDrawerLayout.isDrawerOpen(mDrawerLeft))
                     setDrawerIndicatorEnabled(true);
+                else
+                    setDrawerIndicatorEnabled(false);
             }
 
-            mActionBar.setTitle(getPaneTitle(mPane));
+            if (mDrawerLayout.isDrawerOpen(mDrawerLeft))
+                mActionBar.setTitle(mIitc.getString(R.string.app_name));
+            else
+                mActionBar.setTitle(getPaneTitle(mPane));
         }
 
         if (mFullscreen && mHideInFullscreen)
@@ -189,15 +192,15 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
 
     @Override
     public void onDrawerClosed(View drawerView) {
-        // TODO change menu? (via invalidateOptionsMenu)
         super.onDrawerClosed(drawerView);
+        mIitc.invalidateOptionsMenu();
         updateActionBar();
     }
 
     @Override
     public void onDrawerOpened(View drawerView) {
-        // TODO change menu? (via invalidateOptionsMenu)
         super.onDrawerOpened(drawerView);
+        mIitc.invalidateOptionsMenu();
         updateActionBar();
         mDrawerLayout.closeDrawer(drawerView.equals(mDrawerLeft) ? mDrawerRight : mDrawerLeft);
     }