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 2fc62c96b..000000000 Binary files a/android/app/src/playExperimental/res/mipmap-ldpi/ic_launcher.png and /dev/null differ 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>