From eb0172b2bb2dc2bd250bd7b4118a6a8e1fa7fe78 Mon Sep 17 00:00:00 2001
From: s-ayush2903 <ayush_1901cb14@iitp.ac.in>
Date: Mon, 10 Aug 2020 11:39:33 +0530
Subject: [PATCH 01/11] #2263 reOriented the back to top fab

---
 core/src/main/res/layout/main_fragment_content.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/res/layout/main_fragment_content.xml b/core/src/main/res/layout/main_fragment_content.xml
index 6f12daf8a..8cf00b43d 100644
--- a/core/src/main/res/layout/main_fragment_content.xml
+++ b/core/src/main/res/layout/main_fragment_content.xml
@@ -82,7 +82,7 @@
     android:id="@+id/activity_main_back_to_top_fab"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/activity_horizontal_margin"
+    android:layout_marginEnd="@dimen/activity_horizontal_margin"
     android:layout_marginBottom="?attr/actionBarSize"
     android:visibility="gone"
     app:fabSize="mini"

From aa99ce6549acd647901acbc96b0cc27f6883137b Mon Sep 17 00:00:00 2001
From: s-ayush2903 <ayush_1901cb14@iitp.ac.in>
Date: Thu, 13 Aug 2020 12:05:42 +0530
Subject: [PATCH 02/11] set InsetEdges attribute on nottom toolbar

---
 core/src/main/res/layout/bottom_toolbar.xml        | 1 +
 core/src/main/res/layout/main_fragment_content.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/src/main/res/layout/bottom_toolbar.xml b/core/src/main/res/layout/bottom_toolbar.xml
index 76f7f7cec..83ecace0f 100644
--- a/core/src/main/res/layout/bottom_toolbar.xml
+++ b/core/src/main/res/layout/bottom_toolbar.xml
@@ -8,6 +8,7 @@
   android:layout_gravity="bottom"
   android:padding="8dp"
   app:hideOnScroll="true"
+  app:layout_insetEdge="bottom"
   tools:ignore="BottomAppBar">
 
   <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/core/src/main/res/layout/main_fragment_content.xml b/core/src/main/res/layout/main_fragment_content.xml
index 8cf00b43d..1cf4fbd17 100644
--- a/core/src/main/res/layout/main_fragment_content.xml
+++ b/core/src/main/res/layout/main_fragment_content.xml
@@ -86,6 +86,7 @@
     android:layout_marginBottom="?attr/actionBarSize"
     android:visibility="gone"
     app:fabSize="mini"
+    app:layout_dodgeInsetEdges="bottom"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:srcCompat="@drawable/action_find_previous"

From fde7c701743a9a23ea20d29537077292c1b573b0 Mon Sep 17 00:00:00 2001
From: s-ayush2903 <ayush_1901cb14@iitp.ac.in>
Date: Fri, 21 Aug 2020 16:56:20 +0530
Subject: [PATCH 03/11] Moved fab with notch at right

---
 core/src/main/res/layout/bottom_toolbar.xml   |  2 +-
 .../main/res/layout/main_fragment_content.xml | 37 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/core/src/main/res/layout/bottom_toolbar.xml b/core/src/main/res/layout/bottom_toolbar.xml
index 83ecace0f..50ac2cc11 100644
--- a/core/src/main/res/layout/bottom_toolbar.xml
+++ b/core/src/main/res/layout/bottom_toolbar.xml
@@ -5,10 +5,10 @@
   android:id="@+id/bottom_toolbar"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  app:fabAlignmentMode="end"
   android:layout_gravity="bottom"
   android:padding="8dp"
   app:hideOnScroll="true"
-  app:layout_insetEdge="bottom"
   tools:ignore="BottomAppBar">
 
   <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/core/src/main/res/layout/main_fragment_content.xml b/core/src/main/res/layout/main_fragment_content.xml
index 1cf4fbd17..2caa7e870 100644
--- a/core/src/main/res/layout/main_fragment_content.xml
+++ b/core/src/main/res/layout/main_fragment_content.xml
@@ -29,7 +29,6 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-
     <FrameLayout
       android:id="@+id/activity_main_content_frame"
       android:layout_width="match_parent"
@@ -62,6 +61,16 @@
 
     <include layout="@layout/bottom_toolbar" />
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+      android:id="@+id/activity_main_back_to_top_fab"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:visibility="gone"
+      app:fabSize="mini"
+      app:layout_anchor="@id/bottom_toolbar"
+      app:layout_dodgeInsetEdges="bottom"
+      app:srcCompat="@drawable/action_find_previous"
+      tools:visibility="visible" />
   </org.kiwix.kiwixmobile.core.utils.NestedCoordinatorLayout>
 
   <ImageButton
@@ -78,19 +87,19 @@
     app:srcCompat="@drawable/fullscreen_exit"
     tools:visibility="visible" />
 
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    android:id="@+id/activity_main_back_to_top_fab"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginEnd="@dimen/activity_horizontal_margin"
-    android:layout_marginBottom="?attr/actionBarSize"
-    android:visibility="gone"
-    app:fabSize="mini"
-    app:layout_dodgeInsetEdges="bottom"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:srcCompat="@drawable/action_find_previous"
-    tools:visibility="visible" />
+  <!--  <com.google.android.material.floatingactionbutton.FloatingActionButton-->
+  <!--    android:id="@+id/activity_main_back_to_top_fab"-->
+  <!--    android:layout_width="wrap_content"-->
+  <!--    android:layout_height="wrap_content"-->
+  <!--    android:layout_marginEnd="@dimen/activity_horizontal_margin"-->
+  <!--    android:layout_marginBottom="?attr/actionBarSize"-->
+  <!--    android:visibility="gone"-->
+  <!--    app:fabSize="mini"-->
+  <!--    app:layout_dodgeInsetEdges="bottom"-->
+  <!--    app:layout_constraintBottom_toBottomOf="parent"-->
+  <!--    app:layout_constraintEnd_toEndOf="parent"-->
+  <!--    app:srcCompat="@drawable/action_find_previous"-->
+  <!--    tools:visibility="visible" />-->
 
   <Button
     android:id="@+id/activity_main_button_pause_tts"

From 92b9189bbb3c186117688663c18ddb03e91b534b Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Fri, 21 Aug 2020 17:23:54 +0200
Subject: [PATCH 04/11] Localisation updates from https://translatewiki.net.

---
 core/src/main/res/values-ar/strings.xml     |  4 +++-
 core/src/main/res/values-ast/strings.xml    |  1 +
 core/src/main/res/values-ckb/strings.xml    |  1 +
 core/src/main/res/values-cs/strings.xml     |  8 ++++++++
 core/src/main/res/values-da/strings.xml     |  1 +
 core/src/main/res/values-de/strings.xml     |  3 ++-
 core/src/main/res/values-diq/strings.xml    |  3 ++-
 core/src/main/res/values-es/strings.xml     |  1 +
 core/src/main/res/values-fa/strings.xml     |  1 +
 core/src/main/res/values-fi/strings.xml     |  1 +
 core/src/main/res/values-fr/strings.xml     |  7 +++++++
 core/src/main/res/values-gsw/strings.xml    |  1 +
 core/src/main/res/values-in/strings.xml     |  1 +
 core/src/main/res/values-it/strings.xml     |  1 +
 core/src/main/res/values-iw/strings.xml     |  1 +
 core/src/main/res/values-ko/strings.xml     |  1 +
 core/src/main/res/values-lb/strings.xml     |  4 ++++
 core/src/main/res/values-mk/strings.xml     |  7 +++++++
 core/src/main/res/values-ml/strings.xml     |  1 +
 core/src/main/res/values-ne/strings.xml     |  1 +
 core/src/main/res/values-nl/strings.xml     |  1 +
 core/src/main/res/values-pl/strings.xml     |  4 ++++
 core/src/main/res/values-pt-rBR/strings.xml |  3 +++
 core/src/main/res/values-pt/strings.xml     |  1 +
 core/src/main/res/values-qq/strings.xml     | 12 ++++++------
 core/src/main/res/values-ro/strings.xml     |  1 +
 core/src/main/res/values-ru/strings.xml     |  7 +++++++
 core/src/main/res/values-sc/strings.xml     |  1 +
 core/src/main/res/values-sv/strings.xml     |  1 +
 core/src/main/res/values-tr/strings.xml     |  8 ++++++++
 core/src/main/res/values-uk/strings.xml     |  4 +++-
 core/src/main/res/values-vi/strings.xml     |  6 ++++++
 core/src/main/res/values-zh-rTW/strings.xml |  7 +++++++
 custom/src/main/res/values-qq/strings.xml   |  2 +-
 34 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml
