From 338b21f318bc4b6659aff65b648160696838e019 Mon Sep 17 00:00:00 2001
From: Mohamed Sameh <mohamedsameh1998@gmail.com>
Date: Sat, 22 Feb 2020 23:50:51 +0200
Subject: [PATCH 01/16] Replace AlertDialog with DialogShower once and Add icon
 in DialogShower

---
 .../core/main/CoreMainActivity.java           | 39 ++++++++++---------
 .../core/utils/AlertDialogShower.kt           |  1 +
 .../kiwixmobile/core/utils/KiwixDialog.kt     |  7 +++-
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
index f565942b0..b5162f747 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
@@ -87,6 +87,7 @@ import java.util.Date;
 import java.util.List;
 import javax.inject.Inject;
 import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
 import org.kiwix.kiwixmobile.core.BuildConfig;
@@ -109,7 +110,9 @@ import org.kiwix.kiwixmobile.core.reader.ZimFileReader;
 import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer;
 import org.kiwix.kiwixmobile.core.search.SearchActivity;
 import org.kiwix.kiwixmobile.core.search.viewmodel.effects.SearchInPreviousScreen;
+import org.kiwix.kiwixmobile.core.utils.AlertDialogShower;
 import org.kiwix.kiwixmobile.core.utils.DimenUtils;
+import org.kiwix.kiwixmobile.core.utils.KiwixDialog;
 import org.kiwix.kiwixmobile.core.utils.LanguageUtils;
 import org.kiwix.kiwixmobile.core.utils.NetworkUtils;
 import org.kiwix.kiwixmobile.core.utils.StyleUtils;
@@ -213,6 +216,8 @@ public abstract class CoreMainActivity extends BaseActivity
   protected NewBookmarksDao newBookmarksDao;
   @Inject
   protected NewBookDao newBookDao;
+  @Inject
+  private AlertDialogShower alertDialogShower;
 
   private CountDownTimer hideBackToTopTimer = new CountDownTimer(1200, 1200) {
     @Override
@@ -1688,25 +1693,21 @@ public abstract class CoreMainActivity extends BaseActivity
   }
 
   protected void showOpenInNewTabDialog(String url) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
