Update icons to be adaptive

app/src/main/AndroidManifest.xml

@@ -2,7 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.kiwix.kiwixmobile">
 
-  <application android:name=".KiwixApp">
+  <application
+    android:name=".KiwixApp"
+    android:icon="@mipmap/ic_launcher"
+    android:roundIcon="@mipmap/ic_launcher_round">
     <activity
       android:name=".main.KiwixMainActivity"
       android:configChanges="orientation|keyboardHidden|screenSize|locale"

app/src/main/res/layout/download_item.xml

@@ -19,7 +19,7 @@
     android:adjustViewBounds="true"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:scaleType="fitCenter"
-    android:src="@mipmap/kiwix_icon" />
+    android:src="@mipmap/ic_launcher" />
 
   <LinearLayout
     android:layout_width="0dp"

app/src/main/res/layout/library_item.xml

@@ -20,7 +20,7 @@
     android:layout_marginRight="@dimen/favicon_margin_right"
     android:adjustViewBounds="true"
     android:scaleType="fitCenter"
-    android:src="@mipmap/kiwix_icon"
+    android:src="@mipmap/ic_launcher"
     />
 
   <LinearLayout

buildSrc/src/main/kotlin/custom/CustomApps.kt

@@ -0,0 +1,73 @@
+/*
+ * Kiwix Android
+ * Copyright (c) 2019 Kiwix <android.kiwix.org>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package custom
+
+import com.android.build.gradle.internal.dsl.ProductFlavor
+import custom.CustomApps.CustomApp
+import org.gradle.api.NamedDomainObjectContainer
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+object CustomApps {
+  val all = listOf(
+    CustomApp(
+      name = "customexample",
+      versionName = "2017-07",
+      url = "http://download.kiwix.org/zim/wikipedia_fr_test.zim",
+      enforcedLanguage = "en",
+      displayName = "Test Custom App"
+    ),
+    CustomApp(
+      name = "wikimed",
+      versionName = "2018-08",
+      url = "http://download.kiwix.org/zim/wikipedia_en_medicine_novid.zim",
+      enforcedLanguage = "en",
+      displayName = "Medical Wikipedia"
+    )
+  )
+
+  data class CustomApp(
+    val name: String,
+    val versionName: String,
+    val versionCode: Int = Date().let {
+      SimpleDateFormat("YYDDD0", Locale.ROOT).format(it).toInt()
+    },
+    val url: String,
+    val enforcedLanguage: String,
+    val displayName: String
+  )
+}
+fun NamedDomainObjectContainer<ProductFlavor>.create(customApps: List<CustomApp>) {
+  customApps.forEach { customFlavor ->
+    create(customFlavor.name) {
+      versionName = customFlavor.versionName
+      versionCode = customFlavor.versionCode
+      applicationIdSuffix = ".kiwixcustom${customFlavor.name}"
+      buildConfigField("String", "ZIM_URL", "\"${customFlavor.url}\"")
+      buildConfigField("String", "ENFORCED_LANG", "\"${customFlavor.enforcedLanguage}\"")
+      configureStrings(customFlavor.displayName)
+    }
+  }
+}
+
+fun ProductFlavor.configureStrings(appName: String) {
+  resValue("string", "app_name", appName)
+  resValue("string", "app_search_string", "Search $appName")
+}

core/src/main/AndroidManifest.xml

@@ -19,9 +19,7 @@
   <application
     android:allowBackup="true"
     android:hardwareAccelerated="true"
-    android:icon="@mipmap/kiwix_icon"
     android:label="@string/app_name"
-    android:roundIcon="@mipmap/kiwix_icon_round"
     android:supportsRtl="true"
     android:theme="@style/AppTheme"
     android:usesCleartextTraffic="true"

core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java

@@ -607,7 +607,7 @@ public abstract class CoreMainActivity extends BaseActivity implements WebViewCa
         tempVisitCount = 0;
         visitCounterPref.setCount(tempVisitCount);
       })
-      .setIcon(ContextCompat.getDrawable(this, R.mipmap.kiwix_icon))
+      .setIcon(ContextCompat.getDrawable(this, R.mipmap.ic_launcher))
       .show();
   }
 

core/src/main/java/org/kiwix/kiwixmobile/core/wifi_hotspot/HotspotNotificationManager.java

@@ -76,7 +76,7 @@ public class HotspotNotificationManager {
       .setContentTitle(context.getString(R.string.hotspot_notification_content_title))
       .setContentText(context.getString(R.string.hotspot_running))
       .setContentIntent(contentIntent)
-      .setSmallIcon(R.mipmap.kiwix_icon)
+      .setSmallIcon(R.mipmap.ic_launcher)
       .setWhen(System.currentTimeMillis())
       .addAction(R.drawable.ic_close_white_24dp,
         context.getString(R.string.stop_hotspot_button),

core/src/main/res/layout/activity_kiwix_error.xml

@@ -84,7 +84,7 @@
     app:layout_constraintHorizontal_bias="0.0"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/textView2"
-    app:srcCompat="@mipmap/kiwix_icon"
+    app:srcCompat="@mipmap/ic_launcher"
     />
 
   <ScrollView

core/src/main/res/layout/item_book.xml

@@ -41,7 +41,7 @@
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintStart_toEndOf="@id/itemBookCheckbox"
     app:layout_constraintTop_toTopOf="parent"
-    tools:src="@mipmap/kiwix_icon_round" />
+    tools:src="@mipmap/ic_launcher_round" />
 
   <TextView
     android:id="@+id/item_book_title"

core/src/main/res/layout/item_bookmark_history.xml

@@ -19,7 +19,7 @@
     app:layout_constraintEnd_toStartOf="@id/title"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
-    tools:src="@mipmap/kiwix_icon_round"
+    tools:src="@mipmap/ic_launcher_round"
     />
 
   <TextView

core/src/main/res/layout/kiwix_search_widget.xml

@@ -16,7 +16,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_weight="0.1"
-    android:src="@drawable/ic_kiwix_widget"
+    android:src="@mipmap/ic_launcher"
     />
 
   <TextView

core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

core/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

custom/build.gradle.kts

@@ -1,13 +1,13 @@
 import com.android.build.gradle.api.ApkVariantOutput
 import com.android.build.gradle.api.ApplicationVariant
 import com.android.build.gradle.internal.dsl.ProductFlavor
+import custom.CustomApps
+import custom.create
 import custom.createPublisher
 import custom.transactionWithCommit
 import plugin.KiwixConfigurationPlugin
 import java.net.URI
 import java.net.URL
-import java.text.SimpleDateFormat
-import java.util.Date
 
 plugins {
   android
@@ -22,26 +22,13 @@ android {
   flavorDimensions("default")
   productFlavors {
 
-    create(
+    create(CustomApps.all)
-      CustomFlavor(
+
-        flavorName = "customexample",
-        versionName = "2017-07",
-        url = "http://download.kiwix.org/zim/wikipedia_fr_test.zim",
-        enforcedLanguage = "en",
-        appName = "Test Custom App"
-      ),
-      CustomFlavor(
-        flavorName = "wikimed",
-        versionName = "2018-08",
-        url = "http://download.kiwix.org/zim/wikipedia_en_medicine_novid.zim",
-        enforcedLanguage = "en",
-        appName = "Medical Wikipedia"
-      )
-    )
     all {
-      val zimFile = File("$projectDir/src", "$name/$name.zim")
+      File("$projectDir/src", "$name/$name.zim").let {
-      createDownloadTask(zimFile)
+        createDownloadTask(it)
-      createPublishApkWithExpansionTask(name, zimFile, applicationVariants)
+        createPublishApkWithExpansionTask(it, applicationVariants)
+      }
     }
   }
   splits {
@@ -49,50 +36,10 @@ android {
       isUniversalApk = false
     }
   }
-}
+  lintOptions {
-
+    ignore("IconLocation")
-// apply(from = File("dynamic_flavors.gradle"))
-
-fun ProductFlavor.configureStrings(appName: String) {
-  resValue("string", "app_name", appName)
-  resValue("string", "app_search_string", "Search $appName")
-}
-
-fun ProductFlavor.fetchUrl(): String {
-  val urlConnection =
-    URI.create(buildConfigFields["ZIM_URL"]!!.value.replace("\"", "")).toURL()
-      .openConnection()
-  urlConnection.connect()
-  urlConnection.getInputStream()
-  return urlConnection
-    .getHeaderField("Location")
-    ?.replace("https", "http")
-    ?: urlConnection.url.toString()
-}
-
-fun NamedDomainObjectContainer<ProductFlavor>.create(vararg customFlavors: CustomFlavor) {
-  customFlavors.forEach { customFlavor ->
-    create(customFlavor.flavorName) {
-      versionName = customFlavor.versionName
-      versionCode = customFlavor.versionCode
-      applicationIdSuffix = ".kiwixcustom${customFlavor.flavorName}"
-      buildConfigField("String", "ZIM_URL", "\"${customFlavor.url}\"")
-      buildConfigField("String", "ENFORCED_LANG", "\"${customFlavor.enforcedLanguage}\"")
-      configureStrings(customFlavor.appName)
   }
 }
-}
-
-data class CustomFlavor(
-  val flavorName: String,
-  val versionName: String,
-  val versionCode: Int = Date().let {
-    SimpleDateFormat("YYDDD0").format(it).toInt()
-  },
-  val url: String,
-  val enforcedLanguage: String,
-  val appName: String
-)
 
 fun ProductFlavor.createDownloadTask(file: File): Task {
   return tasks.create("download${name.capitalize()}Zim") {
@@ -108,30 +55,45 @@ fun ProductFlavor.createDownloadTask(file: File): Task {
   }
 }
 
+fun ProductFlavor.fetchUrl(): String {
+  return URI.create(buildConfigFields["ZIM_URL"]!!.value.replace("\"", "")).toURL()
+    .openConnection()
+    .apply {
+      connect()
+      getInputStream()
+    }.let {
+      it.getHeaderField("Location")?.replace("https", "http") ?: it.url.toString()
+    }
+}
+
 fun ProductFlavor.createPublishApkWithExpansionTask(
-  flavorName: String,
   file: File,
   applicationVariants: DomainObjectSet<ApplicationVariant>
 ): Task {
-  return tasks.create("publish${flavorName.capitalize()}ReleaseApkWithExpansionFile") {
+  val capitalizedName = name.capitalize()
+  return tasks.create("publish${capitalizedName}ReleaseApkWithExpansionFile") {
     group = "publishing"
-    description = "Uploads ${flavorName.capitalize()} to the Play Console with an Expansion file"
+    description = "Uploads $capitalizedName to the Play Console with an Expansion file"
     doLast {
       val packageName = "org.kiwix$applicationIdSuffix"
       println("packageName $packageName")
-      val apkVariants = getApkVariants(applicationVariants, flavorName)
       createPublisher(File(rootDir, "google.json"))
         .transactionWithCommit(packageName) {
-          apkVariants.forEach(::uploadApk)
+          val variants =
-          uploadExpansionTo(file, apkVariants[0])
+            applicationVariants.releaseVariantsFor(this@createPublishApkWithExpansionTask)
-          apkVariants.drop(1).forEach {
+          variants.forEach(::uploadApk)
-            attachExpansionTo(apkVariants[0].versionCodeOverride, it)
+          uploadExpansionTo(file, variants[0])
-          }
+          variants.drop(1).forEach { attachExpansionTo(variants[0].versionCodeOverride, it) }
-          addToTrackInDraft(apkVariants)
+          addToTrackInDraft(variants)
         }
     }
   }
 }
+
+fun DomainObjectSet<ApplicationVariant>.releaseVariantsFor(productFlavor: ProductFlavor) =
+  find { it.name.equals("${productFlavor.name}Release", true) }!!
+    .outputs.filterIsInstance<ApkVariantOutput>().sortedBy { it.versionCodeOverride }
+
 afterEvaluate {
   tasks.filter { it.name.contains("ReleaseApkWithExpansionFile") }.forEach {
     val flavorName =
@@ -140,8 +102,3 @@ afterEvaluate {
     it.dependsOn.add(tasks.getByName("assemble${flavorName}Release"))
   }
 }
-
-fun getApkVariants(applicationVariants: DomainObjectSet<ApplicationVariant>, flavorName: String) =
-  applicationVariants.find {
-    it.name.contains("release", true) && it.name.contains(flavorName, true)
-  }!!.outputs.filterIsInstance<ApkVariantOutput>().sortedBy { it.versionCodeOverride }

custom/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="all" version="3.5.2">
 
     <issue
         id="ObsoleteLintCustomCheck"
@@ -11,7 +11,7 @@
     <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;.CustomApp&quot;>"
+        errorLine1="  &lt;application"
         errorLine2="   ~~~~~~~~~~~">
         <location
             file="src\main\AndroidManifest.xml"
@@ -22,7 +22,7 @@
     <issue
         id="UnpackedNativeCode"
         message="Missing attribute android:extractNativeLibs=&quot;false&quot; on the `&lt;application>` tag."
-        errorLine1="  &lt;application android:name=&quot;.CustomApp&quot;>"
+        errorLine1="  &lt;application"
         errorLine2="  ^">
         <location
             file="src\main\AndroidManifest.xml"
@@ -30,134 +30,11 @@
             column="3"/>
     </issue>
 
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.ic_kiwix_widget` appears to be unused">
-        <location
-            file="src\customexample\res\drawable-hdpi\ic_kiwix_widget.png"/>
-        <location
-            file="src\customexample\res\drawable-mdpi\ic_kiwix_widget.png"/>
-        <location
-            file="src\customexample\res\drawable-xhdpi\ic_kiwix_widget.png"/>
-        <location
-            file="src\customexample\res\drawable-xxhdpi\ic_kiwix_widget.png"/>
-        <location
-            file="src\customexample\res\drawable-xxxhdpi\ic_kiwix_widget.png"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.mipmap.kiwix_icon` appears to be unused">
-        <location
-            file="src\customexample\res\mipmap-hdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\mipmap-mdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\mipmap-xhdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\mipmap-xxhdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\mipmap-xxxhdpi\kiwix_icon.png"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.customapp_missing_content` appears to be unused"
-        errorLine1="  &lt;string name=&quot;customapp_missing_content&quot;>Ray Charles&lt;/string>"
-        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\customexample\res\values\strings.xml"
-            line="3"
-            column="11"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.raw.wikipedia_fr_test_2017_07` appears to be unused">
-        <location
-            file="src\customexample\res\raw\wikipedia_fr_test_2017_07.zim"/>
-    </issue>
-
-    <issue
-        id="IconDipSize"
-        message="The image `ic_kiwix_widget.png` varies significantly in its density-independent (dip) size across the various density versions: drawable-hdpi\\ic_kiwix_widget.png: 48x48 dp (72x72 px), drawable-mdpi\\ic_kiwix_widget.png: 72x72 dp (72x72 px), drawable-xhdpi\\ic_kiwix_widget.png: 48x48 dp (96x96 px), drawable-xxhdpi\\ic_kiwix_widget.png: 48x48 dp (144x144 px), drawable-xxxhdpi\\ic_kiwix_widget.png: 48x48 dp (192x192 px)">
-        <location
-            file="src\customexample\res\drawable-hdpi\ic_kiwix_widget.png"/>
-        <location
-            file="src\customexample\res\drawable-xhdpi\ic_kiwix_widget.png"/>
-        <location
-            file="src\customexample\res\drawable-xxxhdpi\ic_kiwix_widget.png"/>
-        <location
-            file="src\customexample\res\drawable-xxhdpi\ic_kiwix_widget.png"/>
-        <location
-            file="src\customexample\res\drawable-mdpi\ic_kiwix_widget.png"/>
-    </issue>
-
-    <issue
-        id="IconDipSize"
-        message="The image `kiwix_icon.png` varies significantly in its density-independent (dip) size across the various density versions: mipmap-hdpi\\kiwix_icon.png: 48x48 dp (72x72 px), mipmap-mdpi\\kiwix_icon.png: 72x72 dp (72x72 px), mipmap-xhdpi\\kiwix_icon.png: 48x48 dp (96x96 px), mipmap-xxhdpi\\kiwix_icon.png: 48x48 dp (144x144 px), mipmap-xxxhdpi\\kiwix_icon.png: 48x48 dp (192x192 px)">
-        <location
-            file="src\customexample\res\mipmap-xxhdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\mipmap-xhdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\mipmap-xxxhdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\mipmap-hdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\mipmap-mdpi\kiwix_icon.png"/>
-    </issue>
-
     <issue
         id="IconLocation"
         message="Found bitmap drawable `res/drawable/kiwix_icon_with_title.png` in densityless folder">
         <location
-            file="src\customexample\res\drawable\kiwix_icon_with_title.png"/>
+            file="src\wikimed\res\drawable\kiwix_icon_with_title.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_kiwix_widget.png, kiwix_icon.png">
-        <location
-            file="src\customexample\res\mipmap-hdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\drawable-hdpi\ic_kiwix_widget.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_kiwix_widget.png, kiwix_icon.png">
-        <location
-            file="src\customexample\res\mipmap-mdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\drawable-mdpi\ic_kiwix_widget.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_kiwix_widget.png, kiwix_icon.png">
-        <location
-            file="src\customexample\res\mipmap-xhdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\drawable-xhdpi\ic_kiwix_widget.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_kiwix_widget.png, kiwix_icon.png">
-        <location
-            file="src\customexample\res\mipmap-xxhdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\drawable-xxhdpi\ic_kiwix_widget.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_kiwix_widget.png, kiwix_icon.png">
-        <location
-            file="src\customexample\res\mipmap-xxxhdpi\kiwix_icon.png"/>
-        <location
-            file="src\customexample\res\drawable-xxxhdpi\ic_kiwix_widget.png"/>
     </issue>
 
     <issue
@@ -200,7 +77,7 @@
         errorLine2="      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\custom\main\CustomMainActivity.kt"
-            line="41"
+            line="38"
             column="7"/>
     </issue>
 

custom/src/customexample/info.json

@@ -1,11 +0,0 @@
-{
-  "app_name": "Test Custom App",
-  "package": "org.kiwix.kiwixcustomexample",
-  "version_name": "2017-07",
-  "version_code": "1",
-  "zim_file": "kiwix.granbluefantasy_en_all_all.zim",
-  "zim_url": "http://download.kiwix.org/zim/other/granbluefantasy_en_all_nopic_2018-10.zim.meta4",
-  "embed_zim": false,
-  "ic_launcher": "icon.png",
-  "enforced_lang": "en"
-}

custom/src/customexample/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

custom/src/customexample/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

custom/src/customexample/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

custom/src/customexample/res/values/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="customapp_missing_content">Ray Charles</string>
-</resources>

custom/src/main/AndroidManifest.xml

@@ -3,7 +3,10 @@
   package="org.kiwix.kiwixmobile.custom">
 
 
-  <application android:name=".CustomApp">
+  <application
+    android:name=".CustomApp"
+    android:icon="@mipmap/ic_launcher"
+    android:roundIcon="@mipmap/ic_launcher_round">
 
     <activity
       android:name=".main.CustomMainActivity"

custom/src/wikimed/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

custom/src/wikimed/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

custom/src/wikimed/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>