index a6a9af67e..331a0403a 100644
--- a/core/src/main/res/values-ar/strings.xml
+++ b/core/src/main/res/values-ar/strings.xml
@@ -110,6 +110,7 @@
   <string name="delete_zims_toast">حُذف الملف</string>
   <string name="no_files_here">لا توجد ملفات هنا</string>
   <string name="download_no_space">لا توجد مساحة كافية للتنزيل.</string>
+  <string name="download">تنزيل</string>
   <string name="space_available">المساحة المتاحة:</string>
   <string name="zim_simple">بسيط</string>
   <string name="zim_no_pic">لا توجد صور</string>
@@ -145,7 +146,7 @@
   <string name="next">التالي</string>
   <string name="previous">السابق</string>
   <string name="wifi_only_title">السماح بتنزيل المحتوى عبر شبكة المحمول؟</string>
-  <string name="wifi_only_msg">إذا اخترت \“نعم\”، فلن يتم تحذيرك في المستقبل. مع ذلك، يمكنك دائمًا تغيير هذا في الإعدادات.</string>
+  <string name="wifi_only_msg">إذا اخترت \"نعم\"، فلن يتم تحذيرك في المستقبل. مع ذلك، يمكنك دائمًا تغيير هذا في الإعدادات.</string>
   <string name="pref_wifi_only">تنزيل المحتوى عبر واي فاي فقط</string>
   <string name="time_day">يوم</string>
   <string name="time_hour">ساعة</string>
@@ -264,4 +265,5 @@
   <string name="off">تعطيل</string>
   <string name="auto">تلقائي</string>
   <string name="crash_checkbox_file_system">تفاصيل نظام الملفات</string>
+  <string name="open_library">افتح المكتبة</string>
 </resources>
diff --git a/core/src/main/res/values-ast/strings.xml b/core/src/main/res/values-ast/strings.xml
index a55dd25cf..e741963cc 100644
--- a/core/src/main/res/values-ast/strings.xml
+++ b/core/src/main/res/values-ast/strings.xml
@@ -103,6 +103,7 @@
   <string name="delete_zims_toast">Los ficheros desaniciáronse correutamente</string>
   <string name="no_files_here">Nun hai nengún ficheru equí</string>
   <string name="download_no_space">Nun hai espaciu abondo pa descargar.</string>
+  <string name="download">Descargar</string>
   <string name="space_available">Espaciu disponible:</string>
   <string name="zim_simple">Simple</string>
   <string name="zim_no_pic">Nun hai imáxenes</string>
diff --git a/core/src/main/res/values-ckb/strings.xml b/core/src/main/res/values-ckb/strings.xml
index 67427115c..88e6595ec 100644
--- a/core/src/main/res/values-ckb/strings.xml
+++ b/core/src/main/res/values-ckb/strings.xml
@@ -76,6 +76,7 @@
   <string name="delete_zim_body" fuzzy="true">لابردنی %s</string>
   <string name="delete_zims_toast">پەڕگە سڕدرایەوە</string>
   <string name="no_files_here">ھیچ پەڕگەیەک لێرە نییە</string>
+  <string name="download">داگرتن</string>
   <string name="space_available">بۆشایی بەردەستە:</string>
   <string name="zim_simple">سادە</string>
   <string name="zim_no_pic">بەبێ وێنە</string>
diff --git a/core/src/main/res/values-cs/strings.xml b/core/src/main/res/values-cs/strings.xml
index f4fe462ab..90356037e 100644
--- a/core/src/main/res/values-cs/strings.xml
+++ b/core/src/main/res/values-cs/strings.xml
@@ -6,6 +6,7 @@
 * Dvorapa
 * Juandev
 * Klaras
+* Luklos
 * Matěj Suchánek
 * Meliganai
 * Mininis11
@@ -114,6 +115,7 @@
   <string name="delete_zims_toast">Soubor byl smazán</string>
   <string name="no_files_here">Zde nejsou žádné soubory</string>
   <string name="download_no_space">Nedostatečný prostor ke stažení.</string>
+  <string name="download">Stáhnout</string>
   <string name="space_available">Dostupné místo:</string>
   <string name="zim_simple">Jednoduché</string>
   <string name="zim_no_pic">Žádné Obrázky</string>
@@ -273,4 +275,10 @@
   <string name="diagnostic_report_message">Zašlete prosím všechny následující podrobnosti, abychom mohli problém diagnostikovat</string>
   <string name="percentage">%d%%</string>
   <string name="pref_text_zoom_title">Zvětšit text</string>
+  <string name="reader">Čtenář</string>
+  <string name="no_open_book">Žádná otevřená kniha</string>
+  <string name="open_library">Otevři knihovnu</string>
+  <string name="tab_restored">Karta byla obnovena</string>
+  <string name="open_drawer">Otevři náčrtník</string>
+  <string name="close_drawer">Zavřít náčtník</string>
 </resources>
diff --git a/core/src/main/res/values-da/strings.xml b/core/src/main/res/values-da/strings.xml
index eee89cd05..b0d76d93c 100644
--- a/core/src/main/res/values-da/strings.xml
+++ b/core/src/main/res/values-da/strings.xml
@@ -154,4 +154,5 @@
   <string name="tag_short_text">kort tekst</string>
   <string name="go_to_settings" fuzzy="true">Gå til indstillinger</string>
   <string name="no_bookmarks">Ingen bogmærker</string>
+  <string name="reader">Læser</string>
 </resources>
diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
index 5410a7b67..115544563 100644
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@@ -109,6 +109,7 @@
   <string name="delete_zims_toast">Dateien erfolgreich gelöscht</string>
   <string name="no_files_here">Hier gibt es keine Dateien</string>
   <string name="download_no_space">Unzureichender Speicherplatz für einen Download.</string>
+  <string name="download">Herunterladen</string>
   <string name="space_available">Verfügbarer Speicher:</string>
   <string name="zim_simple">Einfach</string>
   <string name="zim_no_pic">Keine Bilder</string>
@@ -161,7 +162,7 @@
   <string name="your_languages">Ausgewählte Sprachen:</string>
   <string name="other_languages">Weitere Sprachen:</string>
   <string name="no_items_msg">Keine Objekte verfügbar</string>
-  <string name="crash_title">Also… Das ist peinlich.</string>
+  <string name="crash_title">Also... Das ist peinlich.</string>
   <string name="crash_description">Es sieht aus, als wären wir abgestürzt.\n\nWürde es Ihnen etwas ausmachen, uns bei der Behebung dieses Problems zu helfen, indem Sie uns die folgenden Informationen schicken?</string>
   <string name="crash_checkbox_language">Ihre Spracheinstellungen</string>
   <string name="crash_checkbox_zimfiles">Eine Liste Ihrer ZIM-Dateien</string>
diff --git a/core/src/main/res/values-diq/strings.xml b/core/src/main/res/values-diq/strings.xml
index fa1ce9099..dcac1ece5 100644
--- a/core/src/main/res/values-diq/strings.xml
+++ b/core/src/main/res/values-diq/strings.xml
@@ -101,6 +101,7 @@
   <string name="delete_zims_toast">Dosyay hewl esteriyayê</string>
   <string name="no_files_here">Tiya dosyeyi çıniyê</string>
   <string name="download_no_space">Serba ronayışi rê ca bes niyo.</string>
+  <string name="download">Biya war</string>
   <string name="space_available">Karnıyayiye erd:</string>
   <string name="zim_simple">Besit</string>
   <string name="zim_no_pic">Resımi çıniyê</string>
@@ -184,7 +185,7 @@
   <string name="your_device">Cihazê Şıma:</string>
   <string name="nearby_devices">NEZDI CİHAZİ</string>
   <string name="files_for_transfer">TRANSFERÊ DOSYAYAN</string>
-  <string name="preparing_files">Keno ke dosyaya transfer kero…</string>
+  <string name="preparing_files">Keno ke dosyaya transfer kero...</string>
   <string name="status">Weziyet</string>
   <string name="tag_pic">Resım</string>
   <string name="tag_vid">Video</string>
diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml
index b3f4b5f27..bfe1fc227 100644
--- a/core/src/main/res/values-es/strings.xml
+++ b/core/src/main/res/values-es/strings.xml
@@ -111,6 +111,7 @@
   <string name="delete_zims_toast">Archivo eliminado</string>
   <string name="no_files_here">Ningún archivo aquí</string>
   <string name="download_no_space">No queda espacio suficiente para la descarga.</string>
+  <string name="download">Descargar</string>
   <string name="space_available">Espacio disponible:</string>
   <string name="zim_simple">Simple</string>
   <string name="zim_no_pic">Ninguna imagen</string>
diff --git a/core/src/main/res/values-fa/strings.xml b/core/src/main/res/values-fa/strings.xml
index 616291ebc..73a48f521 100644
--- a/core/src/main/res/values-fa/strings.xml
+++ b/core/src/main/res/values-fa/strings.xml
@@ -70,6 +70,7 @@
   <string name="delete_zims_toast">پرونده‌ها با موفقیت حذف شدند</string>
   <string name="no_files_here">هیچ پرونده‌ای در این‌جا نیست</string>
   <string name="download_no_space" fuzzy="true">فضای ناکافی برای بارگیری پرونده</string>
