Merge pull request #1284 from kiwix/feature/jhbiggs/#973-bottom-toolbar

Feature/jhbiggs/#973 bottom toolbar

app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/SettingsTest.java

@@ -49,10 +49,6 @@ public class SettingsTest {
         withKey("pref_hidetoolbar")))
         .perform(click());
 
-    onData(allOf(
-        is(instanceOf(Preference.class)),
-        withKey("pref_bottomtoolbar")))
-        .perform(click());
 
     onData(allOf(
         is(instanceOf(Preference.class)),

app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java

@@ -1442,12 +1442,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
+        if (getCurrentWebView() instanceof ToolbarStaticKiwixWebView) {
-            && sharedPreferenceUtil.getPrefBottomToolbar()) {
           contentFrame.setPadding(0, 0, 0,
               (int) getResources().getDimension(R.dimen.bottom_toolbar_height));
         } else {

app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java

@@ -66,8 +66,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";

app/src/main/java/org/kiwix/kiwixmobile/utils/SharedPreferenceUtil.java

@@ -13,7 +13,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;
@@ -60,9 +59,6 @@ public class SharedPreferenceUtil {
     return sharedPreferences.getBoolean(PREF_FULLSCREEN, false);
   }
 
-  public boolean getPrefBottomToolbar() {
-    return sharedPreferences.getBoolean(PREF_BOTTOM_TOOLBAR, false);
-  }
 
   public boolean getPrefBackToTop() {
     return sharedPreferences.getBoolean(PREF_BACK_TO_TOP, false);

app/src/main/res/values-ar/strings.xml

@@ -138,8 +138,6 @@
   <string name="time_minute">دق</string>
   <string name="time_second">ث</string>
   <string name="time_left">متبقي</string>
-  <string name="pref_bottomtoolbar">تمكين شريط الأدوات السفلي</string>
-  <string name="pref_bottomtoolbar_summary">عرض شريط أدوات بإجراءات سريعة في الجزء السفلي من الشاشة</string>
   <string name="pref_autonightmode_summary">التبديل تلقائيا بين وضع اليلي والنهاري.</string>
   <string name="pref_autonightmode">الوضع الليلي الآلي</string>
   <string name="pref_external_link_popup_title">التحذير عند إدخال وصلات خارجية</string>

app/src/main/res/values-bg/strings.xml

@@ -138,8 +138,6 @@
   <string name="time_minute">мин.</string>
   <string name="time_second">сек.</string>
   <string name="time_left">остават</string>
-  <string name="pref_bottomtoolbar">Позволете туулбара от долната страна</string>
-  <string name="pref_bottomtoolbar_summary">Показва туулбар с бързи действия от долната страна на екрана</string>
   <string name="pref_autonightmode_summary">Превключвай автоматично между дневен и нощен режим.</string>
   <string name="pref_autonightmode">Автоматичен нощен режим.</string>
   <string name="pref_external_link_popup_title">При зареждане на външни препратки</string>

app/src/main/res/values-br/strings.xml

@@ -135,8 +135,6 @@
   <string name="pref_wifi_only">Pellgargañ an endalc\'had dre WiFi hepken</string>
   <string name="time_day">deiz</string>
   <string name="time_left">kleiz</string>
-  <string name="pref_bottomtoolbar">Gweredekaat ar varrenn ostilhoù en traoñ</string>
-  <string name="pref_bottomtoolbar_summary">Diskwel ur varrenn ostilhoù gant oberoù prim e traoñ ar skramm</string>
   <string name="pref_autonightmode_summary">Cheñch ent emgefre etre ar modoù noz ha deiz.</string>
   <string name="pref_autonightmode">Mod noz emgefreek</string>
   <string name="pref_external_link_popup_title">Kemenn pa\'z eer liammoù diavaez</string>

app/src/main/res/values-da/strings.xml

@@ -129,8 +129,6 @@
   <string name="time_day">dag</string>
   <string name="time_hour">t</string>
   <string name="time_left">tilbage</string>
-  <string name="pref_bottomtoolbar">Aktiver knapværktøjslinje</string>
-  <string name="pref_bottomtoolbar_summary">Vis en værktøjslinje med hurtige handling i bunden af skærmen</string>
   <string name="pref_autonightmode_summary">Skift automatisk mellem dag- og nattilstand.</string>
   <string name="pref_autonightmode">Automatisk nattilstand</string>
   <string name="pref_external_link_popup_title">Advar når man bruger eksterne henvisninger</string>

app/src/main/res/values-de/strings.xml

@@ -134,8 +134,6 @@
   <string name="time_minute">Minuten</string>
   <string name="time_second">Sekunden</string>
   <string name="time_left">verbleibend</string>
-  <string name="pref_bottomtoolbar">Untere Werkzeugleiste aktivieren</string>
-  <string name="pref_bottomtoolbar_summary">Eine Werkzeugleiste mit Schnellzugriffsaktionen am unteren Bildschirmrand anzeigen</string>
   <string name="pref_autonightmode_summary">Automatisch zwischen Tag- und Nachtmodus umschalten.</string>
   <string name="pref_autonightmode">Automatischer Nachtmodus</string>
   <string name="pref_external_link_popup_title">Beim Einfügen von externen Links warnen</string>

app/src/main/res/values-eo/strings.xml

@@ -135,8 +135,6 @@
   <string name="pref_wifi_only">Elŝuti nur per vifio</string>
   <string name="time_day">tago</string>
   <string name="time_left">restas</string>
-  <string name="pref_bottomtoolbar">Ŝalti malsupran ilobreton</string>
-  <string name="pref_bottomtoolbar_summary">Montri ilobreton kun rapidaj agoj ĉe la malsupro de la ekrano</string>
   <string name="pref_autonightmode_summary">Aŭtomate ŝalti tagan/noktan reĝimon</string>
   <string name="pref_autonightmode">Aŭtomata nokta reĝimo</string>
   <string name="pref_external_link_popup_title">Averti pri aliro al eksteraj ligiloj</string>

app/src/main/res/values-es/strings.xml

@@ -132,8 +132,6 @@
   <string name="pref_wifi_only">Descargar contenido solo mediante wifi</string>
   <string name="time_day">día</string>
   <string name="time_left">faltan</string>
-  <string name="pref_bottomtoolbar">Activar barra de herramientas inferior</string>
-  <string name="pref_bottomtoolbar_summary">Mostrar una barra con acciones rápidas en la parte inferior de la pantalla</string>
   <string name="pref_autonightmode_summary">Cambiar automáticamente entre el modo diurno y el nocturno</string>
   <string name="pref_autonightmode">Modo nocturno automatizado</string>
   <string name="pref_external_link_popup_title">Advertir al seguir enlaces externos</string>

app/src/main/res/values-eu/strings.xml

@@ -134,8 +134,6 @@
   <string name="time_day">eguna</string>
   <string name="time_second">k</string>
   <string name="time_left">joanda</string>
-  <string name="pref_bottomtoolbar">Gaitu beheko tresna-barra</string>
-  <string name="pref_bottomtoolbar_summary">Gaitu ekintza azkarretako tresna-barra pantailaren beheko partean</string>
   <string name="pref_autonightmode_summary">Automatikoki piztu egun eta gauaren arteko modoa.</string>
   <string name="pref_autonightmode">Gaueko modo automatikoa</string>
   <string name="pref_external_link_popup_title">Kanpo esteketara sartzerakoan ohartarazi</string>

app/src/main/res/values-fr/strings.xml

@@ -126,8 +126,6 @@
   <string name="pref_wifi_only">Télécharger le contenu uniquement via WiFi</string>
   <string name="time_day">jour</string>
   <string name="time_left">restante(s)</string>
-  <string name="pref_bottomtoolbar">Activer la barre d’outils en bas</string>
-  <string name="pref_bottomtoolbar_summary">Afficher une barre d’outils avec des actions rapides en bas de l’écran</string>
   <string name="pref_autonightmode_summary">Basculer automatiquement entre les modes jour et nuit.</string>
   <string name="pref_autonightmode">Mode nuit automatisé</string>
   <string name="pref_external_link_popup_title">Avertir lors de l\'accès à des liens externes</string>

app/src/main/res/values-gl/strings.xml

@@ -132,8 +132,6 @@
   <string name="pref_wifi_only">Descargar contido só mediante WiFi</string>
   <string name="time_day">día</string>
   <string name="time_left">esquerda</string>
-  <string name="pref_bottomtoolbar">Activar a barra de ferramentas inferior</string>
-  <string name="pref_bottomtoolbar_summary">Mostra unha barra de ferramentas con as accións rápidas na parte inferior da pantalla</string>
   <string name="pref_autonightmode_summary">Cambiar automaticamente entre o modo diurno e o nocturno</string>
   <string name="pref_autonightmode">Modo nocturno automatizado</string>
   <string name="pref_external_link_popup_title">Avisar cando introducir ligazóns externas</string>

app/src/main/res/values-hi/strings.xml

@@ -138,8 +138,6 @@
   <string name="time_minute">मिन</string>
   <string name="time_second">स्</string>
   <string name="time_left">बाएँ ओर</string>
-  <string name="pref_bottomtoolbar">तलस्त साधनपट्टी को सक्षम करें</string>
-  <string name="pref_bottomtoolbar_summary">स्क्रीन के ताल में त्वरित-कार्य सुविधा युक्त साधनपट्टी को प्रदर्शित करें</string>
   <string name="pref_autonightmode_summary">स्वचालित रूप से दिन और रात मोड के बीच स्विच करें।</string>
   <string name="pref_autonightmode">स्वचालित रात मोड</string>
   <string name="pref_external_link_popup_title">बाह्य कड़ियों में प्रवेश करने पर सावधान करें</string>

app/src/main/res/values-hu/strings.xml

@@ -136,8 +136,6 @@
   <string name="time_minute">perc</string>
   <string name="time_second">másodperc</string>
   <string name="time_left">maradt</string>
-  <string name="pref_bottomtoolbar">Alsó eszköztár engedélyezése</string>
-  <string name="pref_bottomtoolbar_summary">Jeleníts meg a képernyő alján egy eszköztárat a gyors műveleteknek</string>
   <string name="pref_autonightmode_summary">Automatikusan vált nappali és éjszakai mód között.</string>
   <string name="pref_autonightmode">Automatikus éjszakai mód</string>
   <string name="pref_external_link_popup_title">Figyelmeztess külső hivatkozások indítása esetén</string>

app/src/main/res/values-ko/strings.xml

@@ -138,8 +138,6 @@
   <string name="time_minute">분</string>
   <string name="time_second">초</string>
   <string name="time_left">남음</string>
-  <string name="pref_bottomtoolbar">하단 도구 모음 사용</string>
-  <string name="pref_bottomtoolbar_summary">화면 하단에 빠른 동작들이 포함된 도구 모음을 표시합니다</string>
   <string name="pref_autonightmode_summary">야간 모드와 낮 모드를 자동으로 전환합니다.</string>
   <string name="pref_autonightmode">자동 야간 모드</string>
   <string name="pref_external_link_popup_title">외부 링크에 진입할 때 경고합니다</string>

app/src/main/res/values-li/strings.xml

@@ -96,8 +96,6 @@
   <string name="time_hour">o</string>
   <string name="time_minute">m</string>
   <string name="time_left">links</string>
-  <string name="pref_bottomtoolbar">Zèt de gereidsjapsbalk óngeraan aan</string>
-  <string name="pref_bottomtoolbar_summary">Tuin \'ne gereidsjapsbalk mit snel hanjelinge óngeraan \'t sjerm</string>
   <string name="pref_autonightmode_summary">Sjakel autematis tösse daag- en nachmodus</string>
   <string name="pref_autonightmode">Automatiseerde nachmodus</string>
   <string name="pref_external_link_popup_title">Waorsjoewing mich wen ich nao \'nen externe link gaon</string>

app/src/main/res/values-mk/strings.xml

@@ -138,8 +138,6 @@
   <string name="time_minute">мин</string>
   <string name="time_second">с</string>
   <string name="time_left">лево</string>
-  <string name="pref_bottomtoolbar">Вклучи алатник најдолу</string>
-  <string name="pref_bottomtoolbar_summary">Прикажи алатник за брзи дејства најдолу во екранот.</string>
   <string name="pref_autonightmode_summary">Автоматски префрлај меѓу дневен и ноќен режим.</string>
   <string name="pref_autonightmode">Автоматски ноќен режим</string>
   <string name="pref_external_link_popup_title">Предупреди ме кога се внесуваат надворешни врски</string>

app/src/main/res/values-pl/strings.xml

@@ -109,8 +109,6 @@
   <string name="pref_wifi_only">Pobierz zawartość tylko poprzez WiFi</string>
   <string name="time_day">dzień</string>
   <string name="time_left">do lewej</string>
-  <string name="pref_bottomtoolbar">Włącz dolny pasek narzędzi</string>
-  <string name="pref_bottomtoolbar_summary">Wyświetl pasek narzędzi z szybkimi akcjami u dołu ekranu</string>
   <string name="pref_autonightmode_summary">Przełączaj automatycznie między trybami dnia i nocy.</string>
   <string name="pref_autonightmode">Zautomatyzowany tryb nocny.</string>
   <string name="do_not_ask_anymore">Nie pytaj więcej</string>

app/src/main/res/values-pt/strings.xml

@@ -134,8 +134,6 @@
   <string name="pref_wifi_only">Descarregar conteúdo apenas por WiFi</string>
   <string name="time_day">dia</string>
   <string name="time_left">esquerda</string>
-  <string name="pref_bottomtoolbar">Ativar a barra de ferramentas na parte inferior</string>
-  <string name="pref_bottomtoolbar_summary">Mostrar uma barra de ferramentas com as ações rápidas na parte inferior do ecrã</string>
   <string name="pref_autonightmode_summary">Alternar automaticamente entre o modo diurno e noturno.</string>
   <string name="pref_autonightmode">Modo noturno automático</string>
   <string name="pref_external_link_popup_title">Avisar quando introduzir hiperligações externas</string>

app/src/main/res/values-ro/strings.xml

@@ -130,8 +130,6 @@
   <string name="pref_wifi_only">Descarcă conținut numai prin WiFi</string>
   <string name="time_day">zi</string>
   <string name="time_left">stânga</string>
-  <string name="pref_bottomtoolbar">Activează bara de unelte de jos</string>
-  <string name="pref_bottomtoolbar_summary">Arată o bară de unelte cu acțiuni rapide din partea de jos a ecranului</string>
   <string name="pref_autonightmode_summary">Schimbă automat între modul de zi și de noapte.</string>
   <string name="pref_autonightmode">Mod automat de noapte</string>
   <string name="pref_external_link_popup_title">Atenționați când introduceți legături extern</string>

app/src/main/res/values-ru/strings.xml

@@ -138,8 +138,6 @@
   <string name="time_minute">м</string>
   <string name="time_second">с</string>
   <string name="time_left">осталось</string>
-  <string name="pref_bottomtoolbar">Включить нижнюю панель управления</string>
-  <string name="pref_bottomtoolbar_summary">Отобразить панель управления с быстрыми действиями внизу экрана</string>
   <string name="pref_autonightmode_summary">Автоматически переключать между дневным и ночным режимами.</string>
   <string name="pref_autonightmode">Автоматический ночной режим</string>
   <string name="pref_external_link_popup_title">Предупреждать когда происходит ввод внешних ссылок</string>

app/src/main/res/values-sc/strings.xml

@@ -135,8 +135,6 @@
   <string name="time_day">die</string>
   <string name="time_hour">o</string>
   <string name="time_left">galu</string>
-  <string name="pref_bottomtoolbar">Abìlita sa barra de sas ainas in fundu</string>
-  <string name="pref_bottomtoolbar_summary">Ammustra una barra de sas ainas in fundu a s\'ischermu</string>
   <string name="pref_autonightmode_summary">Cola in manera automàtica intre sa modalidade die e note.</string>
   <string name="pref_autonightmode">Modalidade note automàtica</string>
   <string name="pref_external_link_popup_title">Avisa cando ses aberende unu ligàmene esternu</string>

app/src/main/res/values-sq/strings.xml

@@ -134,8 +134,6 @@
   <string name="time_day">ditë</string>
   <string name="time_minute">min.</string>
   <string name="time_left">edhe</string>
-  <string name="pref_bottomtoolbar">Aktivizo panel të poshtëm</string>
-  <string name="pref_bottomtoolbar_summary">Shfaq në fund të ekranit një panel me butona veprimesh të shpejta</string>
   <string name="pref_autonightmode_summary">Mënyrat ditë dhe mbrëmje këmbeji automatikisht.</string>
   <string name="pref_autonightmode">Mënyrë mbrëmje automatike</string>
   <string name="pref_external_link_popup_title">Sinjalizo kur hyhet në lidhje të jashtme</string>

app/src/main/res/values-sv/strings.xml

@@ -133,8 +133,6 @@
   <string name="pref_wifi_only">Ladda ned endast via WiFi</string>
   <string name="time_day">dag</string>
   <string name="time_left">kvar</string>
-  <string name="pref_bottomtoolbar">Aktivera verktygsfält i nederkant</string>
-  <string name="pref_bottomtoolbar_summary">Visa ett verktygsfält med snabbåtgärder längst ned på skärmen</string>
   <string name="pref_autonightmode_summary">Växla automatiskt mellan dag- och nattläge.</string>
   <string name="pref_autonightmode">Automatiskt nattläge</string>
   <string name="pref_external_link_popup_title">Varna vid externa länkar</string>

app/src/main/res/values-tr/strings.xml

@@ -138,8 +138,6 @@
   <string name="time_minute">dk</string>
   <string name="time_second">sn</string>
   <string name="time_left">kaldı</string>
-  <string name="pref_bottomtoolbar">Alt araç çubuğunu etkinleştir</string>
-  <string name="pref_bottomtoolbar_summary">Ekranın altındaki hızlı hareketlerle bir araç çubuğu sergileyin</string>
   <string name="pref_autonightmode_summary">Gece ve gündüz modu arasında otomatik geçiş.</string>
   <string name="pref_autonightmode">Otomatik gece modu</string>
   <string name="pref_external_link_popup_title">Harici bağlantı girilirken uyarı ver</string>

app/src/main/res/values-uk/strings.xml

@@ -138,8 +138,6 @@
   <string name="time_minute">хв</string>
   <string name="time_second">с</string>
   <string name="time_left">залишилось</string>
-  <string name="pref_bottomtoolbar">Увімкнути нижню панель</string>
-  <string name="pref_bottomtoolbar_summary">Відображати знизу панель з швидкими діями</string>
   <string name="pref_autonightmode_summary">Автоматично перемикатися між денним та нічним режимами.</string>
   <string name="pref_autonightmode">Автоматичний нічний режим</string>
   <string name="pref_external_link_popup_title">Попереджувати, коли введено зовнішнє посилання</string>

app/src/main/res/values-vi/strings.xml

@@ -135,8 +135,6 @@
   <string name="time_minute">phút</string>
   <string name="time_second">giây</string>
   <string name="time_left">còn lại</string>
-  <string name="pref_bottomtoolbar">Bật thanh tác vụ bên dưới</string>
-  <string name="pref_bottomtoolbar_summary">Hiển thị một thanh tác vụ nhanh nằm ở dưới màn hình</string>
   <string name="pref_autonightmode_summary">Tự động chuyển qua lại giữa chế độ đêm và ngày.</string>
   <string name="pref_autonightmode">Chế độ đêm tự động</string>
   <string name="pref_external_link_popup_title">Cảnh báo khi truy cập đường dẫn ngoài</string>

app/src/main/res/values/strings.xml

@@ -146,8 +146,6 @@
   <string name="time_left">left</string>
   <string name="time_today">Today</string>
   <string name="time_yesterday">Yesterday</string>
-  <string name="pref_bottomtoolbar">Enable bottom toolbar</string>
-  <string name="pref_bottomtoolbar_summary">Display a toolbar with quick actions at the bottom of the screen</string>
   <string name="pref_autonightmode_summary">Automatically switch between day and night mode.</string>
   <string name="pref_autonightmode">Automated night mode</string>
   <string name="language_count">(%1$d)</string>

app/src/main/res/xml/preferences.xml

@@ -27,12 +27,6 @@
         android:summary="@string/pref_hidetoolbar_summary"
         android:title="@string/pref_hidetoolbar"/>
 
-    <org.kiwix.kiwixmobile.settings.CustomSwitchPreference
-        android:defaultValue="false"
-        android:key="pref_bottomtoolbar"
-        android:summary="@string/pref_bottomtoolbar_summary"
-        android:title="@string/pref_bottomtoolbar"/>
-
 
   </PreferenceCategory>
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Jun 05 10:51:45 BST 2019
+#Sun Jun 16 15:57:45 CDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME