From 468330e0eeb3f70c63a22a94100dd80a14da38bf Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Wed, 4 Dec 2019 15:39:38 +0000
Subject: [PATCH] #1301 update intro to support night mode

---
 app/lint-baseline.xml                         | 277 +++++++----
 .../main/res/drawable-night/ic_airplane.xml   |  53 +++
 .../src/main/res/drawable/ic_airplane.xml     |   0
 app/src/main/res/layout/activity_intro.xml    |   4 +-
 .../src/main/res/layout/item_intro_1.xml      |   1 -
 .../src/main/res/layout/item_intro_2.xml      |   1 -
 core/lint-baseline.xml                        | 430 +++++++++---------
 .../drawable-night/kiwix_icon_with_title.png  | Bin 0 -> 5560 bytes
 core/src/main/res/drawable/launch_screen.xml  |   2 +-
 9 files changed, 458 insertions(+), 310 deletions(-)
 create mode 100644 app/src/main/res/drawable-night/ic_airplane.xml
 rename {core => app}/src/main/res/drawable/ic_airplane.xml (100%)
 rename {core => app}/src/main/res/layout/item_intro_1.xml (97%)
 rename {core => app}/src/main/res/layout/item_intro_2.xml (97%)
 create mode 100644 core/src/main/res/drawable-night/kiwix_icon_with_title.png

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index c8d8296d8..8f86c5f1e 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0" client="gradle" variant="all" version="3.5.0">
+<issues format="5" by="lint 3.5.2" client="gradle" variant="debug" version="3.5.2">
 
     <issue
         id="ObsoleteLintCustomCheck"
@@ -8,6 +8,28 @@
             file="..\..\..\.android\lint\customlint.jar"/>
     </issue>
 
+    <issue
+        id="VectorRaster"
+        message="Limit vector icons sizes to 200×200 to keep icon drawing fast; see https://developer.android.com/studio/write/vector-asset-studio#when for more"
+        errorLine1="  android:width=&quot;449dp&quot;>"
+        errorLine2="                 ~~~~~">
+        <location
+            file="src\main\res\drawable-night\ic_airplane.xml"
+            line="5"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="VectorRaster"
+        message="Limit vector icons sizes to 200×200 to keep icon drawing fast; see https://developer.android.com/studio/write/vector-asset-studio#when for more"
+        errorLine1="  android:width=&quot;449dp&quot;>"
+        errorLine2="                 ~~~~~">
+        <location
+            file="src\main\res\drawable\ic_airplane.xml"
+            line="5"
+            column="18"/>
+    </issue>
+
     <issue
         id="RequiredSize"
         message="The required `layout_width` and `layout_height` attributes are missing"
@@ -15,7 +37,7 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\activity_library.xml"
-            line="11"
+            line="10"
             column="4"/>
     </issue>
 
@@ -26,7 +48,7 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\layout_download_management.xml"
-            line="12"
+            line="11"
             column="4"/>
     </issue>
 
@@ -37,54 +59,43 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\zim_list.xml"
-            line="11"
-            column="4"/>
-    </issue>
-
-    <issue
-        id="AllowBackup"
-        message="On SDK version 23 and up, your app data will be automatically backed up and restored on app install. Consider adding the attribute `android:fullBackupContent` to specify an `@xml` resource which configures which files to backup. More info: https://developer.android.com/training/backup/autosyncapi.html"
-        errorLine1="  &lt;application android:name=&quot;.KiwixApp&quot;>"
-        errorLine2="   ~~~~~~~~~~~">
-        <location
-            file="src\main\AndroidManifest.xml"
-            line="5"
+            line="9"
             column="4"/>
     </issue>
 
     <issue
         id="UnpackedNativeCode"
         message="Missing attribute android:extractNativeLibs=&quot;false&quot; on the `&lt;application>` tag."
-        errorLine1="  &lt;application android:name=&quot;.KiwixApp&quot;>"
+        errorLine1="  &lt;application"
         errorLine2="  ^">
         <location
             file="src\main\AndroidManifest.xml"
-            line="5"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="DisableBaselineAlignment"
-        message="Set `android:baselineAligned=&quot;false&quot;` on this element for better performance"
-        errorLine1="    &lt;LinearLayout"
-        errorLine2="     ~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\library_item.xml"
-            line="51"
-            column="6"/>
-    </issue>
-
-    <issue
-        id="Overdraw"
-        message="Possible overdraw: Root element paints background `?attr/listBackground` with a theme that also paints a background (inferred theme is `@android:style/Theme.Holo`)"
-        errorLine1="  android:background=&quot;?attr/listBackground&quot;"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\zim_list.xml"
             line="7"
             column="3"/>
     </issue>
 