+  <string name="download">بارگیری</string>
   <string name="space_available">فضای موجود:</string>
   <string name="zim_simple">ساده</string>
   <string name="zim_no_pic">هیچ عکسی نیست</string>
diff --git a/core/src/main/res/values-fi/strings.xml b/core/src/main/res/values-fi/strings.xml
index 383fb748d..2fe3a0627 100644
--- a/core/src/main/res/values-fi/strings.xml
+++ b/core/src/main/res/values-fi/strings.xml
@@ -94,6 +94,7 @@
   <string name="delete_zim_body">Seuraava(t) zim-tiedosto(t) tullaan poistamaan:\n\n%s</string>
   <string name="delete_zims_toast">Tiedosto poistettu</string>
   <string name="no_files_here">Ei tiedostoja täällä</string>
+  <string name="download">Lataa</string>
   <string name="space_available">Tilaa käytettävissä:</string>
   <string name="zim_simple">Yksinkertainen</string>
   <string name="zim_no_pic">Ei kuvia</string>
diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
index b5827ccfc..39dd50601 100644
--- a/core/src/main/res/values-fr/strings.xml
+++ b/core/src/main/res/values-fr/strings.xml
@@ -118,6 +118,7 @@
   <string name="delete_zims_toast">Les fichiers ont bien été supprimés</string>
   <string name="no_files_here">Aucun fichier ici</string>
   <string name="download_no_space">Espace insuffisant pour le téléchargement.</string>
+  <string name="download">Télécharger</string>
   <string name="space_available">Espace disponible :</string>
   <string name="zim_simple">Simple</string>
   <string name="zim_no_pic">Aucune image</string>
@@ -281,4 +282,10 @@
   <string name="percentage">%d%%</string>
   <string name="pref_text_zoom_title">Zoomer le texte</string>
   <string name="search_open_in_new_tab">Ouvrir dans un nouvel onglet</string>
+  <string name="reader">Lecteur</string>
+  <string name="no_open_book">Pas de livre ouvert</string>
+  <string name="open_library">Ouvrir la bibliothèque</string>
+  <string name="tab_restored">Onglet restauré</string>
+  <string name="open_drawer">Ouvrir le tiroir</string>
+  <string name="close_drawer">Fermer le tiroir</string>
 </resources>
diff --git a/core/src/main/res/values-gsw/strings.xml b/core/src/main/res/values-gsw/strings.xml
index 863845747..5dc1359af 100644
--- a/core/src/main/res/values-gsw/strings.xml
+++ b/core/src/main/res/values-gsw/strings.xml
@@ -96,6 +96,7 @@
   <string name="delete_zims_toast">Dateiä erfolgriich glöscht</string>
   <string name="no_files_here">Hie hets ke Dateiä</string>
   <string name="download_no_space">Nid gnüegend Spiicherplatz um abezladä.</string>
+  <string name="download">Abelade</string>
   <string name="space_available">Verfüegbaare Spiicherplatz:</string>
   <string name="zim_simple">Eifach</string>
   <string name="zim_no_pic">Ke Bilder</string>
diff --git a/core/src/main/res/values-in/strings.xml b/core/src/main/res/values-in/strings.xml
index e6285a378..d7ced1329 100644
--- a/core/src/main/res/values-in/strings.xml
+++ b/core/src/main/res/values-in/strings.xml
@@ -100,6 +100,7 @@
   <string name="delete_zims_toast">Berkas telah dihapus</string>
   <string name="no_files_here">Tidak ada berkas disini</string>
   <string name="download_no_space">Tidak tersedia cukup ruang data untuk mengunduh.</string>
+  <string name="download">Unduh</string>
   <string name="space_available">Ruang yang Tersedia:</string>
   <string name="zim_simple">Sederhana</string>
   <string name="zim_no_pic">Tanpa Gambar</string>
diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml
index 80c04174d..877bba31d 100644
--- a/core/src/main/res/values-it/strings.xml
+++ b/core/src/main/res/values-it/strings.xml
@@ -72,6 +72,7 @@
   <string name="delete_zims_toast">File cancellato</string>
   <string name="no_files_here">Nessun file qui</string>
   <string name="download_no_space">Lo spazio è insufficiente per scaricare.</string>
+  <string name="download">Scarica</string>
   <string name="space_available">Spazio disponibile:</string>
   <string name="help_10">Puoi sia scaricare i tuoi file ZIM in-app selezionati o selezionare attentamente quello/i che desideri e scaricarli attraverso il Desktop di un computer prima di trasferire i file ZIM sulla tua memoria SD.</string>
   <string name="help_11">I file ZIM scaricati nell\'applicazione sono localizzati nella directory di archiviazione esterna in una cartella chiamata Kiwix.</string>
diff --git a/core/src/main/res/values-iw/strings.xml b/core/src/main/res/values-iw/strings.xml
index adcea3337..272e55516 100644
--- a/core/src/main/res/values-iw/strings.xml
+++ b/core/src/main/res/values-iw/strings.xml
@@ -111,6 +111,7 @@
   <string name="delete_zims_toast">הקבצים נמחקו בהצלחה</string>
   <string name="no_files_here">אין כאן קבצים</string>
   <string name="download_no_space">אין מספיק מקום להורדה.</string>
+  <string name="download">הורדה</string>
   <string name="space_available">נפח זמין:</string>
   <string name="zim_simple">פשוט</string>
   <string name="zim_no_pic">אין תמונות</string>
diff --git a/core/src/main/res/values-ko/strings.xml b/core/src/main/res/values-ko/strings.xml
index 69fb94b6f..f3fb134c9 100644
--- a/core/src/main/res/values-ko/strings.xml
+++ b/core/src/main/res/values-ko/strings.xml
@@ -114,6 +114,7 @@
   <string name="delete_zims_toast">파일이 삭제되었습니다</string>
   <string name="no_files_here">여기에 파일이 없습니다</string>
   <string name="download_no_space">다운로드할 공간이 충분하지 않습니다.</string>
+  <string name="download">다운로드</string>
   <string name="space_available">사용 가능한 공간:</string>
   <string name="zim_simple">간단히</string>
   <string name="zim_no_pic">그림 없음</string>
diff --git a/core/src/main/res/values-lb/strings.xml b/core/src/main/res/values-lb/strings.xml
index e005f9a6e..766af916a 100644
--- a/core/src/main/res/values-lb/strings.xml
+++ b/core/src/main/res/values-lb/strings.xml
@@ -61,6 +61,7 @@
   <string name="delete_zims_toast">Fichier geläscht</string>
   <string name="no_files_here">Keng Fichieren hei?</string>
   <string name="download_no_space">Net genuch Plaz fir erofzelueden.</string>
+  <string name="download">Eroflueden</string>
   <string name="space_available">Plaz disponibel:</string>
   <string name="zim_simple">Einfach</string>
   <string name="zim_no_pic">Keng Biller</string>
@@ -119,4 +120,7 @@
   <string name="on">Un</string>
   <string name="off">Aus</string>
   <string name="auto">Automatesch</string>
+  <string name="reader">Lieser</string>
+  <string name="open_drawer">Tirang opmaachen</string>
+  <string name="close_drawer">Tirang zoumaachen</string>
 </resources>
diff --git a/core/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml
index 61c7c786a..7982f6a4a 100644
--- a/core/src/main/res/values-mk/strings.xml
+++ b/core/src/main/res/values-mk/strings.xml
@@ -105,6 +105,7 @@
   <string name="delete_zims_toast">Податотеката е успешно избришана</string>
   <string name="no_files_here">Нема податотеки</string>
   <string name="download_no_space">Нема доволно место за преземање.</string>
+  <string name="download">Преземи</string>
   <string name="space_available">Достапен простор:</string>
   <string name="zim_simple">Просто</string>
   <string name="zim_no_pic">Без слики</string>
@@ -268,4 +269,10 @@
   <string name="percentage">%d%%</string>
   <string name="pref_text_zoom_title">Приближување на текст</string>
   <string name="search_open_in_new_tab">Отвори во ново јазиче</string>
+  <string name="reader">Читач</string>
+  <string name="no_open_book">Нема отворена книга</string>
+  <string name="open_library">Отворена библиотека</string>
+  <string name="tab_restored">Јазичето е повратено</string>
+  <string name="open_drawer">Отвори фиока</string>
+  <string name="close_drawer">Затвори фиока</string>
 </resources>
