From 915b896636725ef4639263b02bcc829d19ab7d99 Mon Sep 17 00:00:00 2001
From: Attila Uygun <auygun@opera.com>
Date: Wed, 6 Sep 2023 20:15:00 +0200
Subject: [PATCH] Use manifestPlaceholders for app icon

---
 build/android/app/build.gradle                    | 5 +++--
 build/android/app/src/main/AndroidManifest.xml    | 2 +-
 build/android/app/src/main/res/values/strings.xml | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle
index 8d51843..be51faf 100644
--- a/build/android/app/build.gradle
+++ b/build/android/app/build.gradle
@@ -29,7 +29,7 @@ android {
             applicationId 'com.kaliber.helloworld'
             resValue "string", "provider_name", "${applicationId}.fileprovider"
             resValue "string", "app_name", "Kaliber Hello World"
-            resValue "string", "interstitial_ad_unit_id", ""
+            manifestPlaceholders = [appIcon: "@mipmap/ic_launcher"]
             ext {
                 gnTarget = "hello_world"
             }
@@ -39,7 +39,7 @@ android {
             applicationId 'com.kaliber.woom'
             resValue "string", "provider_name", "${applicationId}.fileprovider"
             resValue "string", "app_name", "Kaliber Demo"
-            resValue "string", "interstitial_ad_unit_id", ""
+            manifestPlaceholders = [appIcon: "@mipmap/ic_launcher"]
             ext {
                 gnTarget = "demo"
             }
@@ -50,6 +50,7 @@ android {
             resValue "string", "provider_name", "${applicationId}.fileprovider"
             resValue "string", "app_name", "woom"
             resValue "string", "interstitial_ad_unit_id", "ca-app-pub-1321063817979967/8373182022"
+            manifestPlaceholders = [appIcon: "@mipmap/ic_launcher"]
             ext {
                 gnTarget = "demo"
             }
diff --git a/build/android/app/src/main/AndroidManifest.xml b/build/android/app/src/main/AndroidManifest.xml
index 6fa1f00..3630cf0 100644
--- a/build/android/app/src/main/AndroidManifest.xml
+++ b/build/android/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     <application
         android:allowBackup="false"
         android:fullBackupContent="false"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="${appIcon}"
         android:label="@string/app_name">
 
         <activity
diff --git a/build/android/app/src/main/res/values/strings.xml b/build/android/app/src/main/res/values/strings.xml
index 045e125..0f7d93f 100644
--- a/build/android/app/src/main/res/values/strings.xml
+++ b/build/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_name">Kaliber app</string>
+    <string name="interstitial_ad_unit_id"></string>
 </resources>