From 4861c4dfa3f767bac4530c69b16684ed91632a36 Mon Sep 17 00:00:00 2001 From: knightshade Date: Sun, 11 Mar 2018 10:52:09 +0530 Subject: [PATCH] Sets the proper width to Navigation drawer in portrait and landscape mode. Fixes #1275 --- .../fr/free/nrw/commons/theme/NavigationBaseActivity.java | 7 +++++-- app/src/main/res/values-land/integer.xml | 4 ++++ app/src/main/res/values/integer.xml | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/values-land/integer.xml create mode 100644 app/src/main/res/values/integer.xml diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java index 81f56adea..b65d6aa25 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java @@ -88,8 +88,11 @@ public abstract class NavigationBaseActivity extends BaseActivity private void setDrawerPaneWidth() { ViewGroup.LayoutParams params = navigationView.getLayoutParams(); - // set width to lowerBound of 80% of the screen size - params.width = (getResources().getDisplayMetrics().widthPixels * 70) / 100; + // set width to lowerBound of 70% of the screen size in portrait mode + // set width to lowerBound of 50% of the screen size in landscape mode + int percentageWidth = getResources().getInteger(R.integer.drawer_width); + + params.width = (getResources().getDisplayMetrics().widthPixels * percentageWidth) / 100; navigationView.setLayoutParams(params); } diff --git a/app/src/main/res/values-land/integer.xml b/app/src/main/res/values-land/integer.xml new file mode 100644 index 000000000..5f10b23c3 --- /dev/null +++ b/app/src/main/res/values-land/integer.xml @@ -0,0 +1,4 @@ + + + 50 + \ No newline at end of file diff --git a/app/src/main/res/values/integer.xml b/app/src/main/res/values/integer.xml new file mode 100644 index 000000000..a7d66e24e --- /dev/null +++ b/app/src/main/res/values/integer.xml @@ -0,0 +1,4 @@ + + + 70 + \ No newline at end of file