diff --git a/core/src/main/res/values-ml/strings.xml b/core/src/main/res/values-ml/strings.xml
index 92d32c5a9..f681825aa 100644
--- a/core/src/main/res/values-ml/strings.xml
+++ b/core/src/main/res/values-ml/strings.xml
@@ -71,6 +71,7 @@
   <string name="library">ഗ്രന്ഥപ്പുര</string>
   <string name="delete_zim_body" fuzzy="true">%s മായ്ക്കണോ?</string>
   <string name="no_files_here">ഇവിടെ പ്രമാണങ്ങളൊന്നുമില്ല</string>
+  <string name="download">ഡൗൺലോഡ് ചെയ്യുക</string>
   <string name="zim_no_pic">ചിത്രങ്ങളില്ല</string>
   <string name="help_2">കിവിക്സ് എന്താണ് ചെയ്യുന്നത്?</string>
   <string name="tts_pause">താത്കാലികമായി നിർത്തുക</string>
diff --git a/core/src/main/res/values-ne/strings.xml b/core/src/main/res/values-ne/strings.xml
index d0e7fcd08..0a9da8111 100644
--- a/core/src/main/res/values-ne/strings.xml
+++ b/core/src/main/res/values-ne/strings.xml
@@ -64,6 +64,7 @@
   <string name="delete_zims_toast">फाइल मेटियो</string>
   <string name="no_files_here">यहाँ कुनै फाइलहरू छैनन्</string>
   <string name="download_no_space" fuzzy="true">यो फाइल डाउनलोड गर्न पर्याप्त स्थान छैन।</string>
+  <string name="download">डाउनलोड गरिएकाे</string>
   <string name="zim_simple">साधारण</string>
   <string name="zim_no_pic">तस्विर छैन</string>
   <string name="zim_no_vid">भिडियो छैन</string>
diff --git a/core/src/main/res/values-nl/strings.xml b/core/src/main/res/values-nl/strings.xml
index 4f70e0ba2..59966712a 100644
--- a/core/src/main/res/values-nl/strings.xml
+++ b/core/src/main/res/values-nl/strings.xml
@@ -58,6 +58,7 @@
   <string name="pref_newtab_background_summary">Nieuwe tabbladen worden niet actief gemaakt</string>
   <string name="local_zims">Apparaat</string>
   <string name="library">Bibliotheek</string>
+  <string name="download">Downloaden</string>
   <string name="zim_simple">Eenvoudig</string>
   <string name="zim_no_pic">Geen afbeeldingen</string>
   <string name="zim_no_vid">Geen video\'s</string>
diff --git a/core/src/main/res/values-pl/strings.xml b/core/src/main/res/values-pl/strings.xml
index 88f2f7256..c9f0019f5 100644
--- a/core/src/main/res/values-pl/strings.xml
+++ b/core/src/main/res/values-pl/strings.xml
@@ -115,6 +115,7 @@
   <string name="delete_zims_toast">Plik został usunięty</string>
   <string name="no_files_here">Tu nie ma plików</string>
   <string name="download_no_space">Za mało miejsca, aby pobrać ten plik.</string>
+  <string name="download">Pobierz</string>
   <string name="space_available">Dostępne miejsce:</string>
   <string name="zim_simple">Prosty</string>
   <string name="zim_no_pic">Brak obrazka</string>
@@ -274,4 +275,7 @@
   <string name="diagnostic_report_message">Prześlij wszystkie poniższe informacje, abyśmy mogli zdiagnozować problem</string>
   <string name="percentage">%d%%</string>
   <string name="pref_text_zoom_title">Powiększ tekst</string>
+  <string name="no_open_book">Brak otwartych książek</string>
+  <string name="open_library">Otwórz bibliotekę</string>
+  <string name="tab_restored">Odtworzono zakładkę</string>
 </resources>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index 3892e853f..0803a61c2 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -111,6 +111,7 @@
   <string name="delete_zims_toast">Arquivo apagado</string>
   <string name="no_files_here">Nenhum arquivo aqui</string>
   <string name="download_no_space">Espaço insuficiente para baixar o download.</string>
+  <string name="download">Baixar</string>
   <string name="space_available">Espaço disponível:</string>
   <string name="zim_simple">Simple</string>
   <string name="zim_no_pic">Sem Imagens</string>
@@ -274,4 +275,6 @@
   <string name="percentage">%d%%</string>
   <string name="pref_text_zoom_title">Zoom de texto</string>
   <string name="search_open_in_new_tab">Abrir em uma nova guia</string>
+  <string name="open_library">Biblioteca aberta</string>
+  <string name="open_drawer">Abrir gaveta</string>
 </resources>
diff --git a/core/src/main/res/values-pt/strings.xml b/core/src/main/res/values-pt/strings.xml
index ef28fe838..4faf32a47 100644
--- a/core/src/main/res/values-pt/strings.xml
+++ b/core/src/main/res/values-pt/strings.xml
@@ -84,6 +84,7 @@
   <string name="delete_zims_toast">Ficheiros apagados</string>
   <string name="no_files_here">Não há ficheiros aqui</string>
   <string name="download_no_space" fuzzy="true">Espaço insuficiente para o download deste ficheiro.</string>
+  <string name="download">Transferir</string>
   <string name="space_available">Espaço disponível:</string>
   <string name="zim_simple">Simples</string>
   <string name="zim_no_pic">Sem imagens</string>
diff --git a/core/src/main/res/values-qq/strings.xml b/core/src/main/res/values-qq/strings.xml
index 68e7cd88e..6b1ece2ff 100644
--- a/core/src/main/res/values-qq/strings.xml
+++ b/core/src/main/res/values-qq/strings.xml
@@ -37,6 +37,7 @@
   <string name="rate_dialog_neutral">{{Identical|Later}}</string>
   <string name="open">{{Identical|Open}}</string>
   <string name="library">Displayed in application menu</string>
+  <string name="download">The title of the fragment/place where books are downloaded.</string>
   <string name="stop">{{Identical|Stop}}</string>
   <string name="external_storage">{{Identical|External}}</string>
   <string name="yes">{{Identical|Yes}}</string>
@@ -44,21 +45,20 @@
   <string name="previous">{{Identical|Previous}}</string>
   <string name="time_left">This is the past participle of the verb “to leave” (meaning “quitted” or “exited”). This is used in a context of “X minutes left” to finish a download.</string>
   <string name="time_yesterday">{{Identical|Yesterday}}</string>
-  <string name="tab_restored">Tell the user that a tab has been restored.</string>
   <string name="search_history">TODO: Unclear, must be documented. See https://github.com/kiwix/overview/issues/31</string>
   <string name="save">{{Identical|Save}}</string>
   <string name="pref_text_zoom_summary">Tell the user that this preference changes the text size in 25% increments.</string>
   <string name="go_to_settings">This is used in the start server dialog and leads the user to mobile hotspot settings when pressed</string>
   <string name="no_bookmarks">This means \"there are no bookmarks\"</string>
-  <string name="no_open_book">Tell the user that they have not opened a book.</string>
-  <string name="open_library">The action of opening the library destination, used on a button.</string>
-  <string name="download">The title of the fragment/place where books are downloaded.</string>
-  <string name="reader">The title of the fragment/place where books are read.</string>
-<string name="delete_history">Ask if the user wants to delete all history items.</string>
+  <string name="delete_history">Ask if the user wants to delete all history items.</string>
   <string name="delete_selected_history">Ask if the user wants to delete a number of selected history items.</string>
   <string name="delete_bookmarks">Ask if the user wants to delete all bookmarks.</string>
   <string name="delete_selected_bookmarks">Ask if the user wants to delete a number of selected bookmarks.</string>
   <string name="on">This is used in the settings screen to turn on the night mode.</string>
   <string name="off">This is used in the settings screen to turn off the night mode.</string>
   <string name="auto">This is used in the settings screen to turn the night mode on or off automatically depending upon the system settings of the phone.</string>
+  <string name="reader">The title of the fragment/place where books are read.</string>
+  <string name="no_open_book">Tell the user that they have not opened a book.</string>
+  <string name="open_library">The action of opening the library destination, used on a button.</string>
+  <string name="tab_restored">Tell the user that a tab has been restored.</string>
 </resources>
diff --git a/core/src/main/res/values-ro/strings.xml b/core/src/main/res/values-ro/strings.xml
index fc17a1fd7..e878e48b0 100644
--- a/core/src/main/res/values-ro/strings.xml
+++ b/core/src/main/res/values-ro/strings.xml
@@ -108,6 +108,7 @@
   <string name="delete_zims_toast">Filă ștearsă cu succes</string>
   <string name="no_files_here">Nu sunt fișiere aici</string>
   <string name="download_no_space">Spațiu insuficient pentru a descarca.</string>
+  <string name="download">Descarcă</string>
   <string name="space_available">Spațiu disponibil:</string>
   <string name="zim_simple">Simplu</string>
   <string name="zim_no_pic">Fără imagini</string>
diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml
index 583153d4e..1ea7a8bc1 100644
--- a/core/src/main/res/values-ru/strings.xml
+++ b/core/src/main/res/values-ru/strings.xml
@@ -120,6 +120,7 @@
   <string name="delete_zims_toast">Файл успешно удалён</string>
   <string name="no_files_here">Файлы отсутствуют</string>
   <string name="download_no_space">Недостаточно места для загрузки.</string>
+  <string name="download">Скачать</string>
   <string name="space_available">Доступно Места:</string>
   <string name="zim_simple">Простой</string>
   <string name="zim_no_pic">Без картинок</string>
@@ -283,4 +284,10 @@
   <string name="percentage">%d%%</string>
   <string name="pref_text_zoom_title">Масштаб Текста</string>
   <string name="search_open_in_new_tab">Открыть в новой вкладке</string>
+  <string name="reader">Просмотрщик</string>
+  <string name="no_open_book">Нет открытых книг</string>
+  <string name="open_library">Открыть библиотеку</string>
+  <string name="tab_restored">Вкладка восстановлена</string>
+  <string name="open_drawer">Открыть редактор</string>
+  <string name="close_drawer">Закрыть редактор</string>
 </resources>
diff --git a/core/src/main/res/values-sc/strings.xml b/core/src/main/res/values-sc/strings.xml
index 905e3abd6..c97a885b0 100644
--- a/core/src/main/res/values-sc/strings.xml
+++ b/core/src/main/res/values-sc/strings.xml
@@ -106,6 +106,7 @@
   <string name="delete_zims_toast">Documentu iscantzelladu chene problemas</string>
   <string name="no_files_here">Perunu documentu inoghe</string>
   <string name="download_no_space">Sa memòria non bastat pro l\'iscarrigare.</string>
+  <string name="download">Iscàrriga</string>
   <string name="space_available">Ispàtziu disponìbile:</string>
   <string name="zim_simple">Sèmplitze</string>
   <string name="zim_no_pic">Peruna immàgine</string>
diff --git a/core/src/main/res/values-sv/strings.xml b/core/src/main/res/values-sv/strings.xml
index 25c69bb6d..203b7eb73 100644
--- a/core/src/main/res/values-sv/strings.xml
+++ b/core/src/main/res/values-sv/strings.xml
@@ -110,6 +110,7 @@
   <string name="delete_zims_toast">Fil raderades</string>
   <string name="no_files_here">Inga filer här</string>
   <string name="download_no_space">Otillräckligt utrymme för att ladda ned.</string>
+  <string name="download">Ladda ned</string>
   <string name="space_available">Tillgängligt utrymme:</string>
   <string name="zim_simple">Enkelt</string>
   <string name="zim_no_pic">Inga bilder</string>
diff --git a/core/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml
index d0cc76888..cb9d099e4 100644
--- a/core/src/main/res/values-tr/strings.xml
+++ b/core/src/main/res/values-tr/strings.xml
@@ -10,6 +10,7 @@
 * Joseph
 * Kumkumuk
 * McAang
+* MuratTheTurkish
 * Rapsar
 * Sayginer
 * Trockya
@@ -116,6 +117,7 @@
   <string name="delete_zims_toast">Dosyalar başarıyla silindi</string>
   <string name="no_files_here">Dosya yok</string>
   <string name="download_no_space">İndirmek için yetersiz alan.</string>
+  <string name="download">İndir</string>
   <string name="space_available">Kullanılabilir Alan:</string>
   <string name="zim_simple">Basit</string>
   <string name="zim_no_pic">Resim Yok</string>
@@ -279,4 +281,10 @@
   <string name="percentage">%d%%</string>
   <string name="pref_text_zoom_title">Metin Yakınlığı</string>
   <string name="search_open_in_new_tab">Yeni sekmede aç</string>
+  <string name="reader">Okuyucu</string>
+  <string name="no_open_book">Açık kitap yok</string>
+  <string name="open_library">Kütüphaneyi aç</string>
+  <string name="tab_restored">Sekme geri getirildi</string>
+  <string name="open_drawer">Çekmeceyi Aç</string>
+  <string name="close_drawer">Çekmeceyi Kapat</string>
 </resources>
diff --git a/core/src/main/res/values-uk/strings.xml b/core/src/main/res/values-uk/strings.xml
index 3e25bffee..78c5097b7 100644
--- a/core/src/main/res/values-uk/strings.xml
+++ b/core/src/main/res/values-uk/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Authors:
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors:
 * Andriykopanytsia
 * Asokolov
 * Base
@@ -110,6 +111,7 @@
   <string name="delete_zims_toast">Файл вилучено</string>
   <string name="no_files_here">Тут немає файлів</string>
   <string name="download_no_space">Недостатньо простору для завантаження.</string>
+  <string name="download">Завантажити</string>
   <string name="space_available">Доступний простір:</string>
   <string name="zim_simple">Простий</string>
   <string name="zim_no_pic">Без зображень</string>
diff --git a/core/src/main/res/values-vi/strings.xml b/core/src/main/res/values-vi/strings.xml
index bb17eb334..881a74121 100644
--- a/core/src/main/res/values-vi/strings.xml
+++ b/core/src/main/res/values-vi/strings.xml
@@ -6,6 +6,7 @@
 * Fitoschido
 * Leducthn
 * Minh Nguyen
+* Nguyễn Mạnh An
 -->
 <resources>
   <string name="menu_help">Trợ giúp</string>
@@ -124,4 +125,9 @@
   <string name="your_languages">Ngôn ngữ được chọn:</string>
   <string name="other_languages">Ngôn ngữ khác:</string>
   <string name="no_bookmarks">Không có Dấu trang</string>
+  <string name="reader">Tiêu đề</string>
+  <string name="no_open_book">Không có sách nào đang mở</string>
+  <string name="open_library">Văn thư lưu trữ mở</string>
+  <string name="tab_restored">Đã khôi phục tab</string>
+  <string name="open_drawer">Ngăn lưu trữ mở</string>
 </resources>
diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml
index 49a70f4c0..1d7aaa56c 100644
--- a/core/src/main/res/values-zh-rTW/strings.xml
+++ b/core/src/main/res/values-zh-rTW/strings.xml
@@ -110,6 +110,7 @@
   <string name="delete_zims_toast">檔案刪除成功</string>
   <string name="no_files_here">沒有檔案在此</string>
   <string name="download_no_space">沒有足夠的空間來下載。</string>
+  <string name="download">下載</string>
   <string name="space_available">可用空間：</string>
   <string name="zim_simple">簡易</string>
   <string name="zim_no_pic">沒有圖片</string>
@@ -273,4 +274,10 @@
   <string name="percentage">%d%%</string>
   <string name="pref_text_zoom_title">文字縮放</string>
   <string name="search_open_in_new_tab">在新分頁開啟</string>
+  <string name="reader">讀者</string>
+  <string name="no_open_book">沒有開啟的書籍</string>
+  <string name="open_library">開啟圖書館</string>
+  <string name="tab_restored">分頁已恢復</string>
+  <string name="open_drawer">開啟抽屜</string>
+  <string name="close_drawer">關閉抽屜</string>
 </resources>
diff --git a/custom/src/main/res/values-qq/strings.xml b/custom/src/main/res/values-qq/strings.xml
index 963d5b9e9..457cfe1f9 100644
--- a/custom/src/main/res/values-qq/strings.xml
+++ b/custom/src/main/res/values-qq/strings.xml
@@ -3,5 +3,5 @@
 * Robby
 -->
 <resources>
-  <string name="download">{{Identical|Download}}</string>
+  <string name="download">The title of the fragment/place where books are downloaded.</string>
 </resources>

From ffb924fd48907124b5992fbedf5ac9be4e120752 Mon Sep 17 00:00:00 2001
From: s-ayush2903 <ayush_1901cb14@iitp.ac.in>
Date: Sat, 22 Aug 2020 09:46:24 +0530
Subject: [PATCH 05/11] Initialized Vertical-Offset for bottomAppBar to avoid
 protrusions with fab

---
 core/src/main/res/layout/bottom_toolbar.xml | 3 ++-
 core/src/main/res/values/dimens.xml         | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/main/res/layout/bottom_toolbar.xml b/core/src/main/res/layout/bottom_toolbar.xml
index 50ac2cc11..165533f9a 100644
--- a/core/src/main/res/layout/bottom_toolbar.xml
+++ b/core/src/main/res/layout/bottom_toolbar.xml
@@ -5,9 +5,10 @@
   android:id="@+id/bottom_toolbar"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  app:fabAlignmentMode="end"
   android:layout_gravity="bottom"
   android:padding="8dp"
