Merge pull request #1613 from kiwix/feature/macgills/prevent-kiwix-icon-in-custom

Move kiwix icon to app module

app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt

@@ -25,7 +25,7 @@ import android.widget.Toast
 import androidx.core.net.toFile
 import androidx.core.net.toUri
 import org.json.JSONArray
-import org.kiwix.kiwixmobile.core.R
+import org.kiwix.kiwixmobile.R
 import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.start
 import org.kiwix.kiwixmobile.core.extensions.toast
 import org.kiwix.kiwixmobile.core.main.CoreMainActivity
@@ -107,6 +107,8 @@ class KiwixMainActivity : CoreMainActivity() {
   override fun hasValidFileAndUrl(url: String?, zimFileReader: ZimFileReader?) =
     super.hasValidFileAndUrl(url, zimFileReader) && url != HOME_URL
 
+  override fun getIconResId() = R.mipmap.ic_launcher
+
   override fun urlIsInvalid() =
     super.urlIsInvalid() || currentWebView.url == HOME_URL
 

app/src/main/java/org/kiwix/kiwixmobile/webserver/wifi_hotspot/HotspotNotificationManager.java

@@ -28,7 +28,7 @@ import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
 import javax.inject.Inject;
-import org.kiwix.kiwixmobile.core.R;
+import org.kiwix.kiwixmobile.R;
 import org.kiwix.kiwixmobile.core.utils.Constants;
 import org.kiwix.kiwixmobile.webserver.ZimHostActivity;
 

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

@@ -598,10 +598,12 @@ public abstract class CoreMainActivity extends BaseActivity
         tempVisitCount = 0;
         visitCounterPref.setCount(tempVisitCount);
       })
-      .setIcon(ContextCompat.getDrawable(this, R.mipmap.ic_launcher))
+      .setIcon(ContextCompat.getDrawable(this, getIconResId()))
       .show();
   }
 
+  protected abstract int getIconResId();
+
   private void goToSearch(boolean isVoice) {
     final String zimFile = zimReaderContainer.getZimCanonicalPath();
     saveTabStates();

custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt

@@ -21,13 +21,13 @@ package org.kiwix.kiwixmobile.custom.main
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
-import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.start
 import org.kiwix.kiwixmobile.core.main.CoreMainActivity
 import org.kiwix.kiwixmobile.core.main.WebViewCallback
 import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer
 import org.kiwix.kiwixmobile.core.utils.LanguageUtils
 import org.kiwix.kiwixmobile.custom.BuildConfig
+import org.kiwix.kiwixmobile.custom.R
 import org.kiwix.kiwixmobile.custom.customActivityComponent
 import org.kiwix.kiwixmobile.custom.download.CustomDownloadActivity
 import org.kiwix.kiwixmobile.custom.main.ValidationState.HasBothFiles
@@ -83,6 +83,8 @@ class CustomMainActivity : CoreMainActivity() {
     zimReaderContainer: ZimReaderContainer
   ) = CustomWebViewClient(webViewCallback, zimReaderContainer)
 
+  override fun getIconResId() = R.mipmap.ic_launcher
+
   private fun requireEnforcedLanguage(): Boolean {
     val currentLocaleCode = Locale.getDefault().toString()
     if (BuildConfig.ENFORCED_LANG.isNotEmpty() && BuildConfig.ENFORCED_LANG != currentLocaleCode) {