From 7e715a5cd672c517cf22da9e50c87fb16f29019b Mon Sep 17 00:00:00 2001
From: Filipe Brito <filipedelimabrito@gmail.com>
Date: Thu, 26 Sep 2019 18:20:13 -0300
Subject: [PATCH] Adds experimental and play app icons and names.

---
 android/app/build.gradle                         |   8 ++++++++
 android/app/src/debug/res/values/strings.xml     |   4 ----
 android/app/src/main/AndroidManifest.xml         |   8 +++++---
 .../mipmap-hdpi/ic_launcher_experimental.png}    | Bin
 .../mipmap-mdpi/ic_launcher_experimental.png}    | Bin
 .../mipmap-xhdpi/ic_launcher_experimental.png}   | Bin
 .../mipmap-xxhdpi/ic_launcher_experimental.png}  | Bin
 .../mipmap-xxxhdpi/ic_launcher_experimental.png} | Bin
 android/app/src/main/res/values/strings.xml      |   2 +-
 .../res/mipmap-ldpi/ic_launcher.png              | Bin 1816 -> 0 bytes
 .../src/playExperimental/res/values/strings.xml  |   4 ----
 11 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 android/app/src/debug/res/values/strings.xml
 rename android/app/src/{playExperimental/res/mipmap-hdpi/ic_launcher.png => main/res/mipmap-hdpi/ic_launcher_experimental.png} (100%)
 rename android/app/src/{playExperimental/res/mipmap-mdpi/ic_launcher.png => main/res/mipmap-mdpi/ic_launcher_experimental.png} (100%)
 rename android/app/src/{playExperimental/res/mipmap-xhdpi/ic_launcher.png => main/res/mipmap-xhdpi/ic_launcher_experimental.png} (100%)
 rename android/app/src/{playExperimental/res/mipmap-xxhdpi/ic_launcher.png => main/res/mipmap-xxhdpi/ic_launcher_experimental.png} (100%)
 rename android/app/src/{playExperimental/res/mipmap-xxxhdpi/ic_launcher.png => main/res/mipmap-xxxhdpi/ic_launcher_experimental.png} (100%)
 delete mode 100644 android/app/src/playExperimental/res/mipmap-ldpi/ic_launcher.png
 delete mode 100644 android/app/src/playExperimental/res/values/strings.xml

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4efdf989b..253f8fffb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -173,11 +173,19 @@ android {
     productFlavors {
         play {
             dimension "store"
+            manifestPlaceholders = [
+                    appIcon: "@mipmap/ic_launcher",
+                    appName: "@string/app_name"
+            ]
         }
 
         playExperimental {
             dimension "store"
             applicationId "chat.rocket.reactnative"
+            manifestPlaceholders = [
+                    appIcon: "@mipmap/ic_launcher_experimental",
+                    appName: "@string/app_name_experimental"
+            ]
         }
     }
 
diff --git a/android/app/src/debug/res/values/strings.xml b/android/app/src/debug/res/values/strings.xml
deleted file mode 100644
index a059145c6..000000000
--- a/android/app/src/debug/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">Rocket.Chat - Development</string>
-    <string name="share_extension_name">Rocket.Chat - Development</string>
-</resources>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 84ca5a620..83afe4572 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,13 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="chat.rocket.android"
     android:sharedUserId="chat.rocket.android">
 
     <application
         android:name="chat.rocket.android.MainApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:icon="${appIcon}"
+        android:label="${appName}"
+        android:theme="@style/AppTheme"
+        tools:replace="android:label">
 
         <activity
             android:name="chat.rocket.android.MainActivity"
diff --git a/android/app/src/playExperimental/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_experimental.png
similarity index 100%
rename from android/app/src/playExperimental/res/mipmap-hdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_experimental.png
diff --git a/android/app/src/playExperimental/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_experimental.png
similarity index 100%
rename from android/app/src/playExperimental/res/mipmap-mdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_experimental.png
diff --git a/android/app/src/playExperimental/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_experimental.png
similarity index 100%
rename from android/app/src/playExperimental/res/mipmap-xhdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_experimental.png
diff --git a/android/app/src/playExperimental/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_experimental.png
similarity index 100%
rename from android/app/src/playExperimental/res/mipmap-xxhdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_experimental.png
diff --git a/android/app/src/playExperimental/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_experimental.png
similarity index 100%
rename from android/app/src/playExperimental/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_experimental.png
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index f6100eaef..068f0b0bf 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
     <string name="app_name">Rocket.Chat</string>
+    <string name="app_name_experimental">Rocket.Chat Experimental</string>
     <string name="share_extension_name">Rocket.Chat</string>
-    <string name="no_browser_found">No Browser Found</string>
 </resources>
diff --git a/android/app/src/playExperimental/res/mipmap-ldpi/ic_launcher.png b/android/app/src/playExperimental/res/mipmap-ldpi/ic_launcher.png
deleted file mode 100644
index 2fc62c96bb389ecfdefab860ba63d1861f8f298c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1816
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
GLSTYu8%?|b

diff --git a/android/app/src/playExperimental/res/values/strings.xml b/android/app/src/playExperimental/res/values/strings.xml
deleted file mode 100644
index e8e7ca8c1..000000000
--- a/android/app/src/playExperimental/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">Rocket.Chat Experimental</string>
-    <string name="share_extension_name">Rocket.Chat Experimental</string>
-</resources>