+  app:fabAlignmentMode="end"
+  app:fabCradleVerticalOffset="@dimen/fab_vertical_offset"
   app:hideOnScroll="true"
   tools:ignore="BottomAppBar">
 
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
index 8886c01bf..f1e7986d3 100644
--- a/core/src/main/res/values/dimens.xml
+++ b/core/src/main/res/values/dimens.xml
@@ -17,4 +17,6 @@
   <dimen name="kiwix_search_widget_padding">0dp</dimen>
   <dimen name="section_list_height">56dp</dimen>
   <dimen name="card_margin">5dp</dimen>
+
+  <dimen name="fab_vertical_offset">20dp</dimen>
 </resources>

From 70b1d162ab36f39b20e2660cdfd58af3a8ca751c Mon Sep 17 00:00:00 2001
From: s-ayush2903 <ayush_1901cb14@iitp.ac.in>
Date: Sat, 22 Aug 2020 09:47:22 +0530
Subject: [PATCH 06/11] Removed comments

---
 core/src/main/res/layout/main_fragment_content.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/core/src/main/res/layout/main_fragment_content.xml b/core/src/main/res/layout/main_fragment_content.xml
index 2caa7e870..4dc13081a 100644
--- a/core/src/main/res/layout/main_fragment_content.xml
+++ b/core/src/main/res/layout/main_fragment_content.xml
@@ -87,20 +87,6 @@
     app:srcCompat="@drawable/fullscreen_exit"
     tools:visibility="visible" />
 
-  <!--  <com.google.android.material.floatingactionbutton.FloatingActionButton-->
-  <!--    android:id="@+id/activity_main_back_to_top_fab"-->
-  <!--    android:layout_width="wrap_content"-->
-  <!--    android:layout_height="wrap_content"-->
-  <!--    android:layout_marginEnd="@dimen/activity_horizontal_margin"-->
-  <!--    android:layout_marginBottom="?attr/actionBarSize"-->
-  <!--    android:visibility="gone"-->
-  <!--    app:fabSize="mini"-->
-  <!--    app:layout_dodgeInsetEdges="bottom"-->
-  <!--    app:layout_constraintBottom_toBottomOf="parent"-->
-  <!--    app:layout_constraintEnd_toEndOf="parent"-->
-  <!--    app:srcCompat="@drawable/action_find_previous"-->
-  <!--    tools:visibility="visible" />-->
-
   <Button
     android:id="@+id/activity_main_button_pause_tts"
     android:layout_width="0dp"

From d4e26a77ac4ea1637474531ac2c322884818ff14 Mon Sep 17 00:00:00 2001
From: s-ayush2903 <ayush_1901cb14@iitp.ac.in>
Date: Sat, 22 Aug 2020 10:25:33 +0530
Subject: [PATCH 07/11] Changed srcCompat to src

---
 core/src/main/res/layout/main_fragment_content.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/res/layout/main_fragment_content.xml b/core/src/main/res/layout/main_fragment_content.xml
index 422a0de04..ca7fc6a50 100644
--- a/core/src/main/res/layout/main_fragment_content.xml
+++ b/core/src/main/res/layout/main_fragment_content.xml
@@ -65,11 +65,11 @@
       android:id="@+id/activity_main_back_to_top_fab"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:src="@drawable/action_find_previous"
       android:visibility="gone"
       app:fabSize="mini"
       app:layout_anchor="@id/bottom_toolbar"
       app:layout_dodgeInsetEdges="bottom"
-      app:src="@drawable/action_find_previous"
       tools:visibility="visible" />
   </org.kiwix.kiwixmobile.core.utils.NestedCoordinatorLayout>
 

From f4da3a072628935b6fb86bc7657f1e5a3adf64bc Mon Sep 17 00:00:00 2001
From: s-ayush2903 <ayush_1901cb14@iitp.ac.in>
Date: Mon, 24 Aug 2020 15:08:14 +0530
Subject: [PATCH 08/11] Eliminated Notch

---
 core/src/main/res/values/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
index f1e7986d3..8de34dd4c 100644
--- a/core/src/main/res/values/dimens.xml
+++ b/core/src/main/res/values/dimens.xml
@@ -18,5 +18,5 @@
   <dimen name="section_list_height">56dp</dimen>
   <dimen name="card_margin">5dp</dimen>
 
-  <dimen name="fab_vertical_offset">20dp</dimen>
+  <dimen name="fab_vertical_offset">25dp</dimen>
 </resources>

From b0c0f8538d75771639b793a2692929c62d2d3ec9 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Mon, 24 Aug 2020 10:49:18 +0100
Subject: [PATCH 09/11] lint fixes

---
 core/src/main/res/values-ar/strings.xml  | 2 +-
 core/src/main/res/values-de/strings.xml  | 2 +-
 core/src/main/res/values-diq/strings.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml
index 331a0403a..b405c5d85 100644
--- a/core/src/main/res/values-ar/strings.xml
+++ b/core/src/main/res/values-ar/strings.xml
@@ -146,7 +146,7 @@
   <string name="next">التالي</string>
   <string name="previous">السابق</string>
   <string name="wifi_only_title">السماح بتنزيل المحتوى عبر شبكة المحمول؟</string>
-  <string name="wifi_only_msg">إذا اخترت \"نعم\"، فلن يتم تحذيرك في المستقبل. مع ذلك، يمكنك دائمًا تغيير هذا في الإعدادات.</string>
+  <string name="wifi_only_msg">إذا اخترت \“نعم\”، فلن يتم تحذيرك في المستقبل. مع ذلك، يمكنك دائمًا تغيير هذا في الإعدادات.</string>
   <string name="pref_wifi_only">تنزيل المحتوى عبر واي فاي فقط</string>
   <string name="time_day">يوم</string>
   <string name="time_hour">ساعة</string>
diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
index 115544563..0cb22b716 100644
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@@ -162,7 +162,7 @@
   <string name="your_languages">Ausgewählte Sprachen:</string>
   <string name="other_languages">Weitere Sprachen:</string>
   <string name="no_items_msg">Keine Objekte verfügbar</string>
-  <string name="crash_title">Also... Das ist peinlich.</string>
+  <string name="crash_title">Also… Das ist peinlich.</string>
   <string name="crash_description">Es sieht aus, als wären wir abgestürzt.\n\nWürde es Ihnen etwas ausmachen, uns bei der Behebung dieses Problems zu helfen, indem Sie uns die folgenden Informationen schicken?</string>
   <string name="crash_checkbox_language">Ihre Spracheinstellungen</string>
   <string name="crash_checkbox_zimfiles">Eine Liste Ihrer ZIM-Dateien</string>
diff --git a/core/src/main/res/values-diq/strings.xml b/core/src/main/res/values-diq/strings.xml
index dcac1ece5..4763f0440 100644
--- a/core/src/main/res/values-diq/strings.xml
+++ b/core/src/main/res/values-diq/strings.xml
@@ -185,7 +185,7 @@
   <string name="your_device">Cihazê Şıma:</string>
   <string name="nearby_devices">NEZDI CİHAZİ</string>
   <string name="files_for_transfer">TRANSFERÊ DOSYAYAN</string>
-  <string name="preparing_files">Keno ke dosyaya transfer kero...</string>
+  <string name="preparing_files">Keno ke dosyaya transfer kero…</string>
   <string name="status">Weziyet</string>
   <string name="tag_pic">Resım</string>
   <string name="tag_vid">Video</string>

From 885d600fa31763923f42c235146b20801b20b737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=C3=A1n=20Mac=20Gillicuddy?= <seantheappdev@gmail.com>
Date: Mon, 24 Aug 2020 11:57:35 +0100
Subject: [PATCH 10/11] Revert "chore: Converted SharedPreferencesUtil class to
 Kotlin"

