From 4a5f69458c67a617b0ea7f781ff653a88f460e5d Mon Sep 17 00:00:00 2001
From: Phil Oliver <3497406+poliver@users.noreply.github.com>
Date: Sun, 2 Nov 2025 18:26:50 -0500
Subject: [PATCH] Enable parallel installation of debug and release builds
 (#3596)

---
 app/build.gradle.kts                               |  9 +++++++++
 app/google-services.json                           | 13 +++++++++++++
 .../res/drawable-anydpi/ic_launcher_background.xml | 14 ++++++++++++++
 .../res/drawable-anydpi/ic_launcher_background.xml | 14 ++++++++++++++
 .../res/drawable-anydpi/ic_launcher_background.xml | 10 ++++++++++
 app/src/main/res/mipmap-anydpi/ic_launcher.xml     |  2 +-
 app/src/main/res/values/colors.xml                 |  1 -
 7 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 app/src/fdroidDebug/res/drawable-anydpi/ic_launcher_background.xml
 create mode 100644 app/src/googleDebug/res/drawable-anydpi/ic_launcher_background.xml
 create mode 100644 app/src/main/res/drawable-anydpi/ic_launcher_background.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f1be226dc..a89b6c4be 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -173,6 +173,15 @@ secrets {
 
 // workaround for https://github.com/google/ksp/issues/1590
 androidComponents {
+    onVariants(selector().all()) { variant ->
+        if (variant.name == "fdroidDebug") {
+            variant.applicationId = "com.geeksville.mesh.fdroid.debug"
+        }
+
+        if (variant.name == "googleDebug") {
+            variant.applicationId = "com.geeksville.mesh.google.debug"
+        }
+    }
     onVariants(selector().withBuildType("release")) { variant ->
         if (variant.flavorName == "google") {
             val variantNameCapped = variant.name.replaceFirstChar { it.uppercase() }
diff --git a/app/google-services.json b/app/google-services.json
index d44e7ae87..73d076ce6 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -48,6 +48,19 @@
           ]
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:xxx:android:1111",
+        "android_client_info": {
+          "package_name": "com.geeksville.mesh.google.debug"
+        }
+      },
+      "api_key": [
+        {
+          "current_key": "APlaceholderAPIKeyWith-ThirtyNineCharsX"
+        }
+      ]
     }
   ],
   "configuration_version": "1"
diff --git a/app/src/fdroidDebug/res/drawable-anydpi/ic_launcher_background.xml b/app/src/fdroidDebug/res/drawable-anydpi/ic_launcher_background.xml
new file mode 100644
index 000000000..170282ec9
--- /dev/null
+++ b/app/src/fdroidDebug/res/drawable-anydpi/ic_launcher_background.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#FFC802"
+        android:pathData="M0,0h108v108h-108z" />
+
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="#000000"
+        android:pathData="M47.26,70.68H47.2C47.01,70.7 46.88,70.8 46.8,70.92H46.8C46.8,70.92 46.8,70.92 46.8,70.92H46.8C46.79,70.93 46.79,70.93 46.79,70.94C46.73,71.02 46.61,71.31 46.86,71.59L48.04,72.82C47.99,72.96 47.96,73.1 47.96,73.26V75.3C47.96,75.95 48.45,76.48 49.06,76.48H58.99C59.6,76.48 60.09,75.95 60.09,75.3V73.26C60.09,73.09 60.05,72.93 60,72.78L61.14,71.59C61.41,71.29 61.25,70.99 61.2,70.92H61.2C61.2,70.92 61.2,70.92 61.2,70.92C61.12,70.8 60.99,70.7 60.8,70.68C60.63,70.66 60.47,70.72 60.36,70.84L59.16,72.09C59.11,72.08 59.05,72.07 58.99,72.07H49.06C48.98,72.07 48.91,72.08 48.84,72.1L47.64,70.84C47.54,70.74 47.4,70.68 47.26,70.68L47.26,70.68ZM50.82,73.24C51.45,73.24 51.95,73.74 51.95,74.37C51.95,75 51.45,75.5 50.82,75.5C50.19,75.5 49.69,74.99 49.69,74.37C49.69,73.74 50.2,73.24 50.82,73.24ZM57.2,73.24C57.83,73.24 58.33,73.74 58.33,74.37C58.33,74.99 57.83,75.5 57.2,75.5C56.58,75.5 56.07,75 56.07,74.37C56.07,73.74 56.58,73.24 57.2,73.24ZM48.92,77.28C48.39,77.28 47.96,77.68 47.96,78.17V84.44C47.96,84.93 48.39,85.32 48.92,85.32H59.12C59.65,85.32 60.08,84.93 60.08,84.44V78.17C60.08,77.68 59.65,77.28 59.12,77.28H48.92Z" />
+</vector>
diff --git a/app/src/googleDebug/res/drawable-anydpi/ic_launcher_background.xml b/app/src/googleDebug/res/drawable-anydpi/ic_launcher_background.xml
new file mode 100644
index 000000000..1a564c2ab
--- /dev/null
+++ b/app/src/googleDebug/res/drawable-anydpi/ic_launcher_background.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#FFC802"
+        android:pathData="M0,0h108v108h-108z" />
+
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="#000000"
+        android:pathData="M54,70.67C55.98,70.67 57.63,71.39 58.91,72.58L56.81,74.68C56.04,73.96 55.08,73.59 54,73.59C52.09,73.59 50.47,74.87 49.89,76.61L49.79,76.94C49.71,77.28 49.66,77.64 49.66,78C49.66,78.49 49.75,78.95 49.89,79.39L49.88,79.4H49.89C50.47,81.13 52.09,82.42 54,82.42C54.99,82.42 55.82,82.15 56.47,81.71L56.62,81.61C57.32,81.1 57.78,80.36 57.95,79.51H54V76.67H60.91C60.99,77.15 61.04,77.65 61.04,78.17C61.04,80.4 60.24,82.28 58.85,83.56L58.62,83.76C57.43,84.76 55.86,85.33 54,85.33C51.13,85.33 48.66,83.69 47.45,81.29V81.29L47.28,80.91C46.89,80.02 46.67,79.04 46.67,78C46.67,76.81 46.95,75.7 47.45,74.71C48.66,72.31 51.13,70.67 54,70.67Z" />
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_launcher_background.xml b/app/src/main/res/drawable-anydpi/ic_launcher_background.xml
new file mode 100644
index 000000000..78c7a219b
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_launcher_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#67ea94"
+        android:pathData="M0,0h108v108h-108z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
index 0b0d585e4..93542a753 100644
--- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?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"/>
+    <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 388590f28..ee9ec22a9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,6 +15,5 @@
      along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 <resources>
-    <color name="ic_launcher_background">#67ea94</color>
     <color name="ic_splash">#000000</color>
 </resources>