+    <issue
+        id="VectorPath"
+        message="Very long vector path (1416 characters), which is bad for performance. Considering reducing precision, removing minor details or rasterizing vector."
+        errorLine1="    android:pathData=&quot;M3564,1035c-3,-8 10,-44 30,-79l36,-65 -57,-11c-141,-28 -345,-96 -428,-143 -34,-19 -40,-28 -43,-60 -3,-33 -6,-37 -32,-37 -16,0 -39,-4 -52,-9 -13,-5 -137,-90 -275,-189 -189,-135 -262,-182 -290,-186 -21,-3 -422,-8 -892,-12l-854,-7 -22,-25c-16,-19 -32,-26 -58,-26 -43,0-72,23 -89,71 -11,30 -15,33 -48,31 -28,-2 -37,1 -45,20 -9,20 -17,22 -82,22 -42,0 -73,-4 -73,-10 0,-6 26,-10 59,-10 52,0 61,-3 75,-25 12,-18 25,-25 50,-25 28,0 36,-5 46,-30 29,-71 120,-94 177,-46l29,24 839,6c462,4 858,9 880,12 57,8 92,30 349,217 187,136 236,167 263,167 38,0 38,0 18,-68 -9,-29 -13,-57 -10,-62 3,-6 30,-10 59,-10 65,0 113,28 139,82 26,54 10,69 -20,19 -27,-46 -67,-71 -114,-71 -28,0 -31,3 -25,23 4,12 12,55 19,96l12,73 58,30c76,38 214,83 347,114l104,23 23,-21c34,-31 29,-15 -27,89 -54,101 -55,100 32,82 85,-18 162,-65 234,-142 68,-74 92,-83 53,-21l-23,37 68,-7c37,-4 102,-18 146,-31 75,-24 170,-78 177,-101 7,-22 -250,-124 -311,-124 -16,0 -27,10 -37,33 -19,43 -71,69 -126,64 -55,-6 -91,-30 -110,-74l-15,-36 -156,7c-86,4 -176,10 -201,13 -35,5 -43,3 -39,-8 3,-8 26,-17 59,-21 77,-11 349,-24 358,-18 5,3 10,11 13,19 2,9 12,1 26,-22 24,-41 63,-57 88,-36 14,11 19,10 36,-11 12,-15 18,-36 16,-57 -1,-18 2,-34 7,-35 6,-2 11,18 13,43 2,37 -2,52 -21,74 -21,25 -22,32 -13,67 12,46 28,44 40,-5 12,-46 25,-47 152,-13 151,41 264,99 264,136 0,10 -16,32 -35,49 -76,67 -219,118 -355,128 -76,6 -88,10 -130,41 -56,43 -112,68 -186,81 -77,15 -94,14 -100,-4z&quot;"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\drawable-night\ic_airplane.xml"
+            line="16"
+            column="23"/>
+    </issue>
+
+    <issue
+        id="VectorPath"
+        message="Very long vector path (1416 characters), which is bad for performance. Considering reducing precision, removing minor details or rasterizing vector."
+        errorLine1="    android:pathData=&quot;M3564,1035c-3,-8 10,-44 30,-79l36,-65 -57,-11c-141,-28 -345,-96 -428,-143 -34,-19 -40,-28 -43,-60 -3,-33 -6,-37 -32,-37 -16,0 -39,-4 -52,-9 -13,-5 -137,-90 -275,-189 -189,-135 -262,-182 -290,-186 -21,-3 -422,-8 -892,-12l-854,-7 -22,-25c-16,-19 -32,-26 -58,-26 -43,0-72,23 -89,71 -11,30 -15,33 -48,31 -28,-2 -37,1 -45,20 -9,20 -17,22 -82,22 -42,0 -73,-4 -73,-10 0,-6 26,-10 59,-10 52,0 61,-3 75,-25 12,-18 25,-25 50,-25 28,0 36,-5 46,-30 29,-71 120,-94 177,-46l29,24 839,6c462,4 858,9 880,12 57,8 92,30 349,217 187,136 236,167 263,167 38,0 38,0 18,-68 -9,-29 -13,-57 -10,-62 3,-6 30,-10 59,-10 65,0 113,28 139,82 26,54 10,69 -20,19 -27,-46 -67,-71 -114,-71 -28,0 -31,3 -25,23 4,12 12,55 19,96l12,73 58,30c76,38 214,83 347,114l104,23 23,-21c34,-31 29,-15 -27,89 -54,101 -55,100 32,82 85,-18 162,-65 234,-142 68,-74 92,-83 53,-21l-23,37 68,-7c37,-4 102,-18 146,-31 75,-24 170,-78 177,-101 7,-22 -250,-124 -311,-124 -16,0 -27,10 -37,33 -19,43 -71,69 -126,64 -55,-6 -91,-30 -110,-74l-15,-36 -156,7c-86,4 -176,10 -201,13 -35,5 -43,3 -39,-8 3,-8 26,-17 59,-21 77,-11 349,-24 358,-18 5,3 10,11 13,19 2,9 12,1 26,-22 24,-41 63,-57 88,-36 14,11 19,10 36,-11 12,-15 18,-36 16,-57 -1,-18 2,-34 7,-35 6,-2 11,18 13,43 2,37 -2,52 -21,74 -21,25 -22,32 -13,67 12,46 28,44 40,-5 12,-46 25,-47 152,-13 151,41 264,99 264,136 0,10 -16,32 -35,49 -76,67 -219,118 -355,128 -76,6 -88,10 -130,41 -56,43 -112,68 -186,81 -77,15 -94,14 -100,-4z&quot;"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\drawable\ic_airplane.xml"
+            line="16"
+            column="23"/>
+    </issue>
+
     <issue
         id="SelectableText"
         message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
@@ -92,7 +103,7 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\activity_library.xml"
-            line="11"
+            line="10"
             column="4"/>
     </issue>
 
@@ -147,7 +158,7 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\header_date.xml"
-            line="9"
+            line="8"
             column="4"/>
     </issue>
 
@@ -158,7 +169,7 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\item_language.xml"
-            line="20"
+            line="18"
             column="4"/>
     </issue>
 
@@ -169,7 +180,7 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\item_language.xml"
-            line="35"
+            line="32"
             column="4"/>
     </issue>
 
@@ -180,10 +191,98 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\item_language.xml"
-            line="47"
+            line="43"
             column="4"/>
     </issue>
 
