From e6d89add578944bc21e98b7853c3d89154797b68 Mon Sep 17 00:00:00 2001
From: Attila Uygun <auygun@opera.com>
Date: Mon, 4 Sep 2023 20:05:57 +0200
Subject: [PATCH] Move product specific values to productFlavors

---
 build/android/app/build.gradle                       | 11 +++++++++--
 build/android/app/src/main/AndroidManifest.xml       |  2 +-
 build/android/app/src/main/res/values/strings.xml    |  2 --
 build/android/build.gradle                           | 12 +++++-------
 .../java/com/kaliber/base/KaliberActivity.java       |  1 -
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle
index c0cdc25..b42aa63 100644
--- a/build/android/app/build.gradle
+++ b/build/android/app/build.gradle
@@ -103,7 +103,6 @@ android {
     ndkVersion rootProject.ext.ndkVersion
 
     defaultConfig {
-        applicationId rootProject.ext.applicationId
         minSdk rootProject.ext.minSdk
         targetSdk rootProject.ext.targetSdk
         ndk {
@@ -127,12 +126,20 @@ android {
     productFlavors {
         helloWorld {
             dimension 'game'
+            applicationId 'com.kaliber.helloworld'
+            resValue "string", "provider_name", "${applicationId}.fileprovider"
+            resValue "string", "app_name", "Kaliber Hello World"
+            resValue "string", "interstitial_ad_unit_id", ""
             ext {
                 gnTarget = "hello_world"
             }
         }
         demo {
             dimension 'game'
+            applicationId 'com.kaliber.woom'
+            resValue "string", "provider_name", "${applicationId}.fileprovider"
+            resValue "string", "app_name", "Kaliber Demo"
+            resValue "string", "interstitial_ad_unit_id", "ca-app-pub-1321063817979967/8373182022"
             ext {
                 gnTarget = "demo"
             }
@@ -155,7 +162,7 @@ android {
         }
     }
 
-    namespace rootProject.ext.applicationId
+    namespace "com.kaliber.base"
 }
 
 dependencies {
diff --git a/build/android/app/src/main/AndroidManifest.xml b/build/android/app/src/main/AndroidManifest.xml
index b49bfa0..6fa1f00 100644
--- a/build/android/app/src/main/AndroidManifest.xml
+++ b/build/android/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.woom.game.fileprovider"
+            android:authorities="@string/provider_name"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/build/android/app/src/main/res/values/strings.xml b/build/android/app/src/main/res/values/strings.xml
index 8e5f25b..045e125 100644
--- a/build/android/app/src/main/res/values/strings.xml
+++ b/build/android/app/src/main/res/values/strings.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">woom</string>
-    <string name="interstitial_ad_unit_id">ca-app-pub-1321063817979967/8373182022</string>
 </resources>
diff --git a/build/android/build.gradle b/build/android/build.gradle
index 76ca238..266c898 100644
--- a/build/android/build.gradle
+++ b/build/android/build.gradle
@@ -21,19 +21,17 @@ task clean(type: Delete) {
 }
 
 ext {
+    ndkVersion = '25.2.9519653'
+    minSdk = 24
+    compileSdk = 33
+    targetSdk = 33
+
     if (!project.hasProperty('targetArchs')) {
         targetArchs = ['Arm7', 'Arm8', 'X86_64', 'X86']
     } else {
         targetArchs = project.getProperty('targetArchs').split(',')
     }
 
-    applicationId = 'com.woom.game'
-
-    ndkVersion = '25.2.9519653'
-    minSdk = 24
-    compileSdk = 33
-    targetSdk = 33
-
     if (!project.hasProperty('gn')) {
         gn = "gn"
     }
diff --git a/src/engine/platform/java/com/kaliber/base/KaliberActivity.java b/src/engine/platform/java/com/kaliber/base/KaliberActivity.java
index f45c4ae..92d00e1 100644
--- a/src/engine/platform/java/com/kaliber/base/KaliberActivity.java
+++ b/src/engine/platform/java/com/kaliber/base/KaliberActivity.java
@@ -24,7 +24,6 @@ import com.google.android.gms.ads.initialization.InitializationStatus;
 import com.google.android.gms.ads.initialization.OnInitializationCompleteListener;
 import com.google.android.gms.ads.interstitial.InterstitialAd;
 import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback;
-import com.woom.game.R;
 
 import java.io.File;