From 5f0ec3b58160fea84e1ab5f81df4c6efc3fa4992 Mon Sep 17 00:00:00 2001 From: fkloft Date: Wed, 25 Sep 2013 15:37:49 +0200 Subject: [PATCH 1/2] Hide subtitle while iitc is loading --- mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java index d0676fd1..20c351db 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java @@ -220,7 +220,7 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt } boolean mapVisible = mDesktopMode || mPane == Pane.MAP; - if ("No Highlights".equals(mHighlighter) || isDrawerOpened() || !mapVisible) + if ("No Highlights".equals(mHighlighter) || isDrawerOpened() || mIsLoading || !mapVisible) mActionBar.setSubtitle(null); else mActionBar.setSubtitle(mHighlighter); From 533057be56a0588a2539b41d27fd6cabc9b468a6 Mon Sep 17 00:00:00 2001 From: fkloft Date: Wed, 25 Sep 2013 15:38:33 +0200 Subject: [PATCH 2/2] Close right drawer when home is pressed possible use cases: - open left drawer - close left drawer - navigate up (show map) In each case, the right drawer should be closed. If the left drawer is to be opened, this fixes a bug where both drawers would overlap for a second. (Because the right drawer would not be closed until onDrawerOpened has fired) --- .../com/cradle/iitc_mobile/IITC_NavigationHelper.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java index 20c351db..b7b7f629 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java @@ -12,6 +12,7 @@ import android.preference.PreferenceManager; import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.widget.DrawerLayout; import android.text.Html; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; @@ -296,6 +297,14 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt mDrawerLayout.closeDrawer(mDrawerLeft); } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) + mDrawerLayout.closeDrawer(mDrawerRight); + + return super.onOptionsItemSelected(item); + } + public void onPostCreate(Bundle savedInstanceState) { // Sync the toggle state after onRestoreInstanceState has occurred. syncState();