diff --git a/android/app/build.gradle b/android/app/build.gradle
index ab8d9543f..0c9e268d1 100644
--- a/android/app/build.gradle
+++ b/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'
}
diff --git a/android/app/src/experimental/ic_launcher-web.png b/android/app/src/experimental/ic_launcher-web.png
deleted file mode 100644
index cc5e2e30b..000000000
Binary files a/android/app/src/experimental/ic_launcher-web.png and /dev/null differ
diff --git a/android/app/src/experimental/res/drawable-v24/ic_launcher_background.xml b/android/app/src/experimental/res/drawable-v24/ic_launcher_background.xml
deleted file mode 100644
index 9e9d5fe99..000000000
--- a/android/app/src/experimental/res/drawable-v24/ic_launcher_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
- - #1D74F5
- - #1D74F5
-
\ No newline at end of file
diff --git a/android/app/src/experimental/res/values/strings.xml b/android/app/src/experimental/res/values/strings.xml
deleted file mode 100644
index e8e7ca8c1..000000000
--- a/android/app/src/experimental/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
- Rocket.Chat Experimental
- Rocket.Chat Experimental
-
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b1305bfd6..06d53bb49 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
+ package="chat.rocket.android">
diff --git a/android/app/src/main/ic_launcher-web.png b/android/app/src/main/ic_launcher-web.png
index cc5e2e30b..ee9b88757 100644
Binary files a/android/app/src/main/ic_launcher-web.png and b/android/app/src/main/ic_launcher-web.png differ
diff --git a/android/app/src/official/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from android/app/src/official/res/drawable/ic_launcher_background.xml
rename to android/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/android/app/src/official/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from android/app/src/official/res/drawable/ic_launcher_foreground.xml
rename to android/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/android/app/src/experimental/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/app/src/experimental/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/app/src/experimental/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from android/app/src/experimental/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/app/src/official/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/official/res/mipmap-hdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/official/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from android/app/src/official/res/mipmap-hdpi/ic_launcher_round.png
rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/app/src/official/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/official/res/mipmap-mdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/official/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from android/app/src/official/res/mipmap-mdpi/ic_launcher_round.png
rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/app/src/official/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/official/res/mipmap-xhdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/official/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from android/app/src/official/res/mipmap-xhdpi/ic_launcher_round.png
rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/app/src/official/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/official/res/mipmap-xxhdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/official/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/app/src/official/res/mipmap-xxhdpi/ic_launcher_round.png
rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/app/src/official/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/official/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/official/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from android/app/src/official/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/app/src/official/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
similarity index 100%
rename from android/app/src/official/res/values/colors.xml
rename to android/app/src/main/res/values/colors.xml
diff --git a/android/app/src/official/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
similarity index 100%
rename from android/app/src/official/res/values/strings.xml
rename to android/app/src/main/res/values/strings.xml
diff --git a/android/app/src/official/AndroidManifest.xml b/android/app/src/official/AndroidManifest.xml
deleted file mode 100644
index 7b4341431..000000000
--- a/android/app/src/official/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/android/app/src/official/ic_launcher-web.png b/android/app/src/official/ic_launcher-web.png
deleted file mode 100644
index ee9b88757..000000000
Binary files a/android/app/src/official/ic_launcher-web.png and /dev/null differ
diff --git a/android/app/src/official/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/official/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index bbd3e0212..000000000
--- a/android/app/src/official/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/android/app/src/official/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/official/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index bbd3e0212..000000000
--- a/android/app/src/official/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/android/gradle.properties b/android/gradle.properties
index fb13c4cab..572d98f95 100644
--- a/android/gradle.properties
+++ b/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
diff --git a/package.json b/package.json
index 127dfd75a..3be26b292 100644
--- a/package.json
+++ b/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",