+    <issue
+        id="SelectableText"
+        message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
+        errorLine1="    &lt;TextView"
+        errorLine2="     ~~~~~~~~">
+        <location
+            file="src\main\res\layout\item_library.xml"
+            line="34"
+            column="6"/>
+    </issue>
+
+    <issue
+        id="SelectableText"
+        message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
+        errorLine1="    &lt;TextView"
+        errorLine2="     ~~~~~~~~">
+        <location
+            file="src\main\res\layout\item_library.xml"
+            line="41"
+            column="6"/>
+    </issue>
+
+    <issue
+        id="SelectableText"
+        message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
+        errorLine1="        &lt;TextView"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src\main\res\layout\item_library.xml"
+            line="61"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="SelectableText"
+        message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
+        errorLine1="        &lt;TextView"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src\main\res\layout\item_library.xml"
+            line="68"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="SelectableText"
+        message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
+        errorLine1="        &lt;TextView"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src\main\res\layout\item_library.xml"
+            line="75"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="SelectableText"
+        message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
+        errorLine1="        &lt;TextView"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src\main\res\layout\item_library.xml"
+            line="91"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="SelectableText"
+        message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
+        errorLine1="        &lt;TextView"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src\main\res\layout\item_library.xml"
+            line="98"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="SelectableText"
+        message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
+        errorLine1="        &lt;TextView"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src\main\res\layout\item_library.xml"
+            line="105"
+            column="10"/>
+    </issue>
+
     <issue
         id="SelectableText"
         message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
@@ -191,7 +290,7 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\library_divider.xml"
-            line="13"
+            line="12"
             column="4"/>
     </issue>
 
@@ -234,22 +333,11 @@
         errorLine1="  &lt;ImageView"
         errorLine2="   ~~~~~~~~~">
         <location
-            file="src\main\res\layout\library_item.xml"
+            file="src\main\res\layout\item_library.xml"
             line="15"
             column="4"/>
     </issue>
 
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="    android:paddingLeft=&quot;@dimen/dimen_small_padding&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\library_item.xml"
-            line="31"
-            column="5"/>
-    </issue>
-
     <issue
         id="RtlHardcoded"
         message="Consider adding `android:layout_marginEnd=&quot;@dimen/favicon_margin_right&quot;` to better support right-to-left layouts"
@@ -261,39 +349,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;@dimen/favicon_margin_right&quot;` to better support right-to-left layouts"
-        errorLine1="    android:layout_marginRight=&quot;@dimen/favicon_margin_right&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\library_item.xml"
-            line="20"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:paddingStart=&quot;@dimen/dimen_small_padding&quot;` to better support right-to-left layouts"
-        errorLine1="    android:paddingLeft=&quot;@dimen/dimen_small_padding&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\library_item.xml"
-            line="31"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        android:gravity=&quot;right&quot;"
-        errorLine2="                         ~~~~~">
-        <location
-            file="src\main\res\layout\library_item.xml"
-            line="95"
-            column="26"/>
-    </issue>
-
     <issue
         id="RtlEnabled"
         message="The project references RTL attributes, but does not explicitly enable or disable RTL support with `android:supportsRtl` in the manifest">