-    builder.setPositiveButton(android.R.string.yes, (dialog, id) -> {
-      if (isOpenNewTabInBackground) {
-        newTabInBackground(url);
-        Snackbar.make(snackbarRoot, R.string.new_tab_snack_bar, Snackbar.LENGTH_LONG)
-          .setAction(getString(R.string.open), v -> {
-            if (webViewList.size() > 1) selectTab(webViewList.size() - 1);
-          })
-          .setActionTextColor(getResources().getColor(R.color.white))
-          .show();
-      } else {
-        newTab(url);
-      }
-    });
-    builder.setNegativeButton(android.R.string.no, null);
-    builder.setMessage(getString(R.string.open_in_new_tab));
-    AlertDialog dialog = builder.create();
-    dialog.show();
+    alertDialogShower.show(KiwixDialog.YesNoDialog.OpenInNewTab.INSTANCE,
+      (Function0<Unit>) () -> {
+        if (isOpenNewTabInBackground) {
+          newTabInBackground(url);
+          Snackbar.make(snackbarRoot, R.string.new_tab_snack_bar, Snackbar.LENGTH_LONG)
+            .setAction(getString(R.string.open), v -> {
+              if (webViewList.size() > 1) selectTab(webViewList.size() - 1);
+            })
+            .setActionTextColor(getResources().getColor(R.color.white))
+            .show();
+        } else {
+          newTab(url);
+        }
+        return Unit.INSTANCE;
+      });
   }
 
   @Override
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
index 8cf6c7f1f..555c1dc2c 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
@@ -28,6 +28,7 @@ class AlertDialogShower @Inject constructor(private val activity: Activity) : Di
     AlertDialog.Builder(activity)
       .apply {
         dialog.title?.let(this::setTitle)
+        dialog.icon?.let { setIcon(dialog.icon) }
         setMessage(activity.getString(dialog.message, *bodyArguments(dialog)))
         setPositiveButton(dialog.positiveMessage) { _, _ ->
           clickListeners.getOrNull(0)
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
index 3dffe17ad..28bd756a3 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
@@ -27,7 +27,8 @@ sealed class KiwixDialog(
   val message: Int,
   val positiveMessage: Int,
   val negativeMessage: Int?,
-  val cancelable: Boolean = true
+  val cancelable: Boolean = true,
+  val icon: Int? = null
 ) {
 
   data class DeleteZim(override val args: List<Any>) : KiwixDialog(
@@ -114,6 +115,10 @@ sealed class KiwixDialog(
     object WifiOnly : YesNoDialog(
       R.string.wifi_only_title, R.string.wifi_only_msg
     )
+
+    object OpenInNewTab : YesNoDialog(
+      R.string.open_in_new_tab, R.string.open_in_new_tab
+    )
   }
 }
 

From 95a8e4d692c357065aa62fd3607f72eddb4e2586 Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Tue, 25 Feb 2020 12:18:02 +0530
Subject: [PATCH 02/16] Fix #1804 Update gradle version

---
 buildSrc/build.gradle.kts                | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 9e547ad46..f01ceba1e 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:3.5.3")
+  implementation("com.android.tools.build:gradle:3.6.0")
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
   implementation("com.dicedmelon.gradle:jacoco-android:0.1.4")
   implementation("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 235118534..91e6cc95d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jun 16 15:57:45 CDT 2019
+#Tue Feb 25 11:46:45 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

From 4a7a57d3119c4430b0538ad30d257a051ee61036 Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Tue, 25 Feb 2020 14:00:47 +0530
Subject: [PATCH 03/16] Fix #1804 Update gradle version

---
 app/build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 08110bb95..aea956a36 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -44,6 +44,7 @@ android {
     resValue("string", "app_search_string", "Search Kiwix")
     versionCode = generateVersionCode()
     versionName = generateVersionName()
+    ndkVersion  = "21.0.6113669"
   }
 
   lintOptions {

From 09c82179dfe25bf8c72f8ef1c512623731aabb19 Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Tue, 25 Feb 2020 14:11:46 +0530
Subject: [PATCH 04/16] Fix #1804 Update gradle version

---
 custom/build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts
index d30e8f6ae..21d135665 100644
--- a/custom/build.gradle.kts
+++ b/custom/build.gradle.kts
@@ -17,6 +17,7 @@ plugins.apply(KiwixConfigurationPlugin::class)
 android {
   defaultConfig {
     applicationId = "org.kiwix"
+    ndkVersion  = "21.0.6113669"
   }
 
   flavorDimensions("default")

From 4b3fb32f280b2b711ff484f9dc3dbc80cd673f0f Mon Sep 17 00:00:00 2001
From: deborahlow97 <deborahlow97@gmail.com>
Date: Tue, 25 Feb 2020 17:51:35 +0800
Subject: [PATCH 05/16] Center align text in chip

---
 core/src/main/res/layout/tag_content.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/src/main/res/layout/tag_content.xml b/core/src/main/res/layout/tag_content.xml
index 9b68460b0..bf659d679 100644
--- a/core/src/main/res/layout/tag_content.xml
+++ b/core/src/main/res/layout/tag_content.xml
@@ -8,26 +8,31 @@
     style="@style/Widget.KiwixTheme.Chip.Choice.Static"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/tag_pic" />
+    android:text="@string/tag_pic"
+    android:textAlignment="center" />
+
 
   <com.google.android.material.chip.Chip
     android:id="@+id/tag_video"
     style="@style/Widget.KiwixTheme.Chip.Choice.Static"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/tag_vid" />
+    android:text="@string/tag_vid"
+    android:textAlignment="center" />
 
   <com.google.android.material.chip.Chip
     android:id="@+id/tag_short_text"
     style="@style/Widget.KiwixTheme.Chip.Choice.Static"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/tag_short_text" />
+    android:text="@string/tag_short_text"
+    android:textAlignment="center" />
 
   <com.google.android.material.chip.Chip
     android:id="@+id/tag_text_only"
     style="@style/Widget.KiwixTheme.Chip.Choice.Static"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/tag_text_only" />
+    android:text="@string/tag_text_only"
+    android:textAlignment="center" />
 </merge>

From e93587aeca754f56755f2d535cc41654ac45563c Mon Sep 17 00:00:00 2001
From: deborahlow97 <deborahlow97@gmail.com>
Date: Tue, 25 Feb 2020 20:31:32 +0800
Subject: [PATCH 06/16] Place alignment logic in styles

---
 core/src/main/res/layout/tag_content.xml | 12 ++++--------
 core/src/main/res/values/styles.xml      |  1 +
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/src/main/res/layout/tag_content.xml b/core/src/main/res/layout/tag_content.xml
index bf659d679..1c7dc9bda 100644
--- a/core/src/main/res/layout/tag_content.xml
+++ b/core/src/main/res/layout/tag_content.xml
@@ -8,8 +8,7 @@
     style="@style/Widget.KiwixTheme.Chip.Choice.Static"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/tag_pic"
-    android:textAlignment="center" />
+    android:text="@string/tag_pic" />
 
 
   <com.google.android.material.chip.Chip
@@ -17,22 +16,19 @@
     style="@style/Widget.KiwixTheme.Chip.Choice.Static"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/tag_vid"
-    android:textAlignment="center" />
+    android:text="@string/tag_vid" />
 
   <com.google.android.material.chip.Chip
     android:id="@+id/tag_short_text"
     style="@style/Widget.KiwixTheme.Chip.Choice.Static"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/tag_short_text"
-    android:textAlignment="center" />
+    android:text="@string/tag_short_text" />
 
   <com.google.android.material.chip.Chip
     android:id="@+id/tag_text_only"
     style="@style/Widget.KiwixTheme.Chip.Choice.Static"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/tag_text_only"
-    android:textAlignment="center" />
+    android:text="@string/tag_text_only" />
 </merge>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 42e36ef86..8b27568c0 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -39,6 +39,7 @@
 
   <style name="Widget.KiwixTheme.Chip.Choice.Static" parent="Widget.MaterialComponents.Chip.Choice">
     <item name="android:clickable">false</item>
+    <item name="android:textAlignment" tools:ignore="NewApi">center</item>
   </style>
 
   <style name="list_item_title" parent="TextAppearance.KiwixTheme.Subtitle1" />

From 971eacd3ebb79e8db31511ae20d2a2b959643b0c Mon Sep 17 00:00:00 2001
From: Deborah Low <deborahlow97@gmail.com>
Date: Tue, 25 Feb 2020 20:32:32 +0800
Subject: [PATCH 07/16] Remove whitespace

---
 core/src/main/res/layout/tag_content.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/res/layout/tag_content.xml b/core/src/main/res/layout/tag_content.xml
index 1c7dc9bda..9b68460b0 100644
--- a/core/src/main/res/layout/tag_content.xml
+++ b/core/src/main/res/layout/tag_content.xml
@@ -10,7 +10,6 @@
     android:layout_height="wrap_content"
     android:text="@string/tag_pic" />
 
-
   <com.google.android.material.chip.Chip
     android:id="@+id/tag_video"
     style="@style/Widget.KiwixTheme.Chip.Choice.Static"

From 88fbb06c4fe2c8150aeb3a70e794cb1ecafa6c0e Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Tue, 25 Feb 2020 20:17:01 +0530
Subject: [PATCH 08/16] Fix #1804 Update gradle version

---
 app/build.gradle.kts                                    | 1 -
 buildSrc/build.gradle.kts                               | 4 ++--
 buildSrc/src/main/kotlin/Libs.kt                        | 2 +-
 buildSrc/src/main/kotlin/Versions.kt                    | 2 +-
 buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt | 2 +-
 custom/build.gradle.kts                                 | 1 -
 gradle/wrapper/gradle-wrapper.properties                | 2 +-
 jacoco.gradle                                           | 9 ++++++---
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index aea956a36..08110bb95 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -44,7 +44,6 @@ android {
     resValue("string", "app_search_string", "Search Kiwix")
     versionCode = generateVersionCode()
     versionName = generateVersionName()
-    ndkVersion  = "21.0.6113669"
   }
 
   lintOptions {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index f01ceba1e..caea9142d 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,9 +11,9 @@ repositories {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:3.6.0")
+  implementation("com.android.tools.build:gradle:3.5.3")
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
-  implementation("com.dicedmelon.gradle:jacoco-android:0.1.4")
+  implementation("com.hiya:jacoco-android:0.2")
   implementation("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
   implementation("com.google.apis:google-api-services-androidpublisher:v3-rev129-1.25.0")
   implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.5.1")
diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
index 838ef769a..527e5e000 100644
--- a/buildSrc/src/main/kotlin/Libs.kt
+++ b/buildSrc/src/main/kotlin/Libs.kt
@@ -263,7 +263,7 @@ object Libs {
    */
   const val collection_ktx: String = "androidx.collection:collection-ktx:" + Versions.collection_ktx
 
-  const val jacoco_android: String = "com.dicedmelon.gradle:jacoco-android:" +
+  const val jacoco_android: String = "com.hiya:jacoco-android:" +
       Versions.jacoco_android
 
   /**
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 2f7ea3b22..e3f00f941 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -55,7 +55,7 @@ object Versions {
 
   const val collection_ktx: String = "1.1.0"
 
-  const val jacoco_android: String = "0.1.4"
+  const val jacoco_android: String = "0.2"
 
   const val junit_jupiter: String = "5.4.2" // available: "5.6.0"
 
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index 44b649ea7..fbbe3b5b7 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -39,7 +39,7 @@ class AllProjectConfigurer {
     target.plugins.apply("kotlin-android")
     target.plugins.apply("kotlin-android-extensions")
     target.plugins.apply("kotlin-kapt")
-    target.plugins.apply("jacoco-android")
+    target.plugins.apply("com.hiya.jacoco-android")
     target.plugins.apply("org.jlleitschuh.gradle.ktlint")
     target.plugins.apply("io.gitlab.arturbosch.detekt")
   }
diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts
index 21d135665..d30e8f6ae 100644
--- a/custom/build.gradle.kts
+++ b/custom/build.gradle.kts
@@ -17,7 +17,6 @@ plugins.apply(KiwixConfigurationPlugin::class)
 android {
   defaultConfig {
     applicationId = "org.kiwix"
-    ndkVersion  = "21.0.6113669"
   }
 
   flavorDimensions("default")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 91e6cc95d..439df2ca0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
diff --git a/jacoco.gradle b/jacoco.gradle
index 96a103288..492051d6d 100644
--- a/jacoco.gradle
+++ b/jacoco.gradle
@@ -51,10 +51,13 @@ task jacocoInstrumentationTestReport(type: JacocoReport, dependsOn: ['createDebu
       includes: ['jacoco/testDebugUnitTest.exec',
         'outputs/code_coverage/debugAndroidTest/connected/**/*.ec'])
   }
-  sourceDirectories = files([javaSrc, kotlinSrc])
-  classDirectories = files([javaClasses, kotlinClasses])
+  //sourceDirectories = files([javaSrc, kotlinSrc])
+  //classDirectories = files([javaClasses, kotlinClasses])
   print execution
-  executionData = files(execution)
+  //executionData = files(execution)
+  sourceDirectories.from = files(javaSrc, kotlinSrc)
+  classDirectories.from = files(javaClasses, kotlinClasses)
+  executionData.from = files(execution)
   doLast() {
     print "file://${reports.html.destination}/index.html"
   }

From 0be16cabf22e208bc7247d4e05fb0e8b166fee4f Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Tue, 25 Feb 2020 20:18:48 +0530
Subject: [PATCH 09/16] Fix #1804 Update gradle version

---
 jacoco.gradle | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/jacoco.gradle b/jacoco.gradle
index 492051d6d..9e003273f 100644
--- a/jacoco.gradle
+++ b/jacoco.gradle
@@ -51,12 +51,9 @@ task jacocoInstrumentationTestReport(type: JacocoReport, dependsOn: ['createDebu
       includes: ['jacoco/testDebugUnitTest.exec',
         'outputs/code_coverage/debugAndroidTest/connected/**/*.ec'])
   }
-  //sourceDirectories = files([javaSrc, kotlinSrc])
-  //classDirectories = files([javaClasses, kotlinClasses])
-  print execution
-  //executionData = files(execution)
   sourceDirectories.from = files(javaSrc, kotlinSrc)
   classDirectories.from = files(javaClasses, kotlinClasses)
+  print execution
   executionData.from = files(execution)
   doLast() {
     print "file://${reports.html.destination}/index.html"

From b8cd709a7a0e11f23da4ebf2bc4a62e91a1ba148 Mon Sep 17 00:00:00 2001
From: Mohamed Sameh <mohamedsameh1998@gmail.com>
Date: Tue, 25 Feb 2020 19:23:14 +0200
Subject: [PATCH 10/16] Replace All dialogs in CoreMainActivity and Add 2
 attributes in KiwixDialog

---
 .../kiwixmobile/webserver/ZimHostActivity.kt  |  4 +-
 .../di/components/CoreActivityComponent.kt    |  2 +
 .../core/main/CoreMainActivity.java           | 66 +++++++------------
 .../core/utils/AlertDialogShower.kt           |  7 +-
 .../kiwixmobile/core/utils/KiwixDialog.kt     | 50 ++++++++++++--
 .../res/values/strings_nontranslatable.xml    |  2 +-
 6 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.kt
index a8f5e3cd2..76758287b 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.kt
@@ -84,7 +84,7 @@ class ZimHostActivity : BaseActivity(), ZimHostCallbacks, ZimHostContract.View {
             }
           }
         }
-          as ArrayList<String>
+        as ArrayList<String>
     }
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -221,7 +221,7 @@ class ZimHostActivity : BaseActivity(), ZimHostCallbacks, ZimHostContract.View {
   // Advice user to turn on hotspot manually for API<26
   private fun startHotspotManuallyDialog() {
 
-    alertDialogShower.show(KiwixDialog.StartHotspotManually(),
+    alertDialogShower.show(KiwixDialog.StartHotspotManually,
       ::launchTetheringSettingsScreen,
       {},
       {
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreActivityComponent.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreActivityComponent.kt
index cb6323257..16988e1fa 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreActivityComponent.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreActivityComponent.kt
@@ -25,12 +25,14 @@ import org.kiwix.kiwixmobile.core.di.ActivityScope
 import org.kiwix.kiwixmobile.core.di.modules.ActivityModule
 import org.kiwix.kiwixmobile.core.search.SearchActivity
 import org.kiwix.kiwixmobile.core.search.viewmodel.effects.ShowDeleteSearchDialog
+import org.kiwix.kiwixmobile.core.settings.CorePrefsFragment
 
 @ActivityScope
 @Subcomponent(modules = [ActivityModule::class])
 interface CoreActivityComponent {
   fun inject(searchActivity: SearchActivity)
   fun inject(showDeleteSearchDialog: ShowDeleteSearchDialog)
+  fun inject(corePrefsFragment: CorePrefsFragment)
 
   @Subcomponent.Builder
   interface Builder {
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
index b5162f747..c2991780b 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
@@ -53,7 +53,6 @@ import android.widget.Toast;
 import androidx.annotation.AnimRes;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.AppCompatButton;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
@@ -87,7 +86,6 @@ import java.util.Date;
 import java.util.List;
 import javax.inject.Inject;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
 import org.kiwix.kiwixmobile.core.BuildConfig;
@@ -217,7 +215,7 @@ public abstract class CoreMainActivity extends BaseActivity
   @Inject
   protected NewBookDao newBookDao;
   @Inject
-  private AlertDialogShower alertDialogShower;
+  protected AlertDialogShower alertDialogShower;
 
   private CountDownTimer hideBackToTopTimer = new CountDownTimer(1200, 1200) {
     @Override
@@ -642,28 +640,22 @@ public abstract class CoreMainActivity extends BaseActivity
   }
 
   private void showRateDialog() {
-    String title = getString(R.string.rate_dialog_title);
-    String message = getString(R.string.rate_dialog_msg_1) + " "
-      + getString(R.string.app_name)
-      + getString(R.string.rate_dialog_msg_2);
-    String positive = getString(R.string.rate_dialog_positive);
-    String negative = getString(R.string.no_thanks);
-    String neutral = getString(R.string.rate_dialog_neutral);
-
-    new AlertDialog.Builder(this)
-      .setTitle(title)
-      .setMessage(message)
-      .setPositiveButton(positive, (dialog, id) -> {
+    alertDialogShower.show(new KiwixDialog.ShowRate(getIconResId()),
+      () -> {
         visitCounterPref.setNoThanksState(true);
         goToRateApp();
-      })
-      .setNegativeButton(negative, (dialog, id) -> visitCounterPref.setNoThanksState(true))
-      .setNeutralButton(neutral, (dialog, id) -> {
+        return Unit.INSTANCE;
+      },
+      () -> {
+        visitCounterPref.setNoThanksState(true);
+        return Unit.INSTANCE;
+      },
+      () ->{
         tempVisitCount = 0;
         visitCounterPref.setCount(tempVisitCount);
-      })
-      .setIcon(ContextCompat.getDrawable(this, getIconResId()))
-      .show();
+        return Unit.INSTANCE;
+      }
+    );
   }
 
   protected abstract int getIconResId();
@@ -1079,21 +1071,20 @@ public abstract class CoreMainActivity extends BaseActivity
   }
 
   private void externalLinkPopup(Intent intent) {
-    new AlertDialog.Builder(this)
-      .setTitle(R.string.external_link_popup_dialog_title)
-      .setMessage(R.string.external_link_popup_dialog_message)
-      .setNegativeButton(android.R.string.no, (dialogInterface, i) -> {
-        // do nothing
-      })
-      .setNeutralButton(R.string.do_not_ask_anymore, (dialogInterface, i) -> {
+    alertDialogShower.show(KiwixDialog.ExternalLinkPopup.INSTANCE,
+      () -> {
+        startActivity(intent);
+        return Unit.INSTANCE;
+      },
+      () -> Unit.INSTANCE,
+      () -> {
         sharedPreferenceUtil.putPrefExternalLinkPopup(false);
         isExternalLinkPopup = false;
 
         startActivity(intent);
-      })
-      .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> startActivity(intent))
-      .setIcon(R.drawable.ic_warning)
-      .show();
+        return Unit.INSTANCE;
+      }
+      );
   }
 
   protected void openZimFile(@NonNull File file) {
@@ -1369,14 +1360,7 @@ public abstract class CoreMainActivity extends BaseActivity
   private void contentsDrawerHint() {
     drawerLayout.postDelayed(() -> drawerLayout.openDrawer(GravityCompat.END), 500);
 
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setMessage(getString(R.string.hint_contents_drawer_message))
-      .setPositiveButton(getString(R.string.got_it), (dialog, id) -> {
-      })
-      .setTitle(R.string.did_you_know)
-      .setIcon(R.drawable.icon_question);
-    AlertDialog alert = builder.create();
-    alert.show();
+    alertDialogShower.show(KiwixDialog.ContentsDrawerHint.INSTANCE);
   }
 
   private void openArticle(String articleUrl) {
@@ -1694,7 +1678,7 @@ public abstract class CoreMainActivity extends BaseActivity
 
   protected void showOpenInNewTabDialog(String url) {
     alertDialogShower.show(KiwixDialog.YesNoDialog.OpenInNewTab.INSTANCE,
-      (Function0<Unit>) () -> {
+      () -> {
         if (isOpenNewTabInBackground) {
           newTabInBackground(url);
           Snackbar.make(snackbarRoot, R.string.new_tab_snack_bar, Snackbar.LENGTH_LONG)
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
index 555c1dc2c..06563afa2 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
@@ -20,7 +20,6 @@ package org.kiwix.kiwixmobile.core.utils
 
 import android.app.Activity
 import androidx.appcompat.app.AlertDialog
-import org.kiwix.kiwixmobile.core.utils.KiwixDialog.StartHotspotManually
 import javax.inject.Inject
 
 class AlertDialogShower @Inject constructor(private val activity: Activity) : DialogShower {
@@ -28,7 +27,7 @@ class AlertDialogShower @Inject constructor(private val activity: Activity) : Di
     AlertDialog.Builder(activity)
       .apply {
         dialog.title?.let(this::setTitle)
-        dialog.icon?.let { setIcon(dialog.icon) }
+        dialog.icon?.let(this::setIcon)
         setMessage(activity.getString(dialog.message, *bodyArguments(dialog)))
         setPositiveButton(dialog.positiveMessage) { _, _ ->
           clickListeners.getOrNull(0)
@@ -40,8 +39,8 @@ class AlertDialogShower @Inject constructor(private val activity: Activity) : Di
               ?.invoke()
           }
         }
-        if (dialog is StartHotspotManually) {
-          setNeutralButton(dialog.neutralMessage) { _, _ ->
+        dialog.neutralMessage?.let {
+          setNeutralButton(it) { _, _ ->
             clickListeners.getOrNull(2)
               ?.invoke()
           }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
index 28bd756a3..c5aee80e6 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
@@ -28,7 +28,8 @@ sealed class KiwixDialog(
   val positiveMessage: Int,
   val negativeMessage: Int?,
   val cancelable: Boolean = true,
-  val icon: Int? = null
+  val icon: Int? = null,
+  val neutralMessage: Int? = null
 ) {
 
   data class DeleteZim(override val args: List<Any>) : KiwixDialog(
@@ -85,13 +86,12 @@ sealed class KiwixDialog(
     )
   }
 
-  data class StartHotspotManually(
-    val neutralMessage: Int = R.string.hotspot_dialog_neutral_button
-  ) : KiwixDialog(
+  object StartHotspotManually : KiwixDialog(
     R.string.hotspot_dialog_title,
     R.string.hotspot_dialog_message,
     R.string.go_to_settings,
-    null
+    null,
+    neutralMessage = R.string.hotspot_dialog_neutral_button
   )
 
   data class FileTransferConfirmation(override val args: List<Any>) : KiwixDialog(
@@ -104,6 +104,46 @@ sealed class KiwixDialog(
     null, R.string.delete_recent_search_item, R.string.delete, R.string.no
   )
 
+  object ContentsDrawerHint : KiwixDialog(
+    R.string.did_you_know,
+    R.string.hint_contents_drawer_message,
+    R.string.got_it,
+    null,
+    icon = R.drawable.icon_question
+  )
+
+  object ExternalLinkPopup : KiwixDialog(
+    R.string.external_link_popup_dialog_title,
+    R.string.external_link_popup_dialog_message,
+    android.R.string.yes,
+    android.R.string.no,
+    icon = R.drawable.ic_warning,
+    neutralMessage = R.string.do_not_ask_anymore
+  )
+
+  data class ShowRate(override val args: List<Any>, val custom_icon: Int?) : KiwixDialog(
+    R.string.rate_dialog_title,
+    R.string.triple_arg_format_string,
+    R.string.rate_dialog_positive,
+    R.string.no_thanks,
+    icon = custom_icon,
+    neutralMessage = R.string.rate_dialog_neutral
+  ),
+    HasBodyFormatArgs {
+    constructor(icon: Int?) : this(
+      listOf(R.string.rate_dialog_msg_1, R.string.app_name, R.string.rate_dialog_msg_2),
+      icon
+    )
+  }
+
+  object ClearAllHistory : KiwixDialog(
+    R.string.clear_all_history_dialog_title,
+    R.string.clear_recent_and_tabs_history_dialog,
+    R.string.yes,
+    R.string.no,
+    icon = R.drawable.ic_warning
+  )
+
   open class YesNoDialog(
     title: Int,
     message: Int
diff --git a/core/src/main/res/values/strings_nontranslatable.xml b/core/src/main/res/values/strings_nontranslatable.xml
index b3819e053..83dfd42af 100644
--- a/core/src/main/res/values/strings_nontranslatable.xml
+++ b/core/src/main/res/values/strings_nontranslatable.xml
@@ -5,5 +5,5 @@
     <item>medium</item>
     <item>large</item>
   </string-array>
-
+  <string name="triple_arg_format_string" translatable="false">%s %s %s</string>
 </resources>

From 1684d2e7cfce3a03b86536d396b813af771f2640 Mon Sep 17 00:00:00 2001
From: Mohamed Sameh <mohamedsameh1998@gmail.com>
Date: Tue, 25 Feb 2020 21:11:49 +0200
Subject: [PATCH 11/16] Add new Dialogs

---
 .../core/di/components/CoreComponent.kt       |  2 -
 .../core/settings/CorePrefsFragment.java      | 46 +++++++++----------
 .../core/utils/AlertDialogShower.kt           | 10 +++-
 .../kiwixmobile/core/utils/KiwixDialog.kt     | 21 ++++++++-
 4 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt
index a540956b3..28b17afaa 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt
@@ -54,7 +54,6 @@ import org.kiwix.kiwixmobile.core.reader.ZimContentProvider
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
 import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer
 import org.kiwix.kiwixmobile.core.search.SearchActivity
-import org.kiwix.kiwixmobile.core.settings.CorePrefsFragment
 import org.kiwix.kiwixmobile.core.settings.CoreSettingsActivity
 import org.kiwix.kiwixmobile.core.utils.BookUtils
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
@@ -107,7 +106,6 @@ interface CoreComponent {
   fun inject(application: CoreApp)
   fun inject(zimContentProvider: ZimContentProvider)
   fun inject(kiwixWebView: KiwixWebView)
-  fun inject(prefsFragment: CorePrefsFragment)
   fun inject(storageSelectDialog: StorageSelectDialog)
   fun inject(addNoteDialog: AddNoteDialog)
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/settings/CorePrefsFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/settings/CorePrefsFragment.java
index 7a8ca566d..3bc20af26 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/settings/CorePrefsFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/settings/CorePrefsFragment.java
@@ -50,6 +50,8 @@ import org.kiwix.kiwixmobile.core.NightModeConfig;
 import org.kiwix.kiwixmobile.core.R;
 import org.kiwix.kiwixmobile.core.extensions.ContextExtensionsKt;
 import org.kiwix.kiwixmobile.core.main.AddNoteDialog;
+import org.kiwix.kiwixmobile.core.utils.AlertDialogShower;
+import org.kiwix.kiwixmobile.core.utils.KiwixDialog;
 import org.kiwix.kiwixmobile.core.utils.LanguageUtils;
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil;
 
@@ -75,12 +77,17 @@ public abstract class CorePrefsFragment extends PreferenceFragment implements
   protected StorageCalculator storageCalculator;
   @Inject
   protected NightModeConfig nightModeConfig;
-
+  @Inject
+  protected AlertDialogShower alertDialogShower;
   private SliderPreference mSlider;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
-    CoreApp.getCoreComponent().inject(this);
+    CoreApp.getCoreComponent()
+      .activityComponentBuilder()
+      .activity(getActivity())
+      .build()
+      .inject(this);
     super.onCreate(savedInstanceState);
     addPreferencesFromResource(R.xml.preferences);
 
@@ -199,28 +206,20 @@ public abstract class CorePrefsFragment extends PreferenceFragment implements
   }
 
   private void clearAllHistoryDialog() {
-    new AlertDialog.Builder(getActivity())
-      .setTitle(getResources().getString(R.string.clear_all_history_dialog_title))
-      .setMessage(getResources().getString(R.string.clear_recent_and_tabs_history_dialog))
-      .setPositiveButton(android.R.string.yes, (dialog, which) -> {
-        presenter.clearHistory();
-        CoreSettingsActivity.allHistoryCleared = true;
-        Toast.makeText(getActivity(),
-          getResources().getString(R.string.all_history_cleared_toast), Toast.LENGTH_SHORT)
-          .show();
-      })
-      .setNegativeButton(android.R.string.no, (dialog, which) -> {
-        // do nothing
-      })
-      .setIcon(R.drawable.ic_warning)
-      .show();
+    alertDialogShower.show(KiwixDialog.ClearAllHistory.INSTANCE, () -> {
+      presenter.clearHistory();
+      CoreSettingsActivity.allHistoryCleared = true;
+      ContextExtensionsKt.toast(getActivity(), R.string.all_history_cleared_toast,
+        Toast.LENGTH_SHORT);
+      return Unit.INSTANCE;
+    });
   }
 
   private void showClearAllNotesDialog() {
-    new AlertDialog.Builder(getActivity()).setMessage(R.string.delete_notes_confirmation_msg)
-      .setNegativeButton(android.R.string.cancel, null) // Do nothing for 'Cancel' button
-      .setPositiveButton(R.string.yes, (dialog, which) -> clearAllNotes())
-      .show();
+    alertDialogShower.show(KiwixDialog.ClearAllNotes.INSTANCE, () -> {
+      clearAllNotes();
+      return Unit.INSTANCE;
+    });
   }
 
   private void clearAllNotes() {
@@ -252,10 +251,7 @@ public abstract class CorePrefsFragment extends PreferenceFragment implements
       view.getSettings().setJavaScriptEnabled(true);
       view.setBackgroundColor(0);
     }
-    new AlertDialog.Builder(getActivity())
-      .setView(view)
-      .setPositiveButton(android.R.string.ok, null)
-      .show();
+    alertDialogShower.show(new KiwixDialog.OpenCredits(() -> view));
   }
 
   @Override
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
index 06563afa2..bcfa103ff 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
@@ -28,7 +28,14 @@ class AlertDialogShower @Inject constructor(private val activity: Activity) : Di
       .apply {
         dialog.title?.let(this::setTitle)
         dialog.icon?.let(this::setIcon)
-        setMessage(activity.getString(dialog.message, *bodyArguments(dialog)))
+        dialog.message?.let {
+          setMessage(
+            activity.getString(
+              it,
+              *bodyArguments(dialog)
+            )
+          )
+        }
         setPositiveButton(dialog.positiveMessage) { _, _ ->
           clickListeners.getOrNull(0)
             ?.invoke()
@@ -45,6 +52,7 @@ class AlertDialogShower @Inject constructor(private val activity: Activity) : Di
               ?.invoke()
           }
         }
+        dialog.getView?.let { setView(it()) }
         setCancelable(dialog.cancelable)
       }
       .show()
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
index c5aee80e6..5d605a636 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
@@ -19,17 +19,19 @@
 package org.kiwix.kiwixmobile.core.utils
 
 import android.net.wifi.WifiConfiguration
+import android.view.View
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk
 
 sealed class KiwixDialog(
   val title: Int?,
-  val message: Int,
+  val message: Int?,
   val positiveMessage: Int,
   val negativeMessage: Int?,
   val cancelable: Boolean = true,
   val icon: Int? = null,
-  val neutralMessage: Int? = null
+  val neutralMessage: Int? = null,
+  val getView: (() -> View)? = null
 ) {
 
   data class DeleteZim(override val args: List<Any>) : KiwixDialog(
@@ -144,6 +146,21 @@ sealed class KiwixDialog(
     icon = R.drawable.ic_warning
   )
 
+  object ClearAllNotes : KiwixDialog(
+    null,
+    R.string.delete_notes_confirmation_msg,
+    R.string.yes,
+    android.R.string.cancel
+  )
+
+  data class OpenCredits(val customGetView: (() -> View)?) : KiwixDialog(
+    null,
+    null,
+    android.R.string.ok,
+    null,
+    getView = customGetView
+  )
+
   open class YesNoDialog(
     title: Int,
     message: Int

From c0c58eb9fd08df67258dd487cc9c7b1265557c7b Mon Sep 17 00:00:00 2001
From: Mohamed Sameh <mohamedsameh1998@gmail.com>
Date: Tue, 25 Feb 2020 21:38:40 +0200
Subject: [PATCH 12/16] Add new Dialogs to ConfirmationDialogFragment.java, Add
 new method to AlertDialogShower

---
 .../main/ConfirmationAlertDialogFragment.java | 40 +++++++++----------
 .../core/utils/AlertDialogShower.kt           |  9 ++++-
 .../kiwixmobile/core/utils/DialogShower.kt    |  7 ++++
 .../kiwixmobile/core/utils/KiwixDialog.kt     |  7 ++++
 4 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/ConfirmationAlertDialogFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/ConfirmationAlertDialogFragment.java
index ea16c0357..92afc2257 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/ConfirmationAlertDialogFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/ConfirmationAlertDialogFragment.java
@@ -19,12 +19,13 @@
 package org.kiwix.kiwixmobile.core.main;
 
 import android.app.Dialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
-import org.kiwix.kiwixmobile.core.R;
+import javax.inject.Inject;
+import kotlin.Unit;
+import org.kiwix.kiwixmobile.core.utils.AlertDialogShower;
+import org.kiwix.kiwixmobile.core.utils.KiwixDialog;
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil;
 
 /**
@@ -48,6 +49,8 @@ public class ConfirmationAlertDialogFragment extends DialogFragment {
   private SharedPreferenceUtil sharedPreferenceUtil;
   private int stringResourceId;
   private String parentDialogFragmentTAG;
+  @Inject
+  protected AlertDialogShower alertDialogShower;
 
   public ConfirmationAlertDialogFragment(SharedPreferenceUtil sharedPreferenceUtil,
     String parentDialogFragmentTAG, int stringResourceId) {
@@ -59,27 +62,20 @@ public class ConfirmationAlertDialogFragment extends DialogFragment {
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     Fragment parentDialogFragment = getFragmentManager().findFragmentByTag(parentDialogFragmentTAG);
-
-    return new AlertDialog.Builder(getActivity()).setMessage(stringResourceId)
-      .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-
-          if (parentDialogFragment != null) {
-            ((UserClickListener) parentDialogFragment).onPositiveClick();
-          }
+    return alertDialogShower.create(new KiwixDialog.ConfirmationAlertDialogFragment(stringResourceId),
+      () -> {
+        if (parentDialogFragment != null) {
+          ((UserClickListener) parentDialogFragment).onPositiveClick();
         }
-      })
-      .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-
-          if (parentDialogFragment != null) {
-            ((UserClickListener) parentDialogFragment).onNegativeClick();
-          }
+        return Unit.INSTANCE;
+      },
+      () -> {
+        if (parentDialogFragment != null) {
+          ((UserClickListener) parentDialogFragment).onNegativeClick();
         }
-      })
-      .create();
+        return Unit.INSTANCE;
+      }
+    );
   }
 
   /**
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
index bcfa103ff..bf8863ac5 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
@@ -19,12 +19,17 @@
 package org.kiwix.kiwixmobile.core.utils
 
 import android.app.Activity
+import android.app.Dialog
 import androidx.appcompat.app.AlertDialog
 import javax.inject.Inject
 
 class AlertDialogShower @Inject constructor(private val activity: Activity) : DialogShower {
   override fun show(dialog: KiwixDialog, vararg clickListeners: () -> Unit) {
-    AlertDialog.Builder(activity)
+    create(dialog, *clickListeners)
+  }
+
+  override fun create(dialog: KiwixDialog, vararg clickListeners: () -> Unit): Dialog {
+    return AlertDialog.Builder(activity)
       .apply {
         dialog.title?.let(this::setTitle)
         dialog.icon?.let(this::setIcon)
@@ -55,7 +60,7 @@ class AlertDialogShower @Inject constructor(private val activity: Activity) : Di
         dialog.getView?.let { setView(it()) }
         setCancelable(dialog.cancelable)
       }
-      .show()
+      .create()
   }
 
   private fun bodyArguments(dialog: KiwixDialog) =
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/DialogShower.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/DialogShower.kt
index 6e2dc5fb7..17dde08aa 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/DialogShower.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/DialogShower.kt
@@ -17,9 +17,16 @@
  */
 package org.kiwix.kiwixmobile.core.utils
 
+import android.app.Dialog
+
 interface DialogShower {
   fun show(
     dialog: KiwixDialog,
     vararg clickListeners: (() -> Unit)
   )
+
+  fun create(
+    dialog: KiwixDialog,
+    vararg clickListeners: (() -> Unit)
+  ): Dialog
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
index 5d605a636..c04a28a20 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
@@ -161,6 +161,13 @@ sealed class KiwixDialog(
     getView = customGetView
   )
 
+  data class ConfirmationAlertDialogFragment(val CustomMessage: Int) : KiwixDialog(
+    null,
+    CustomMessage,
+    R.string.yes,
+    android.R.string.cancel
+  )
+
   open class YesNoDialog(
     title: Int,
     message: Int

From 83fc5e1257b3e38d4a99f06a8943cb85e86f3faa Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Wed, 26 Feb 2020 12:10:02 +0000
Subject: [PATCH 13/16] #1818 Input methods are broken in search - don't
 debounce or render the search string via state

---
 .../java/org/kiwix/kiwixmobile/core/search/SearchActivity.kt  | 1 -
 .../kiwixmobile/core/search/viewmodel/SearchViewModel.kt      | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchActivity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchActivity.kt
index 85a85b68f..1d129d880 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchActivity.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchActivity.kt
@@ -144,7 +144,6 @@ class SearchActivity : BaseActivity() {
   }
 
   private fun render(searchString: String) {
-    searchView.setQuery(searchString, false)
     searchInTextMenuItem.isEnabled = searchString.isNotBlank()
   }
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModel.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModel.kt
index db9e57575..edc782223 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModel.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModel.kt
@@ -53,7 +53,6 @@ import org.kiwix.kiwixmobile.core.search.viewmodel.effects.SearchIntentProcessin
 import org.kiwix.kiwixmobile.core.search.viewmodel.effects.ShowDeleteSearchDialog
 import org.kiwix.kiwixmobile.core.search.viewmodel.effects.ShowToast
 import org.kiwix.kiwixmobile.core.search.viewmodel.effects.StartSpeechInput
-import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class SearchViewModel @Inject constructor(
@@ -127,8 +126,7 @@ class SearchViewModel @Inject constructor(
       searchResultsFromZimReader(),
       filter,
       Function3(this::reduce)
-    ).debounce(100, MILLISECONDS)
-      .subscribe(state::postValue, Throwable::printStackTrace)
+    ).subscribe(state::postValue, Throwable::printStackTrace)
 
   private fun reduce(
     recentSearchResults: List<SearchListItem>,

From 415424936dda993687d74e00944af734dd7cba05 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Wed, 26 Feb 2020 14:16:54 +0000
Subject: [PATCH 14/16] Multidex debug builds only and bump version

---
 app/build.gradle.kts                                      | 2 +-
 buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt   | 2 +-
 .../src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 08110bb95..d73e8ac93 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,7 +11,7 @@ apply(from = rootProject.file("jacoco.gradle"))
 ext {
   set("versionMajor", 3)
   set("versionMinor", 2)
-  set("versionPatch", 0)
+  set("versionPatch", 1)
 }
 
 fun generateVersionName() = "${ext["versionMajor"]}.${ext["versionMinor"]}.${ext["versionPatch"]}"
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index 44b649ea7..ab512fec5 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -52,12 +52,12 @@ class AllProjectConfigurer {
         setMinSdkVersion(Config.minSdk)
         setTargetSdkVersion(Config.targetSdk)
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled = true
       }
 
       buildTypes {
         getByName("debug") {
           isTestCoverageEnabled = true
+          multiDexEnabled = true
         }
       }
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java b/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java
index 8b7c3548e..da8119dea 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java
@@ -17,13 +17,14 @@
  */
 package org.kiwix.kiwixmobile.core;
 
+import android.app.Application;
 import android.content.Context;
 import android.os.Build;
 import android.os.Environment;
 import android.os.StrictMode;
 import android.util.Log;
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.multidex.MultiDexApplication;
+import androidx.multidex.MultiDex;
 import com.jakewharton.threetenabp.AndroidThreeTen;
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +34,7 @@ import org.kiwix.kiwixmobile.core.di.components.CoreComponent;
 import org.kiwix.kiwixmobile.core.di.components.DaggerCoreComponent;
 import org.kiwix.kiwixmobile.core.downloader.DownloadMonitor;
 
-public abstract class CoreApp extends MultiDexApplication {
+public abstract class CoreApp extends Application {
 
   private static CoreApp app;
   private static CoreComponent coreComponent;
@@ -64,6 +65,9 @@ public abstract class CoreApp extends MultiDexApplication {
   @Override
   protected void attachBaseContext(Context base) {
     super.attachBaseContext(base);
+    if (BuildConfig.DEBUG) {
+      MultiDex.install(this);
+    }
     app = this;
     setCoreComponent(DaggerCoreComponent.builder()
       .context(this)

From b537f9b96dd6da56265d26a6ef6c48309dd8310e Mon Sep 17 00:00:00 2001
From: Mohamed Sameh <mohamedsameh1998@gmail.com>
Date: Wed, 26 Feb 2020 19:52:39 +0200
Subject: [PATCH 15/16] Add few fixes

---
 .../core/main/ConfirmationAlertDialogFragment.java    |  4 ++--
 .../kiwix/kiwixmobile/core/main/CoreMainActivity.java |  6 +++---
 .../kiwixmobile/core/settings/CorePrefsFragment.java  |  5 ++---
 .../kiwix/kiwixmobile/core/utils/AlertDialogShower.kt | 11 ++---------
 .../org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt   |  8 ++++----
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/ConfirmationAlertDialogFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/ConfirmationAlertDialogFragment.java
index 92afc2257..5e8edf3b8 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/ConfirmationAlertDialogFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/ConfirmationAlertDialogFragment.java
@@ -24,7 +24,7 @@ import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import javax.inject.Inject;
 import kotlin.Unit;
-import org.kiwix.kiwixmobile.core.utils.AlertDialogShower;
+import org.kiwix.kiwixmobile.core.utils.DialogShower;
 import org.kiwix.kiwixmobile.core.utils.KiwixDialog;
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil;
 
@@ -50,7 +50,7 @@ public class ConfirmationAlertDialogFragment extends DialogFragment {
   private int stringResourceId;
   private String parentDialogFragmentTAG;
   @Inject
-  protected AlertDialogShower alertDialogShower;
+  protected DialogShower alertDialogShower;
 
   public ConfirmationAlertDialogFragment(SharedPreferenceUtil sharedPreferenceUtil,
     String parentDialogFragmentTAG, int stringResourceId) {
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
index c2991780b..62c19cccb 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
@@ -108,7 +108,7 @@ import org.kiwix.kiwixmobile.core.reader.ZimFileReader;
 import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer;
 import org.kiwix.kiwixmobile.core.search.SearchActivity;
 import org.kiwix.kiwixmobile.core.search.viewmodel.effects.SearchInPreviousScreen;
-import org.kiwix.kiwixmobile.core.utils.AlertDialogShower;
+import org.kiwix.kiwixmobile.core.utils.DialogShower;
 import org.kiwix.kiwixmobile.core.utils.DimenUtils;
 import org.kiwix.kiwixmobile.core.utils.KiwixDialog;
 import org.kiwix.kiwixmobile.core.utils.LanguageUtils;
@@ -215,7 +215,7 @@ public abstract class CoreMainActivity extends BaseActivity
   @Inject
   protected NewBookDao newBookDao;
   @Inject
-  protected AlertDialogShower alertDialogShower;
+  protected DialogShower alertDialogShower;
 
   private CountDownTimer hideBackToTopTimer = new CountDownTimer(1200, 1200) {
     @Override
@@ -1076,7 +1076,7 @@ public abstract class CoreMainActivity extends BaseActivity
         startActivity(intent);
         return Unit.INSTANCE;
       },
-      () -> Unit.INSTANCE,
+      null,
       () -> {
         sharedPreferenceUtil.putPrefExternalLinkPopup(false);
         isExternalLinkPopup = false;
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/settings/CorePrefsFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/settings/CorePrefsFragment.java
index 3bc20af26..64d3d04aa 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/settings/CorePrefsFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/settings/CorePrefsFragment.java
@@ -33,7 +33,6 @@ import android.view.LayoutInflater;
 import android.webkit.WebView;
 import android.widget.BaseAdapter;
 import android.widget.Toast;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import eu.mhutti1.utils.storage.StorageDevice;
@@ -50,7 +49,7 @@ import org.kiwix.kiwixmobile.core.NightModeConfig;
 import org.kiwix.kiwixmobile.core.R;
 import org.kiwix.kiwixmobile.core.extensions.ContextExtensionsKt;
 import org.kiwix.kiwixmobile.core.main.AddNoteDialog;
-import org.kiwix.kiwixmobile.core.utils.AlertDialogShower;
+import org.kiwix.kiwixmobile.core.utils.DialogShower;
 import org.kiwix.kiwixmobile.core.utils.KiwixDialog;
 import org.kiwix.kiwixmobile.core.utils.LanguageUtils;
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil;
@@ -78,7 +77,7 @@ public abstract class CorePrefsFragment extends PreferenceFragment implements
   @Inject
   protected NightModeConfig nightModeConfig;
   @Inject
-  protected AlertDialogShower alertDialogShower;
+  protected DialogShower alertDialogShower;
   private SliderPreference mSlider;
 
   @Override
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
index bf8863ac5..f5d8daaf1 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
@@ -25,7 +25,7 @@ import javax.inject.Inject
 
 class AlertDialogShower @Inject constructor(private val activity: Activity) : DialogShower {
   override fun show(dialog: KiwixDialog, vararg clickListeners: () -> Unit) {
-    create(dialog, *clickListeners)
+    create(dialog, *clickListeners).show()
   }
 
   override fun create(dialog: KiwixDialog, vararg clickListeners: () -> Unit): Dialog {
@@ -33,14 +33,7 @@ class AlertDialogShower @Inject constructor(private val activity: Activity) : Di
       .apply {
         dialog.title?.let(this::setTitle)
         dialog.icon?.let(this::setIcon)
-        dialog.message?.let {
-          setMessage(
-            activity.getString(
-              it,
-              *bodyArguments(dialog)
-            )
-          )
-        }
+        dialog.message?.let { setMessage(activity.getString(it, *bodyArguments(dialog))) }
         setPositiveButton(dialog.positiveMessage) { _, _ ->
           clickListeners.getOrNull(0)
             ?.invoke()
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
index c04a28a20..896775ef3 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
@@ -123,12 +123,12 @@ sealed class KiwixDialog(
     neutralMessage = R.string.do_not_ask_anymore
   )
 
-  data class ShowRate(override val args: List<Any>, val custom_icon: Int?) : KiwixDialog(
+  data class ShowRate(override val args: List<Any>, val customIcon: Int?) : KiwixDialog(
     R.string.rate_dialog_title,
     R.string.triple_arg_format_string,
     R.string.rate_dialog_positive,
     R.string.no_thanks,
-    icon = custom_icon,
+    icon = customIcon,
     neutralMessage = R.string.rate_dialog_neutral
   ),
     HasBodyFormatArgs {
@@ -161,9 +161,9 @@ sealed class KiwixDialog(
     getView = customGetView
   )
 
-  data class ConfirmationAlertDialogFragment(val CustomMessage: Int) : KiwixDialog(
+  data class ConfirmationAlertDialogFragment(val customMessage: Int) : KiwixDialog(
     null,
-    CustomMessage,
+    customMessage,
     R.string.yes,
     android.R.string.cancel
   )

From 59b7d7af73d7941c7c293b4c5a8afc7df1d70cfa Mon Sep 17 00:00:00 2001
From: Mohamed Sameh <mohamedsameh1998@gmail.com>
Date: Thu, 27 Feb 2020 12:56:28 +0200
Subject: [PATCH 16/16] Deactivate Spead Operator

---
 config/detekt/detekt.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
index f5c46ccd3..93c779e23 100644
--- a/config/detekt/detekt.yml
+++ b/config/detekt/detekt.yml
@@ -394,7 +394,7 @@ performance:
     active: true
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
   SpreadOperator:
-    active: true
+    active: false
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
   UnnecessaryTemporaryInstantiation:
     active: true