---
 .../settings/KiwixPrefsFragment.kt            |   2 +-
 .../core/utils/SharedPreferenceUtil.java      | 225 ++++++++++++++++++
 .../core/utils/SharedPreferenceUtil.kt        | 170 -------------
 .../custom/settings/CustomPrefsFragment.kt    |   4 +-
 4 files changed, 228 insertions(+), 173 deletions(-)
 delete mode 100644 core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.kt

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixPrefsFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixPrefsFragment.kt
index e634c753f..226148190 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixPrefsFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixPrefsFragment.kt
@@ -23,7 +23,7 @@ import android.os.Environment
 import androidx.preference.Preference
 import org.kiwix.kiwixmobile.core.settings.CorePrefsFragment
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
-import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil.Companion.PREF_STORAGE
+import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil.PREF_STORAGE
 
 class KiwixPrefsFragment : CorePrefsFragment() {
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.java b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.java
index e69de29bb..894e46f3a 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.java
@@ -0,0 +1,225 @@
+/*
+ * Kiwix Android
+ * Copyright (c) 2019 Kiwix <android.kiwix.org>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.kiwix.kiwixmobile.core.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.content.ContextCompat;
+import io.reactivex.Flowable;
+import io.reactivex.processors.PublishProcessor;
+import java.io.File;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import org.kiwix.kiwixmobile.core.CoreApp;
+import org.kiwix.kiwixmobile.core.NightModeConfig;
+
+/**
+ * Manager for the Default Shared Preferences of the application.
+ */
+
+@Singleton
+public class SharedPreferenceUtil {
+  // Prefs
+  public static final String PREF_LANG = "pref_language_chooser";
+  public static final String PREF_STORAGE = "pref_select_folder";
+  public static final String PREF_WIFI_ONLY = "pref_wifi_only";
+  public static final String PREF_KIWIX_MOBILE = "kiwix-mobile";
+  public static final String PREF_SHOW_INTRO = "showIntro";
+  private static final String PREF_BACK_TO_TOP = "pref_backtotop";
+  private static final String PREF_FULLSCREEN = "pref_fullscreen";
+  private static final String PREF_NEW_TAB_BACKGROUND = "pref_newtab_background";
+  private static final String PREF_STORAGE_TITLE = "pref_selected_title";
+  private static final String PREF_EXTERNAL_LINK_POPUP = "pref_external_link_popup";
+  private static final String PREF_IS_FIRST_RUN = "isFirstRun";
+  private static final String PREF_SHOW_BOOKMARKS_ALL_BOOKS = "show_bookmarks_current_book";
+  private static final String PREF_SHOW_HISTORY_ALL_BOOKS = "show_history_current_book";
+  private static final String PREF_HOSTED_BOOKS = "hosted_books";
+  public static final String PREF_NIGHT_MODE = "pref_night_mode";
+  private static final String TEXT_ZOOM = "true_text_zoom";
+  private SharedPreferences sharedPreferences;
+  private final PublishProcessor<String> prefStorages = PublishProcessor.create();
+  private final PublishProcessor<Integer> textZooms = PublishProcessor.create();
+  private final PublishProcessor<NightModeConfig.Mode> nightModes = PublishProcessor.create();
+
+  @Inject
+  public SharedPreferenceUtil(Context context) {
+    sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+  }
+
+  public boolean getPrefWifiOnly() {
+    return sharedPreferences.getBoolean(PREF_WIFI_ONLY, true);
+  }
+
+  public boolean getPrefIsFirstRun() {
+    return sharedPreferences.getBoolean(PREF_IS_FIRST_RUN, true);
+  }
+
+  public boolean getPrefFullScreen() {
+    return sharedPreferences.getBoolean(PREF_FULLSCREEN, false);
+  }
+
+  public boolean getPrefBackToTop() {
+    return sharedPreferences.getBoolean(PREF_BACK_TO_TOP, false);
+  }
+
+  public boolean getPrefNewTabBackground() {
+    return sharedPreferences.getBoolean(PREF_NEW_TAB_BACKGROUND, false);
+  }
+
+  public boolean getPrefExternalLinkPopup() {
+    return sharedPreferences.getBoolean(PREF_EXTERNAL_LINK_POPUP, true);
+  }
+
+  public String getPrefLanguage() {
+    return sharedPreferences.getString(PREF_LANG, Locale.ROOT.toString());
+  }
+
+  public String getPrefStorage() {
+    final String storage = sharedPreferences.getString(PREF_STORAGE, null);
+    if (storage == null) {
+      final String defaultStorage = defaultStorage();
+      putPrefStorage(defaultStorage);
+      return defaultStorage;
+    } else if (!new File(storage).exists()) {
+      return defaultStorage();
+    }
+    return storage;
+  }
+
+  private String defaultStorage() {
+    final File externalFilesDir =
+      ContextCompat.getExternalFilesDirs(CoreApp.getInstance(), null)[0];
+    return externalFilesDir != null ? externalFilesDir.getPath()
+      : CoreApp.getInstance().getFilesDir().getPath(); // workaround for emulators
+  }
+
+  public String getPrefStorageTitle(String defaultTitle) {
+    return sharedPreferences.getString(PREF_STORAGE_TITLE, defaultTitle);
+  }
+
+  public void putPrefLanguage(String language) {
+    sharedPreferences.edit().putString(PREF_LANG, language).apply();
+  }
+
+  public void putPrefIsFirstRun(boolean isFirstRun) {
+    sharedPreferences.edit().putBoolean(PREF_IS_FIRST_RUN, isFirstRun).apply();
+  }
+
+  public void putPrefWifiOnly(boolean wifiOnly) {
+    sharedPreferences.edit().putBoolean(PREF_WIFI_ONLY, wifiOnly).apply();
+  }
+
+  public void putPrefStorageTitle(String storageTitle) {
+    sharedPreferences.edit().putString(PREF_STORAGE_TITLE, storageTitle).apply();
+  }
+
+  public void putPrefStorage(String storage) {
+    sharedPreferences.edit().putString(PREF_STORAGE, storage).apply();
+    prefStorages.onNext(storage);
+  }
+
+  public Flowable<String> getPrefStorages() {
+    return prefStorages.startWith(getPrefStorage());
+  }
+
+  public void putPrefFullScreen(boolean fullScreen) {
+    sharedPreferences.edit().putBoolean(PREF_FULLSCREEN, fullScreen).apply();
+  }
+
+  public void putPrefExternalLinkPopup(boolean externalLinkPopup) {
+    sharedPreferences.edit().putBoolean(PREF_EXTERNAL_LINK_POPUP, externalLinkPopup).apply();
+  }
+
+  public boolean showIntro() {
+    return sharedPreferences.getBoolean(PREF_SHOW_INTRO, true);
+  }
+
+  public void setIntroShown() {
+    sharedPreferences.edit().putBoolean(PREF_SHOW_INTRO, false).apply();
+  }
+
+  public boolean getShowHistoryAllBooks() {
+    return sharedPreferences.getBoolean(PREF_SHOW_HISTORY_ALL_BOOKS, true);
+  }
+
+  public void setShowHistoryAllBooks(boolean prefShowHistoryAllBooks) {
+    sharedPreferences.edit()
+      .putBoolean(PREF_SHOW_HISTORY_ALL_BOOKS, prefShowHistoryAllBooks)
+      .apply();
+  }
+
+  public boolean getShowBookmarksAllBooks() {
+    return sharedPreferences.getBoolean(PREF_SHOW_BOOKMARKS_ALL_BOOKS, true);
+  }
+
+  public void setShowBookmarksAllBooks(boolean prefShowBookmarksFromCurrentBook) {
+    sharedPreferences.edit()
+      .putBoolean(PREF_SHOW_BOOKMARKS_ALL_BOOKS, prefShowBookmarksFromCurrentBook)
+      .apply();
+  }
+
+  @NonNull
+  public NightModeConfig.Mode getNightMode() {
+    return NightModeConfig.Mode.from(
+      Integer.parseInt(
+        sharedPreferences.getString(
+          PREF_NIGHT_MODE,
+          "" + AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        )
+      )
+    );
+  }
+
+  public Flowable<NightModeConfig.Mode> nightModes() {
+    return nightModes.startWith(getNightMode());
+  }
+
+  public void updateNightMode() {
+    nightModes.offer(getNightMode());
+  }
+
+  public Set<String> getHostedBooks() {
+    return sharedPreferences.getStringSet(PREF_HOSTED_BOOKS, new HashSet<>());
+  }
+
+  public void setHostedBooks(Set<String> hostedBooks) {
+    sharedPreferences.edit()
+      .putStringSet(PREF_HOSTED_BOOKS, hostedBooks)
+      .apply();
+  }
+
+  public void setTextZoom(int textZoom) {
+    sharedPreferences.edit().putInt(TEXT_ZOOM, textZoom).apply();
+    textZooms.offer(textZoom);
+  }
+
+  public int getTextZoom() {
+    return sharedPreferences.getInt(TEXT_ZOOM, 100);
+  }
+
+  public Flowable<Integer> getTextZooms() {
+    return textZooms.startWith(getTextZoom());
+  }
+}
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.kt
deleted file mode 100644
index 775fc5298..000000000
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.kt
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Kiwix Android
- * Copyright (c) 2019 Kiwix <android.kiwix.org>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.kiwix.kiwixmobile.core.utils
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.preference.PreferenceManager
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.ContextCompat.getExternalFilesDirs
-import androidx.core.content.edit
-import io.reactivex.Flowable
-import io.reactivex.processors.PublishProcessor
-import org.kiwix.kiwixmobile.core.NightModeConfig
-import org.kiwix.kiwixmobile.core.NightModeConfig.Mode.Companion.from
-import java.io.File
-import java.util.Locale
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * Manager for the Default Shared Preferences of the application.
- */
-@Singleton
-class SharedPreferenceUtil @Inject constructor(val context: Context) {
-  private val sharedPreferences: SharedPreferences =
-    PreferenceManager.getDefaultSharedPreferences(context)
-  private val _prefStorages = PublishProcessor.create<String>()
-  val prefStorages
-    get() = _prefStorages.startWith { prefStorage }
-  private val _textZooms = PublishProcessor.create<Int>()
-  val textZooms
-    get() = _textZooms.startWith { textZoom }
-  private val nightModes = PublishProcessor.create<NightModeConfig.Mode>()
-
-  val prefWifiOnly: Boolean
-    get() = sharedPreferences.getBoolean(PREF_WIFI_ONLY, true)
-
-  val prefIsFirstRun: Boolean
-    get() = sharedPreferences.getBoolean(PREF_IS_FIRST_RUN, true)
-
-  val prefFullScreen: Boolean
-    get() = sharedPreferences.getBoolean(PREF_FULLSCREEN, false)
-
-  val prefBackToTop: Boolean
-    get() = sharedPreferences.getBoolean(PREF_BACK_TO_TOP, false)
-
-  val prefNewTabBackground: Boolean
-    get() = sharedPreferences.getBoolean(PREF_NEW_TAB_BACKGROUND, false)
-
-  val prefExternalLinkPopup: Boolean
-    get() = sharedPreferences.getBoolean(PREF_EXTERNAL_LINK_POPUP, true)
-
-  val prefLanguage: String
-    get() = sharedPreferences.getString(PREF_LANG, "") ?: Locale.ROOT.toString()
-
-  val prefStorage: String
-    get() {
-      val storage = sharedPreferences.getString(PREF_STORAGE, null)
-      return when {
-        storage == null -> defaultStorage().also(::putPrefStorage)
-        !File(storage).exists() -> defaultStorage()
-        else -> storage
-      }
-    }
-
-  private fun defaultStorage(): String =
-    getExternalFilesDirs(context, null)[0]?.path
-      ?: context.filesDir.path // a workaround for emulators
-
-  fun getPrefStorageTitle(defaultTitle: String): String =
-    sharedPreferences.getString(PREF_STORAGE_TITLE, defaultTitle) ?: defaultTitle
-
-  fun putPrefLanguage(language: String) =
-    sharedPreferences.edit { putString(PREF_LANG, language) }
-
-  fun putPrefIsFirstRun(isFirstRun: Boolean) =
-    sharedPreferences.edit { putBoolean(PREF_IS_FIRST_RUN, isFirstRun) }
-
-  fun putPrefWifiOnly(wifiOnly: Boolean) =
-    sharedPreferences.edit { putBoolean(PREF_WIFI_ONLY, wifiOnly) }
-
-  fun putPrefStorageTitle(storageTitle: String) =
-    sharedPreferences.edit { putString(PREF_STORAGE_TITLE, storageTitle) }
-
-  fun putPrefStorage(storage: String) {
-    sharedPreferences.edit { putString(PREF_STORAGE, storage) }
-    _prefStorages.onNext(storage)
-  }
-
-  fun putPrefFullScreen(fullScreen: Boolean) =
-    sharedPreferences.edit { putBoolean(PREF_FULLSCREEN, fullScreen) }
-
-  fun putPrefExternalLinkPopup(externalLinkPopup: Boolean) =
-    sharedPreferences.edit { putBoolean(PREF_EXTERNAL_LINK_POPUP, externalLinkPopup) }
-
-  fun showIntro(): Boolean = sharedPreferences.getBoolean(PREF_SHOW_INTRO, true)
-
-  fun setIntroShown() = sharedPreferences.edit { putBoolean(PREF_SHOW_INTRO, false) }
-
-  var showHistoryAllBooks: Boolean
-    get() = sharedPreferences.getBoolean(PREF_SHOW_HISTORY_ALL_BOOKS, true)
-    set(prefShowHistoryAllBooks) {
-      sharedPreferences.edit { putBoolean(PREF_SHOW_HISTORY_ALL_BOOKS, prefShowHistoryAllBooks) }
-    }
-
-  var showBookmarksAllBooks: Boolean
-    get() = sharedPreferences.getBoolean(PREF_SHOW_BOOKMARKS_ALL_BOOKS, true)
-    set(prefShowBookmarksFromCurrentBook) = sharedPreferences.edit {
-      putBoolean(PREF_SHOW_BOOKMARKS_ALL_BOOKS, prefShowBookmarksFromCurrentBook)
-    }
-
-  val nightMode: NightModeConfig.Mode
-    get() = from(
-      sharedPreferences.getString(PREF_NIGHT_MODE, null)?.toInt()
-        ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-    )
-
-  fun nightModes(): Flowable<NightModeConfig.Mode> = nightModes.startWith(nightMode)
-
-  fun updateNightMode() = nightModes.offer(nightMode)
-
-  var hostedBooks: Set<String>
-    get() = sharedPreferences.getStringSet(PREF_HOSTED_BOOKS, null)?.toHashSet() ?: HashSet()
-    set(hostedBooks) {
-      sharedPreferences.edit { putStringSet(PREF_HOSTED_BOOKS, hostedBooks) }
-    }
-
-  var textZoom: Int
-    get() = sharedPreferences.getInt(TEXT_ZOOM, DEFAULT_ZOOM)
-    set(textZoom) {
-      sharedPreferences.edit { putInt(TEXT_ZOOM, textZoom) }
-      _textZooms.offer(textZoom)
-    }
-
-  companion object {
-    // Prefs
-    const val PREF_LANG = "pref_language_chooser"
-    const val PREF_STORAGE = "pref_select_folder"
-    const val PREF_WIFI_ONLY = "pref_wifi_only"
-    const val PREF_KIWIX_MOBILE = "kiwix-mobile"
-    const val PREF_SHOW_INTRO = "showIntro"
-    private const val PREF_BACK_TO_TOP = "pref_backtotop"
-    private const val PREF_FULLSCREEN = "pref_fullscreen"
-    private const val PREF_NEW_TAB_BACKGROUND = "pref_newtab_background"
-    private const val PREF_STORAGE_TITLE = "pref_selected_title"
-    private const val PREF_EXTERNAL_LINK_POPUP = "pref_external_link_popup"
-    private const val PREF_IS_FIRST_RUN = "isFirstRun"
-    private const val PREF_SHOW_BOOKMARKS_ALL_BOOKS = "show_bookmarks_current_book"
-    private const val PREF_SHOW_HISTORY_ALL_BOOKS = "show_history_current_book"
-    private const val PREF_HOSTED_BOOKS = "hosted_books"
-    const val PREF_NIGHT_MODE = "pref_night_mode"
-    private const val TEXT_ZOOM = "true_text_zoom"
-    private const val DEFAULT_ZOOM = 100
-  }
-}
diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/settings/CustomPrefsFragment.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/settings/CustomPrefsFragment.kt
index 2ae639295..c5714c009 100644
--- a/custom/src/main/java/org/kiwix/kiwixmobile/custom/settings/CustomPrefsFragment.kt
+++ b/custom/src/main/java/org/kiwix/kiwixmobile/custom/settings/CustomPrefsFragment.kt
@@ -20,8 +20,8 @@ package org.kiwix.kiwixmobile.custom.settings
 
 import android.os.Bundle
 import org.kiwix.kiwixmobile.core.settings.CorePrefsFragment
-import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil.Companion.PREF_LANG
-import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil.Companion.PREF_WIFI_ONLY
+import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil.PREF_LANG
+import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil.PREF_WIFI_ONLY
 import org.kiwix.kiwixmobile.custom.BuildConfig
 
 class CustomPrefsFragment : CorePrefsFragment() {

From 2c8b9ab12c5a6b0caa48579696a74e33b1b09d0c Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Tue, 25 Aug 2020 10:47:39 +0100
Subject: [PATCH 11/11] #2282 Samsung exfat driver "sdfat" forbids to write big
 files - mark sdfat as virtual

---
 .../org/kiwix/kiwixmobile/zim_manager/MountPointProducer.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/zim_manager/MountPointProducer.kt b/core/src/main/java/org/kiwix/kiwixmobile/zim_manager/MountPointProducer.kt
index 63a2bfbed..6d9be6fd0 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/zim_manager/MountPointProducer.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/zim_manager/MountPointProducer.kt
@@ -44,8 +44,8 @@ data class MountInfo(val device: String, val mountPoint: String, val fileSystem:
   val doesNotSupport4GBFiles = DOES_NOT_SUPPORT_4GB_FILE_SYSTEMS.contains(fileSystem)
 
   companion object {
-    private val VIRTUAL_FILE_SYSTEMS = listOf("fuse", "sdcardfs")
+    private val VIRTUAL_FILE_SYSTEMS = listOf("fuse", "sdcardfs", "sdfat")
     private val SUPPORTS_4GB_FILE_SYSTEMS = listOf("ext4", "exfat")
-    private val DOES_NOT_SUPPORT_4GB_FILE_SYSTEMS = listOf("fat32", "vfat", "sdfat")
+    private val DOES_NOT_SUPPORT_4GB_FILE_SYSTEMS = listOf("fat32", "vfat")
   }
 }