From 7f2dc1b7ca83e38974f828310f8502a343e4883b Mon Sep 17 00:00:00 2001
From: Pedro Monteiro <83165668+pedroafmonteiro@users.noreply.github.com>
Date: Tue, 26 Nov 2024 17:26:36 +0000
Subject: [PATCH 1/3] Changed build.gradle to add the new suffix. Changed
 AndroidManifest.xml to change the app name based on release or debug version.

---
 packages/uni_app/android/app/build.gradle                    | 3 +++
 packages/uni_app/android/app/src/debug/res/values/string.xml | 4 ++++
 packages/uni_app/android/app/src/main/AndroidManifest.xml    | 2 +-
 packages/uni_app/android/app/src/main/res/values/string.xml  | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 packages/uni_app/android/app/src/debug/res/values/string.xml
 create mode 100644 packages/uni_app/android/app/src/main/res/values/string.xml

diff --git a/packages/uni_app/android/app/build.gradle b/packages/uni_app/android/app/build.gradle
index 30f18ecdd..a2f487422 100644
--- a/packages/uni_app/android/app/build.gradle
+++ b/packages/uni_app/android/app/build.gradle
@@ -76,6 +76,9 @@ android {
                 "proguard-rules.pro"
             )
         }
+        debug {
+            applicationIdSuffix ".debug"
+        }
     }
 }
 
diff --git a/packages/uni_app/android/app/src/debug/res/values/string.xml b/packages/uni_app/android/app/src/debug/res/values/string.xml
new file mode 100644
index 000000000..c16d9fe3b
--- /dev/null
+++ b/packages/uni_app/android/app/src/debug/res/values/string.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">uni (debug)</string>
+</resources>
diff --git a/packages/uni_app/android/app/src/main/AndroidManifest.xml b/packages/uni_app/android/app/src/main/AndroidManifest.xml
index fbc9a782b..442afefcc 100644
--- a/packages/uni_app/android/app/src/main/AndroidManifest.xml
+++ b/packages/uni_app/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
    <application
-        android:label="uni"
+        android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true">
diff --git a/packages/uni_app/android/app/src/main/res/values/string.xml b/packages/uni_app/android/app/src/main/res/values/string.xml
new file mode 100644
index 000000000..9e4a78d23
--- /dev/null
+++ b/packages/uni_app/android/app/src/main/res/values/string.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">uni</string>
+</resources>

From 0ac33adef85ce4279c27c04b3c795291c736db76 Mon Sep 17 00:00:00 2001
From: Pedro Monteiro <83165668+pedroafmonteiro@users.noreply.github.com>
Date: Wed, 27 Nov 2024 10:38:01 +0000
Subject: [PATCH 2/3] Changed applicationIdSuffix to ".dev"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: André Lima <me@limwa.pt>
---
 packages/uni_app/android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/uni_app/android/app/build.gradle b/packages/uni_app/android/app/build.gradle
index a2f487422..96d940781 100644
--- a/packages/uni_app/android/app/build.gradle
+++ b/packages/uni_app/android/app/build.gradle
@@ -77,7 +77,7 @@ android {
             )
         }
         debug {
-            applicationIdSuffix ".debug"
+            applicationIdSuffix ".dev"
         }
     }
 }

From 8c5e78aebe0eec1725c7fb4221688a8c1bd6f161 Mon Sep 17 00:00:00 2001
From: Pedro Monteiro <83165668+pedroafmonteiro@users.noreply.github.com>
Date: Wed, 27 Nov 2024 10:38:31 +0000
Subject: [PATCH 3/3] Changed debug app name to "uni (dev)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: André Lima <me@limwa.pt>
---
 packages/uni_app/android/app/src/debug/res/values/string.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/uni_app/android/app/src/debug/res/values/string.xml b/packages/uni_app/android/app/src/debug/res/values/string.xml
index c16d9fe3b..57a1e9693 100644
--- a/packages/uni_app/android/app/src/debug/res/values/string.xml
+++ b/packages/uni_app/android/app/src/debug/res/values/string.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">uni (debug)</string>
+    <string name="app_name">uni (dev)</string>
 </resources>