From 69e5a7832cff9d05dd0c132ef55f41f42ed8c774 Mon Sep 17 00:00:00 2001
From: Justin Biggs <jhbscholastic@gmail.com>
Date: Thu, 20 Jun 2019 21:03:23 -0500
Subject: [PATCH] eliminated the bottom toolbar

---
 .../main/java/org/kiwix/kiwixmobile/main/MainActivity.java | 5 ++---
 .../main/java/org/kiwix/kiwixmobile/utils/Constants.java   | 2 --
 .../org/kiwix/kiwixmobile/utils/SharedPreferenceUtil.java  | 4 ----
 app/src/main/res/xml/preferences.xml                       | 7 -------
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
index 53f6c5e8b..8b8154396 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
@@ -1303,12 +1303,11 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
 
   private void updateBottomToolbarVisibility() {
     if (checkNull(bottomToolbar)) {
-      if (sharedPreferenceUtil.getPrefBottomToolbar() && !HOME_URL.equals(
+      if (!HOME_URL.equals(
           getCurrentWebView().getUrl())
           && tabSwitcherRoot.getVisibility() != View.VISIBLE) {
         bottomToolbar.setVisibility(View.VISIBLE);
-        if (getCurrentWebView() instanceof ToolbarStaticKiwixWebView
-            && sharedPreferenceUtil.getPrefBottomToolbar()) {
+        if (getCurrentWebView() instanceof ToolbarStaticKiwixWebView) {
           contentFrame.setPadding(0, 0, 0,
               (int) getResources().getDimension(R.dimen.bottom_toolbar_height));
         } else {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java
index e2dbd7a89..a325a0d48 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java
@@ -58,8 +58,6 @@ public final class Constants {
 
   public static final String PREF_WIFI_ONLY = "pref_wifi_only";
 
-  public static final String PREF_BOTTOM_TOOLBAR = "pref_bottomtoolbar";
-
   public static final String PREF_KIWIX_MOBILE = "kiwix-mobile";
 
   public static final String PREF_BACK_TO_TOP = "pref_backtotop";
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/SharedPreferenceUtil.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/SharedPreferenceUtil.java
index 6333311b6..b39478f47 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/utils/SharedPreferenceUtil.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/SharedPreferenceUtil.java
@@ -10,7 +10,6 @@ import javax.inject.Singleton;
 
 import static org.kiwix.kiwixmobile.utils.Constants.PREF_AUTONIGHTMODE;
 import static org.kiwix.kiwixmobile.utils.Constants.PREF_BACK_TO_TOP;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_BOTTOM_TOOLBAR;
 import static org.kiwix.kiwixmobile.utils.Constants.PREF_EXTERNAL_LINK_POPUP;
 import static org.kiwix.kiwixmobile.utils.Constants.PREF_FULLSCREEN;
 import static org.kiwix.kiwixmobile.utils.Constants.PREF_HIDE_TOOLBAR;
@@ -56,9 +55,6 @@ public class SharedPreferenceUtil {
     return sharedPreferences.getBoolean(PREF_FULLSCREEN, false);
   }
 
-  public boolean getPrefBottomToolbar() {
-    return sharedPreferences.getBoolean(PREF_BOTTOM_TOOLBAR, true);
-  }
 
   public boolean getPrefBackToTop() {
     return sharedPreferences.getBoolean(PREF_BACK_TO_TOP, false);
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c4b2bf9d1..59fb37f46 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -27,13 +27,6 @@
         android:summary="@string/pref_hidetoolbar_summary"
         android:title="@string/pref_hidetoolbar"/>
 
-    <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
-        android:enabled="false"
-        android:defaultValue="true"
-        android:key="pref_bottomtoolbar"
-        android:summary="@string/pref_bottomtoolbar_summary"
-        android:title="@string/pref_bottomtoolbar"/>
-
 
   </PreferenceCategory>