From b38bc1f13e99574d737d49e19395405953780338 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Sat, 6 Mar 2021 15:59:04 +0300
Subject: [PATCH] [android]: Remove beta/debug resources from android/flavors

Override the application name in build.gradle instead.

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
---
 android/build.gradle                         | 6 ++++--
 android/flavors/beta/res/values/strings.xml  | 4 ----
 android/flavors/debug/AndroidManifest.xml    | 7 -------
 android/flavors/debug/res/values/strings.xml | 4 ----
 android/res/values/strings.xml               | 1 -
 5 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 android/flavors/beta/res/values/strings.xml
 delete mode 100644 android/flavors/debug/AndroidManifest.xml
 delete mode 100644 android/flavors/debug/res/values/strings.xml

diff --git a/android/build.gradle b/android/build.gradle
index 521f381be2..5dfa66bf3b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -94,6 +94,7 @@ def osName = System.properties['os.name'].toLowerCase()
 
 project.ext.versionCodes = ['armeabi-v7a': 30, 'x86': 40, 'arm64-v8a': 50, 'x86_64' : 60]
 project.ext.appId = 'app.omaps'
+project.ext.appName = 'OMaps'
 
 configurations.all {
   if (it.getName().contains("lint"))
@@ -412,8 +413,8 @@ android {
       jniDebuggable true           // Enable jni debug build
       zipAlignEnabled true
       signingConfig signingConfigs.mapswithme
-      android.sourceSets.debug.setRoot('flavors/debug')
       resValue 'string', 'app_id', android.defaultConfig.applicationId + applicationIdSuffix
+      resValue 'string', 'app_name', project.ext.appName + applicationIdSuffix
     }
 
     release {
@@ -422,6 +423,7 @@ android {
       shrinkResources true
       proguardFile('proguard-mwm.txt')
       resValue 'string', 'app_id', android.defaultConfig.applicationId
+      resValue 'string', 'app_name', project.ext.appName
       firebaseCrashlytics {
         nativeSymbolUploadEnabled true
       }
@@ -431,9 +433,9 @@ android {
       applicationIdSuffix '.beta'
       versionNameSuffix '-beta'
       signingConfig signingConfigs.mapswithme
-      android.sourceSets.beta.setRoot('flavors/beta')
       matchingFallbacks = ['debug', 'release']
       resValue 'string', 'app_id', android.defaultConfig.applicationId + applicationIdSuffix
+      resValue 'string', 'app_name', project.ext.appName + applicationIdSuffix
       firebaseCrashlytics {
         nativeSymbolUploadEnabled true
       }
diff --git a/android/flavors/beta/res/values/strings.xml b/android/flavors/beta/res/values/strings.xml
deleted file mode 100644
index 14993eef0f..0000000000
--- a/android/flavors/beta/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<resources>
-    <string name="app_name">OMaps beta</string>
-</resources>
diff --git a/android/flavors/debug/AndroidManifest.xml b/android/flavors/debug/AndroidManifest.xml
deleted file mode 100644
index dac5a79cf8..0000000000
--- a/android/flavors/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:remove="sharedUserId, sharedUserLabel">
-  <uses-permission android:name="android.permission.READ_LOGS"/>
-    <!-- Debug manifest doesn't contain sharedUser values to avoid installation conflicts with production versions -->
-</manifest>
diff --git a/android/flavors/debug/res/values/strings.xml b/android/flavors/debug/res/values/strings.xml
deleted file mode 100644
index 59bbb18489..0000000000
--- a/android/flavors/debug/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<resources>
-    <string name="app_name">OMaps debug</string>
-</resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 6a570d6989..0fd6546de3 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -89,7 +89,6 @@
 	<string name="country_status_download_failed">Download has failed</string>
 	<!-- Button text for the button under the country_status_download_failed message -->
 	<string name="try_again">Try Again</string>
-	<string name="app_name">OMaps</string>
 	<string name="about_menu_title">About OMaps</string>
 	<string name="downloading_touch_to_cancel">Downloading %d%%, touch to cancel</string>
 	<string name="downloaded_touch_to_delete">Downloaded (%s), touch to delete</string>