Starting Android

android/app/build.gradle

@@ -30,7 +30,7 @@ react {
     //   The list of variants to that are debuggable. For those we're going to
     //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
     //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
-    debuggableVariants = ["experimentalPlayDebug", "officialPlayDebug", "experimentalFossDebug", "officialFossDebug"]
+    debuggableVariants = ["playDebug", "fossDebug"]
     /* Bundling */
     //   A list containing the node command and its flags. Default is just 'node'.
     // nodeExecutableAndArgs = ["node"]
@@ -118,7 +118,7 @@ android {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
             missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below!
         }
-        resValue "string", "rn_config_reader_custom_package", "chat.rocket.reactnative"
+        resValue "string", "rn_config_reader_custom_package", "chat.rocket.android"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
@@ -158,17 +158,8 @@ android {
     }
 
     // applicationVariants are e.g. debug, release
-
-    flavorDimensions "app", "type"
+    flavorDimensions "type"
     productFlavors {
-        official {
-            dimension = "app"
-            buildConfigField "boolean", "IS_OFFICIAL", "true"
-        }
-        experimental {
-            dimension = "app"
-            buildConfigField "boolean", "IS_OFFICIAL", "false"
-        }
         foss {
             dimension = "type"
             buildConfigField "boolean", "FDROID_BUILD", "true"
@@ -180,19 +171,11 @@ android {
     }
     sourceSets {
         // TODO: refactor making sure notifications are working properly both on debug and release
-        experimentalPlayDebug {
+        playDebug {
             java.srcDirs = ['src/main/java', 'src/play/java']
             manifest.srcFile 'src/play/AndroidManifest.xml'
         }
-        experimentalPlayRelease {
-            java.srcDirs = ['src/main/java', 'src/play/java']
-            manifest.srcFile 'src/play/AndroidManifest.xml'
-        }
-        officialPlayDebug {
-            java.srcDirs = ['src/main/java', 'src/play/java']
-            manifest.srcFile 'src/play/AndroidManifest.xml'
-        }
-        officialPlayRelease {
+        playRelease {
             java.srcDirs = ['src/main/java', 'src/play/java']
             manifest.srcFile 'src/play/AndroidManifest.xml'
         }

android/app/src/experimental/res/drawable-v24/ic_launcher_background.xml

@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-  <group>
-    <clip-path android:pathData="M0,0h512v512h-512z M 0,0"/>
-    <path
-        android:pathData="M0,0h512v512h-512z">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startY="0"
-            android:startX="256"
-            android:endY="512"
-            android:endX="256"
-            android:type="linear">
-          <item android:offset="0" android:color="#FF1C82FF"/>
-          <item android:offset="1" android:color="#FF0066E3"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
-</vector>

android/app/src/experimental/res/values/colors.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<color name="primary_dark">#660B0B0B</color>
-	<item name="splashBackground" type="color">#1D74F5</item>
-	<item name="notification_text" type="color">#1D74F5</item>
-</resources>

android/app/src/experimental/res/values/strings.xml

@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">Rocket.Chat Experimental</string>
-    <string name="share_extension_name">Rocket.Chat Experimental</string>
-</resources>

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"
-    package="chat.rocket.reactnative">
+    package="chat.rocket.android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

android/app/src/official/AndroidManifest.xml

@@ -1,5 +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"
-		  android:sharedUserId="chat.rocket.android">
-</manifest>

android/app/src/official/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

android/app/src/official/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

android/gradle.properties

@@ -42,7 +42,7 @@ newArchEnabled=false
 hermesEnabled=true
 
 # Application ID
-APPLICATION_ID=chat.rocket.reactnative
+APPLICATION_ID=chat.rocket.android
 
 # App properties
 VERSIONCODE=999999999

package.json

@@ -10,8 +10,8 @@
 		"prettier-lint": "prettier --write . && yarn lint",
 		"ci": "npm run precommit && codecov",
 		"ios": "npx react-native run-ios",
-		"android": "npx react-native run-android --variant=experimentalPlayDebug",
-		"android-whitelabel": "npx react-native run-android --main-activity chat.rocket.reactnative.MainActivity --variant=experimentalPlayDebug --appId",
+		"android": "npx react-native run-android --variant=playDebug",
+		"android-whitelabel": "npx react-native run-android --main-activity chat.rocket.reactnative.MainActivity --variant=playDebug --appId",
 		"log-android": "react-native log-android",
 		"snyk-protect": "snyk protect",
 		"precommit": "lint-staged",