From d1bdb7f4edfe020b8d93f04032a291734bccc6c9 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 2 Jan 2020 20:39:25 +0100 Subject: [PATCH] Three column mode improvement --- app/src/main/java/eu/faircode/email/ActivityView.java | 4 ++-- app/src/main/java/eu/faircode/email/DrawerLayoutEx.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 19faf8d792..6adc3f043e 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -499,7 +499,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); - drawerLayout.setup(getResources().getConfiguration()); + drawerLayout.setup(getResources().getConfiguration(), drawerContainer); drawerToggle.syncState(); } @@ -540,7 +540,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB @Override public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - drawerLayout.setup(newConfig); + drawerLayout.setup(newConfig, drawerContainer); drawerToggle.onConfigurationChanged(newConfig); } diff --git a/app/src/main/java/eu/faircode/email/DrawerLayoutEx.java b/app/src/main/java/eu/faircode/email/DrawerLayoutEx.java index 7de0f926b2..5248a747cd 100644 --- a/app/src/main/java/eu/faircode/email/DrawerLayoutEx.java +++ b/app/src/main/java/eu/faircode/email/DrawerLayoutEx.java @@ -48,7 +48,7 @@ public class DrawerLayoutEx extends DrawerLayout { super(context, attrs, defStyle); } - void setup(Configuration config) { + void setup(Configuration config, View drawerContainer) { setScrimColor(Helper.resolveColor(getContext(), R.attr.colorDrawerScrim)); if (BuildConfig.DEBUG) { @@ -64,6 +64,7 @@ public class DrawerLayoutEx extends DrawerLayout { setDrawerLockMode(LOCK_MODE_UNLOCKED); setScrimColor(Helper.resolveColor(getContext(), R.attr.colorDrawerScrim)); childContent.setPaddingRelative(0, 0, 0, 0); + closeDrawer(drawerContainer, false); } } }