@@ -301,6 +356,50 @@
             file="src\main\AndroidManifest.xml"/>
     </issue>
 
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public CustomViewPager(Context context) {"
+        errorLine2="                         ~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\intro\CustomViewPager.java"
+            line="36"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public CustomViewPager(Context context, AttributeSet attrs) {"
+        errorLine2="                         ~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\intro\CustomViewPager.java"
+            line="41"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public CustomViewPager(Context context, AttributeSet attrs) {"
+        errorLine2="                                          ~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\intro\CustomViewPager.java"
+            line="41"
+            column="43"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  protected void onCreate(Bundle savedInstanceState) {"
+        errorLine2="                          ~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\intro\IntroActivity.java"
+            line="87"
+            column="27"/>
+    </issue>
+
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
diff --git a/app/src/main/res/drawable-night/ic_airplane.xml b/app/src/main/res/drawable-night/ic_airplane.xml
new file mode 100644
index 000000000..6cc4349dc
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_airplane.xml
@@ -0,0 +1,53 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:height="121dp"
+  android:viewportHeight="1210"
+  android:viewportWidth="4490"
+  android:width="449dp">
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M970,1203c-106,-3 -138,-7 -152,-20 -16,-15 -18,-38 -18,-260l0,-243 -30,-1c-16,-1 -34,-3 -40,-4 -5,-1 -73,-3 -150,-4 -88,-1 -140,-5 -140,-11 0,-7 66,-9 193,-8l192,3 3,250c1,137 6,253 11,258 8,8 363,13 1061,16 143,1 240,5 235,10 -10,9 -916,20 -1165,14z"
+    android:strokeColor="#00000000" />
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M2226,1191c-3,-5 44,-11 107,-13 61,-2 118,-7 125,-11 9,-6 12,-101 12,-415 0,-373 5,-464 24,-417 3,9 6,198 6,419 0,347 -2,405 -16,424 -14,21 -23,22 -134,22 -65,0 -121,-4 -124,-9z"
+    android:strokeColor="#00000000" />
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M3564,1035c-3,-8 10,-44 30,-79l36,-65 -57,-11c-141,-28 -345,-96 -428,-143 -34,-19 -40,-28 -43,-60 -3,-33 -6,-37 -32,-37 -16,0 -39,-4 -52,-9 -13,-5 -137,-90 -275,-189 -189,-135 -262,-182 -290,-186 -21,-3 -422,-8 -892,-12l-854,-7 -22,-25c-16,-19 -32,-26 -58,-26 -43,0-72,23 -89,71 -11,30 -15,33 -48,31 -28,-2 -37,1 -45,20 -9,20 -17,22 -82,22 -42,0 -73,-4 -73,-10 0,-6 26,-10 59,-10 52,0 61,-3 75,-25 12,-18 25,-25 50,-25 28,0 36,-5 46,-30 29,-71 120,-94 177,-46l29,24 839,6c462,4 858,9 880,12 57,8 92,30 349,217 187,136 236,167 263,167 38,0 38,0 18,-68 -9,-29 -13,-57 -10,-62 3,-6 30,-10 59,-10 65,0 113,28 139,82 26,54 10,69 -20,19 -27,-46 -67,-71 -114,-71 -28,0 -31,3 -25,23 4,12 12,55 19,96l12,73 58,30c76,38 214,83 347,114l104,23 23,-21c34,-31 29,-15 -27,89 -54,101 -55,100 32,82 85,-18 162,-65 234,-142 68,-74 92,-83 53,-21l-23,37 68,-7c37,-4 102,-18 146,-31 75,-24 170,-78 177,-101 7,-22 -250,-124 -311,-124 -16,0 -27,10 -37,33 -19,43 -71,69 -126,64 -55,-6 -91,-30 -110,-74l-15,-36 -156,7c-86,4 -176,10 -201,13 -35,5 -43,3 -39,-8 3,-8 26,-17 59,-21 77,-11 349,-24 358,-18 5,3 10,11 13,19 2,9 12,1 26,-22 24,-41 63,-57 88,-36 14,11 19,10 36,-11 12,-15 18,-36 16,-57 -1,-18 2,-34 7,-35 6,-2 11,18 13,43 2,37 -2,52 -21,74 -21,25 -22,32 -13,67 12,46 28,44 40,-5 12,-46 25,-47 152,-13 151,41 264,99 264,136 0,10 -16,32 -35,49 -76,67 -219,118 -355,128 -76,6 -88,10 -130,41 -56,43 -112,68 -186,81 -77,15 -94,14 -100,-4z"
+    android:strokeColor="#00000000" />
+  <path
+    android:fillColor="#b5d9f6"
+    android:pathData="M3900,668c-1,-26 -40,-98 -53,-98 -19,0 -44,30 -52,62 -5,19 -2,29 12,37 26,15 93,14 93,-1z" />
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M4310,951c-5,-11 -10,-28 -10,-38 0,-15 2,-14 16,5 8,12 19,22 24,22 33,0 53,-242 26,-333 -9,-31 -20,-57 -25,-57 -5,0 -15,10 -24,23 -20,30 -35,12 -16,-21 41,-74 108,7 117,143 5,80 -11,192 -35,243 -18,37 -56,44 -73,13z"
+    android:strokeColor="#00000000" />
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M2571,944c38,-46 362,-274 389,-274 29,0 -22,40 -262,208 -113,79 -157,102 -127,66z"
+    android:strokeColor="#00000000" />
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M976,671c-12,-18 32,-21 308,-21 286,0 380,5 370,21 -7,12 -671,12 -678,0z"
+    android:strokeColor="#00000000" />
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M3775,486c-21,-32 -17,-54 16,-78 32,-24 61,-17 78,18 28,63 -57,117 -94,60zM3853,466c6,-15 -11,-36 -28,-36 -17,0 -34,21 -28,36 3,8 15,14 28,14 13,0 25,-6 28,-14z"
+    android:strokeColor="#00000000" />
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M190,480c0,-6 48,-10 124,-10 73,0 127,4 131,10 4,6 -40,10 -124,10 -81,0 -131,-4 -131,-10z"
+    android:strokeColor="#00000000" />
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M1008,481c-245,-3 -449,-9 -452,-12 -20,-19 1049,-19 1082,0 12,8 -2,10 -54,11 -39,0 -84,1 -100,3 -16,2 -230,1 -476,-2z"
+    android:strokeColor="#00000000" />
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M97,333c-52,-6 -36,-23 21,-23 57,0 94,9 86,21 -5,9 -34,9 -107,2z"
+    android:strokeColor="#00000000" />
+  <path
+    android:fillColor="#96A5D7"
+    android:pathData="M806,155c-14,-36 -6,-92 15,-111 20,-18 47,-19 837,-17 695,2 818,5 830,17 11,11 13,28 8,70 -9,67 -26,65 -26,-3l0,-49 -792,-7c-436,-4 -804,-6 -818,-4 -22,4 -26,10 -31,57 -8,59 -13,71 -23,47z"
+    android:strokeColor="#00000000" />
+</vector>
diff --git a/core/src/main/res/drawable/ic_airplane.xml b/app/src/main/res/drawable/ic_airplane.xml
similarity index 100%
rename from core/src/main/res/drawable/ic_airplane.xml
rename to app/src/main/res/drawable/ic_airplane.xml
diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml
index 10d103f3e..f87159fa5 100644
--- a/app/src/main/res/layout/activity_intro.xml
+++ b/app/src/main/res/layout/activity_intro.xml
@@ -13,14 +13,12 @@
     app:layout_constraintBottom_toTopOf="@id/get_started"
     app:layout_constraintTop_toTopOf="parent" />
 
-  <androidx.appcompat.widget.AppCompatButton
+  <Button
     android:id="@+id/get_started"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="32dp"
     android:text="@string/get_started"
-    android:textColor="@color/blue800"
-    app:backgroundTint="@android:color/white"
     app:layout_constraintBottom_toTopOf="@id/tab_indicator"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent" />
diff --git a/core/src/main/res/layout/item_intro_1.xml b/app/src/main/res/layout/item_intro_1.xml
similarity index 97%
rename from core/src/main/res/layout/item_intro_1.xml
rename to app/src/main/res/layout/item_intro_1.xml
index 07fddad32..dbd6c654a 100644
--- a/core/src/main/res/layout/item_intro_1.xml
+++ b/app/src/main/res/layout/item_intro_1.xml
@@ -23,7 +23,6 @@
     android:layout_marginBottom="@dimen/activity_vertical_margin"
     android:text="@string/welcome_to_the_family"
     android:textAlignment="center"
-    android:textColor="@android:color/black"
     android:textSize="24sp"
     android:textStyle="bold"
     app:layout_constraintBottom_toTopOf="@id/subheading"
diff --git a/core/src/main/res/layout/item_intro_2.xml b/app/src/main/res/layout/item_intro_2.xml
similarity index 97%
rename from core/src/main/res/layout/item_intro_2.xml
rename to app/src/main/res/layout/item_intro_2.xml
index 518688bc8..4354d65f3 100644
--- a/core/src/main/res/layout/item_intro_2.xml
+++ b/app/src/main/res/layout/item_intro_2.xml
@@ -25,7 +25,6 @@
     android:layout_marginBottom="@dimen/activity_vertical_margin"
     android:text="@string/save_books_offline"
     android:textAlignment="center"
-    android:textColor="@android:color/black"
     android:textSize="24sp"
     android:textStyle="bold"
     app:layout_constraintBottom_toTopOf="@id/subheading"
diff --git a/core/lint-baseline.xml b/core/lint-baseline.xml
index d1757951d..c7fd73d68 100644
--- a/core/lint-baseline.xml
+++ b/core/lint-baseline.xml
@@ -15,7 +15,7 @@
         errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\layout\dialog_add_note.xml"
-            line="33"
+            line="20"
             column="7"/>
     </issue>
 
@@ -128,7 +128,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\layout\section_list.xml"
-            line="18"
+            line="19"
             column="5"/>
     </issue>
 
@@ -139,7 +139,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src\main\res\layout\activity_help.xml"
-            line="32"
+            line="20"
             column="5"/>
     </issue>
 
@@ -209,17 +209,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="VectorDrawableCompat"
-        message="To use VectorDrawableCompat, you need to set `android.defaultConfig.vectorDrawables.useSupportLibrary = true`."
-        errorLine1="    app:srcCompat=&quot;@drawable/ic_airplane&quot; />"
-        errorLine2="    ~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\item_intro_2.xml"
-            line="19"
-            column="5"/>
-    </issue>
-
     <issue
         id="VectorDrawableCompat"
         message="To use VectorDrawableCompat, you need to set `android.defaultConfig.vectorDrawables.useSupportLibrary = true`."
@@ -249,7 +238,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src\main\res\layout\main_activity_content.xml"
-            line="55"
+            line="50"
             column="5"/>
     </issue>
 
@@ -260,7 +249,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src\main\res\layout\main_activity_content.xml"
-            line="68"
+            line="62"
             column="5"/>
     </issue>
 
@@ -271,21 +260,10 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src\main\res\layout\tab_switcher.xml"
-            line="25"
+            line="24"
             column="5"/>
     </issue>
 
-    <issue
-        id="VectorRaster"
-        message="Limit vector icons sizes to 200×200 to keep icon drawing fast; see https://developer.android.com/studio/write/vector-asset-studio#when for more"
-        errorLine1="  android:width=&quot;449dp&quot;>"
-        errorLine2="                 ~~~~~">
-        <location
-            file="src\main\res\drawable\ic_airplane.xml"
-            line="5"
-            column="18"/>
-    </issue>
-
     <issue
         id="VectorRaster"
         message="This tag is not supported in images generated from this vector icon for API &lt; 21; check generated icon to make sure it looks acceptable"
@@ -429,7 +407,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1374"
+            line="1327"
             column="5"/>
     </issue>
 
@@ -440,7 +418,7 @@
         errorLine2="     ~~~~~~~~">
         <location
             file="src\main\AndroidManifest.xml"
-            line="32"
+            line="29"
             column="6"/>
     </issue>
 
@@ -520,7 +498,7 @@
         errorLine2="       ~~~~~~~~">
         <location
             file="src\main\res\layout\dialog_add_note.xml"
-            line="36"
+            line="23"
             column="8"/>
     </issue>
 
@@ -641,7 +619,7 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\section_list.xml"
-            line="10"
+            line="11"
             column="4"/>
     </issue>
 
@@ -689,17 +667,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="AlwaysShowAction"
-        message="Prefer &quot;`SHOW_AS_ACTION_IF_ROOM`&quot; instead of &quot;`SHOW_AS_ACTION_ALWAYS`&quot;"
-        errorLine1="        random.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1409"
-            column="41"/>
-    </issue>
-
     <issue
         id="AlwaysShowAction"
         message="Prefer &quot;`ifRoom`&quot; instead of &quot;`always`&quot;"
@@ -722,7 +689,7 @@
         errorLine2="       ~~~~~~~~">
         <location
             file="src\main\res\layout\dialog_add_note.xml"
-            line="57"
+            line="44"
             column="8"/>
     </issue>
 
@@ -744,7 +711,7 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="67"
+            line="69"
             column="18"/>
     </issue>
 
@@ -799,7 +766,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\layout\section_list.xml"
-            line="22"
+            line="23"
             column="5"/>
     </issue>
 
@@ -810,7 +777,7 @@
         errorLine2="                         ~~~~~~~~">
         <location
             file="src\main\res\layout\dialog_add_note.xml"
-            line="62"
+            line="49"
             column="26"/>
     </issue>
 
@@ -821,7 +788,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\layout\section_list.xml"
-            line="22"
+            line="23"
             column="5"/>
     </issue>
 
@@ -843,7 +810,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="46"
+            line="43"
             column="19"/>
     </issue>
 
@@ -854,7 +821,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="50"
+            line="47"
             column="19"/>
     </issue>
 
@@ -865,7 +832,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="54"
+            line="51"
             column="19"/>
     </issue>
 
@@ -876,7 +843,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="58"
+            line="55"
             column="19"/>
     </issue>
 
@@ -887,18 +854,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="62"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public abstract ZimHostActivity provideZimHostActivity();"
-        errorLine2="                  ~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="66"
+            line="59"
             column="19"/>
     </issue>
 
@@ -1019,7 +975,7 @@
         errorLine2="                             ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\search\AutoCompleteAdapter.java"
-            line="46"
+            line="47"
             column="30"/>
     </issue>
 
@@ -1030,7 +986,7 @@
         errorLine2="         ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\search\AutoCompleteAdapter.java"
-            line="64"
+            line="65"
             column="10"/>
     </issue>
 
@@ -1041,7 +997,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\search\AutoCompleteAdapter.java"
-            line="64"
+            line="65"
             column="37"/>
     </issue>
 
@@ -1052,7 +1008,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\search\AutoCompleteAdapter.java"
-            line="64"
+            line="65"
             column="55"/>
     </issue>
 
@@ -1063,7 +1019,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\search\AutoCompleteAdapter.java"
-            line="74"
+            line="75"
             column="10"/>
     </issue>
 
@@ -1074,7 +1030,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\search\AutoCompleteAdapter.java"
-            line="86"
+            line="87"
             column="10"/>
     </issue>
 
@@ -1932,7 +1888,7 @@
         errorLine2="            ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="185"
+            line="176"
             column="13"/>
     </issue>
 
@@ -1943,7 +1899,7 @@
         errorLine2="            ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="187"
+            line="178"
             column="13"/>
     </issue>
 
@@ -1954,7 +1910,7 @@
         errorLine2="            ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="197"
+            line="188"
             column="13"/>
     </issue>
 
@@ -1965,7 +1921,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="206"
+            line="197"
             column="13"/>
     </issue>
 
@@ -1976,7 +1932,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="210"
+            line="201"
             column="13"/>
     </issue>
 
@@ -1987,7 +1943,18 @@
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="212"
+            line="203"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  protected MainMenu.Factory menuFactory;"
+        errorLine2="            ~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
+            line="205"
             column="13"/>
     </issue>
 
@@ -1998,7 +1965,7 @@
         errorLine2="                                  ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="294"
+            line="283"
             column="35"/>
     </issue>
 
@@ -2009,7 +1976,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="306"
+            line="295"
             column="36"/>
     </issue>
 
@@ -2020,7 +1987,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="326"
+            line="315"
             column="24"/>
     </issue>
 
@@ -2031,7 +1998,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="651"
+            line="643"
             column="36"/>
     </issue>
 
@@ -2042,7 +2009,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="764"
+            line="748"
             column="22"/>
     </issue>
 
@@ -2053,7 +2020,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="765"
+            line="749"
             column="5"/>
     </issue>
 
@@ -2064,7 +2031,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="766"
+            line="750"
             column="5"/>
     </issue>
 
@@ -2075,7 +2042,7 @@
         errorLine2="            ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="768"
+            line="752"
             column="13"/>
     </issue>
 
@@ -2086,7 +2053,7 @@
         errorLine2="            ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="772"
+            line="756"
             column="13"/>
     </issue>
 
@@ -2097,7 +2064,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="772"
+            line="756"
             column="33"/>
     </issue>
 
@@ -2108,7 +2075,7 @@
         errorLine2="            ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="829"
+            line="810"
             column="13"/>
     </issue>
 
@@ -2119,7 +2086,7 @@
         errorLine2="                                       ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="839"
+            line="820"
             column="40"/>
     </issue>
 
@@ -2130,7 +2097,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="989"
+            line="983"
             column="31"/>
     </issue>
 
@@ -2141,7 +2108,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1306"
+            line="1259"
             column="30"/>
     </issue>
 
@@ -2152,7 +2119,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1324"
+            line="1277"
             column="35"/>
     </issue>
 
@@ -2163,7 +2130,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1398"
+            line="1351"
             column="38"/>
     </issue>
 
@@ -2174,7 +2141,7 @@
         errorLine2="                                                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1428"
+            line="1369"
             column="65"/>
     </issue>
 
@@ -2185,21 +2152,10 @@
         errorLine2="                                     ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1522"
+            line="1463"
             column="38"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public boolean onPrepareOptionsMenu(Menu menu) {"
-        errorLine2="                                      ~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1549"
-            column="39"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -2207,7 +2163,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1696"
+            line="1575"
             column="40"/>
     </issue>
 
@@ -2218,7 +2174,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1696"
+            line="1575"
             column="52"/>
     </issue>
 
@@ -2229,7 +2185,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1701"
+            line="1580"
             column="36"/>
     </issue>
 
@@ -2240,7 +2196,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1717"
+            line="1596"
             column="35"/>
     </issue>
 
@@ -2251,7 +2207,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1741"
+            line="1620"
             column="38"/>
     </issue>
 
@@ -2262,7 +2218,7 @@
         errorLine2="                          ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1777"
+            line="1656"
             column="27"/>
     </issue>
 
@@ -2273,7 +2229,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreMainActivity.java"
-            line="1790"
+            line="1670"
             column="24"/>
     </issue>
 
@@ -2284,7 +2240,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CorePrefsFragment.java"
-            line="74"
+            line="72"
             column="13"/>
     </issue>
 
@@ -2295,7 +2251,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CorePrefsFragment.java"
-            line="76"
+            line="74"
             column="13"/>
     </issue>
 
@@ -2306,7 +2262,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CorePrefsFragment.java"
-            line="78"
+            line="76"
             column="13"/>
     </issue>
 
@@ -2317,7 +2273,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CorePrefsFragment.java"
-            line="83"
+            line="81"
             column="24"/>
     </issue>
 
@@ -2328,7 +2284,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CorePrefsFragment.java"
-            line="126"
+            line="124"
             column="39"/>
     </issue>
 
@@ -2339,7 +2295,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CorePrefsFragment.java"
-            line="183"
+            line="181"
             column="41"/>
     </issue>
 
@@ -2350,7 +2306,7 @@
         errorLine2="                                                                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CorePrefsFragment.java"
-            line="183"
+            line="181"
             column="78"/>
     </issue>
 
@@ -2361,7 +2317,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CorePrefsFragment.java"
-            line="261"
+            line="256"
             column="40"/>
     </issue>
 
@@ -2372,7 +2328,7 @@
         errorLine2="    ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CorePrefsFragment.java"
-            line="262"
+            line="257"
             column="5"/>
     </issue>
 
@@ -2405,7 +2361,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="51"
+            line="52"
             column="5"/>
     </issue>
 
@@ -2416,7 +2372,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="51"
+            line="52"
             column="31"/>
     </issue>
 
@@ -2427,7 +2383,7 @@
         errorLine2="                                          ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="57"
+            line="58"
             column="43"/>
     </issue>
 
@@ -2438,7 +2394,7 @@
         errorLine2="                                                        ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="57"
+            line="58"
             column="57"/>
     </issue>
 
@@ -2449,7 +2405,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="105"
+            line="106"
             column="31"/>
     </issue>
 
@@ -2460,7 +2416,7 @@
         errorLine2="                                                           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="105"
+            line="106"
             column="60"/>
     </issue>
 
@@ -2471,7 +2427,7 @@
         errorLine2="                                                                               ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="105"
+            line="106"
             column="80"/>
     </issue>
 
@@ -2482,7 +2438,7 @@
         errorLine2="                             ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="110"
+            line="111"
             column="30"/>
     </issue>
 
@@ -2493,7 +2449,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="110"
+            line="111"
             column="44"/>
     </issue>
 
@@ -2504,7 +2460,7 @@
         errorLine2="                                           ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="128"
+            line="129"
             column="44"/>
     </issue>
 
@@ -2515,7 +2471,7 @@
         errorLine2="                                       ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="130"
+            line="131"
             column="40"/>
     </issue>
 
@@ -2526,7 +2482,7 @@
         errorLine2="                                 ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CoreWebViewClient.java"
-            line="132"
+            line="133"
             column="34"/>
     </issue>
 
@@ -3494,7 +3450,7 @@
         errorLine2="                      ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="63"
+            line="65"
             column="23"/>
     </issue>
 
@@ -3505,7 +3461,7 @@
         errorLine2="                      ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="67"
+            line="69"
             column="23"/>
     </issue>
 
@@ -3516,7 +3472,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="67"
+            line="69"
             column="40"/>
     </issue>
 
@@ -3527,7 +3483,7 @@
         errorLine2="                                                                 ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="67"
+            line="69"
             column="66"/>
     </issue>
 
@@ -3538,7 +3494,7 @@
         errorLine2="    ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="68"
+            line="70"
             column="5"/>
     </issue>
 
@@ -3549,7 +3505,7 @@
         errorLine2="                            ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="68"
+            line="70"
             column="29"/>
     </issue>
 
@@ -3560,7 +3516,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="68"
+            line="70"
             column="50"/>
     </issue>
 
@@ -3571,7 +3527,7 @@
         errorLine2="                                     ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="126"
+            line="131"
             column="38"/>
     </issue>
 
@@ -4594,7 +4550,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="63"
+            line="66"
             column="31"/>
     </issue>
 
@@ -4605,7 +4561,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="103"
+            line="106"
             column="10"/>
     </issue>
 
@@ -4616,7 +4572,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="103"
+            line="106"
             column="33"/>
     </issue>
 
@@ -4627,7 +4583,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="107"
+            line="110"
             column="10"/>
     </issue>
 
@@ -4638,7 +4594,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="117"
+            line="120"
             column="10"/>
     </issue>
 
@@ -4649,7 +4605,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="117"
+            line="120"
             column="37"/>
     </issue>
 
@@ -4660,7 +4616,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="126"
+            line="129"
             column="31"/>
     </issue>
 
@@ -4671,7 +4627,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="138"
+            line="141"
             column="35"/>
     </issue>
 
@@ -4682,7 +4638,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="142"
+            line="145"
             column="30"/>
     </issue>
 
@@ -4693,7 +4649,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="147"
+            line="150"
             column="10"/>
     </issue>
 
@@ -4704,10 +4660,32 @@
         errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="199"
+            line="202"
             column="10"/>
     </issue>
 
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public Set&lt;String> getHostedBooks() {"
+        errorLine2="         ~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
+            line="210"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public void setHostedBooks(Set&lt;String> hostedBooks) {"
+        errorLine2="                             ~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
+            line="214"
+            column="30"/>
+    </issue>
+
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -5078,95 +5056,106 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="35"
+            line="37"
             column="39"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public ToolbarScrollingKiwixWebView(Context context, WebViewCallback callback, View toolbarView,"
+        errorLine1="  public ToolbarScrollingKiwixWebView(Context context, WebViewCallback callback, AttributeSet attrs,"
         errorLine2="                                      ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="39"
+            line="41"
             column="39"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public ToolbarScrollingKiwixWebView(Context context, WebViewCallback callback, View toolbarView,"
+        errorLine1="  public ToolbarScrollingKiwixWebView(Context context, WebViewCallback callback, AttributeSet attrs,"
         errorLine2="                                                       ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="39"
+            line="41"
             column="56"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public ToolbarScrollingKiwixWebView(Context context, WebViewCallback callback, View toolbarView,"
-        errorLine2="                                                                                 ~~~~">
+        errorLine1="  public ToolbarScrollingKiwixWebView(Context context, WebViewCallback callback, AttributeSet attrs,"
+        errorLine2="                                                                                 ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="39"
+            line="41"
             column="82"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    View bottomBarView, ViewGroup nonVideoView, ViewGroup videoView,"
+        errorLine1="    ViewGroup nonVideoView, ViewGroup videoView, CoreWebViewClient webViewClient, View toolbarView,"
+        errorLine2="    ~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
+            line="42"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    ViewGroup nonVideoView, ViewGroup videoView, CoreWebViewClient webViewClient, View toolbarView,"
+        errorLine2="                            ~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
+            line="42"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    ViewGroup nonVideoView, ViewGroup videoView, CoreWebViewClient webViewClient, View toolbarView,"
+        errorLine2="                                                 ~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
+            line="42"
+            column="50"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    ViewGroup nonVideoView, ViewGroup videoView, CoreWebViewClient webViewClient, View toolbarView,"
+        errorLine2="                                                                                  ~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
+            line="42"
+            column="83"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    View bottomBarView, SharedPreferenceUtil sharedPreferenceUtil) {"
         errorLine2="    ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="40"
+            line="43"
             column="5"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    View bottomBarView, ViewGroup nonVideoView, ViewGroup videoView,"
-        errorLine2="                        ~~~~~~~~~">
+        errorLine1="    View bottomBarView, SharedPreferenceUtil sharedPreferenceUtil) {"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="40"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    View bottomBarView, ViewGroup nonVideoView, ViewGroup videoView,"
-        errorLine2="                                                ~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="40"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    AttributeSet attrs, CoreWebViewClient webViewClient) {"
-        errorLine2="    ~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="41"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    AttributeSet attrs, CoreWebViewClient webViewClient) {"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="41"
+            line="43"
             column="25"/>
     </issue>
 
@@ -5177,7 +5166,7 @@
         errorLine2="                              ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="67"
+            line="69"
             column="31"/>
     </issue>
 
@@ -5188,7 +5177,7 @@
         errorLine2="                                   ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarStaticKiwixWebView.java"
-            line="33"
+            line="35"
             column="36"/>
     </issue>
 
@@ -5199,7 +5188,7 @@
         errorLine2="                                   ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarStaticKiwixWebView.java"
-            line="37"
+            line="39"
             column="36"/>
     </issue>
 
@@ -5210,51 +5199,62 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarStaticKiwixWebView.java"
-            line="37"
+            line="39"
             column="53"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    ViewGroup nonVideoView, ViewGroup videoView, AttributeSet attrs,"
-        errorLine2="    ~~~~~~~~~">
+        errorLine1="    AttributeSet attrs, ViewGroup nonVideoView, ViewGroup videoView,"
+        errorLine2="    ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarStaticKiwixWebView.java"
-            line="38"
+            line="40"
             column="5"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    ViewGroup nonVideoView, ViewGroup videoView, AttributeSet attrs,"
-        errorLine2="                            ~~~~~~~~~">
+        errorLine1="    AttributeSet attrs, ViewGroup nonVideoView, ViewGroup videoView,"
+        errorLine2="                        ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarStaticKiwixWebView.java"
-            line="38"
-            column="29"/>
+            line="40"
+            column="25"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    ViewGroup nonVideoView, ViewGroup videoView, AttributeSet attrs,"
-        errorLine2="                                                 ~~~~~~~~~~~~">
+        errorLine1="    AttributeSet attrs, ViewGroup nonVideoView, ViewGroup videoView,"
+        errorLine2="                                                ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarStaticKiwixWebView.java"
-            line="38"
-            column="50"/>
+            line="40"
+            column="49"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    CoreWebViewClient webViewClient) {"
+        errorLine1="    CoreWebViewClient webViewClient,"
         errorLine2="    ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarStaticKiwixWebView.java"
-            line="39"
+            line="41"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    SharedPreferenceUtil sharedPreferenceUtil) {"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarStaticKiwixWebView.java"
+            line="42"
             column="5"/>
     </issue>
 
diff --git a/core/src/main/res/drawable-night/kiwix_icon_with_title.png b/core/src/main/res/drawable-night/kiwix_icon_with_title.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7a16aba88d3bc39aee9a18cc238c9a1df0f7c58
GIT binary patch
literal 5560
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
A6aWAK

literal 0
HcmV?d00001

diff --git a/core/src/main/res/drawable/launch_screen.xml b/core/src/main/res/drawable/launch_screen.xml
index e87064c4b..ae7b61922 100644
--- a/core/src/main/res/drawable/launch_screen.xml
+++ b/core/src/main/res/drawable/launch_screen.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
   android:opacity="opaque">
   <!-- The background color, preferably the same as your normal theme -->
-  <item android:drawable="@android:color/white" />
+  <item android:drawable="@color/color_surface" />
   <item>
     <bitmap
       android:gravity="center"