diff --git a/android/app/build.gradle b/android/app/build.gradle index 97da1b2f7..4efdf989b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -144,13 +144,22 @@ android { } signingConfigs { - release { + playRelease { storeFile project.rootProject.file('chat-rocket-android.jks').getCanonicalFile() storePassword System.getenv("CHAT_ROCKET_ANDROID_STORE_PASSWORD") keyAlias System.getenv("CHAT_ROCKET_ANDROID_KEY_ALIAS") keyPassword System.getenv("CHAT_ROCKET_ANDROID_KEY_PASSWORD") } + playExperimentalRelease { + if (project.hasProperty('KEYSTORE')) { + storeFile file(KEYSTORE) + storePassword KEYSTORE_PASSWORD + keyAlias KEY_ALIAS + keyPassword KEY_PASSWORD + } + } + debug { storeFile project.rootProject.file('debug.keystore').getCanonicalFile() storePassword "android" @@ -159,14 +168,6 @@ android { } } - buildTypes { - release { - minifyEnabled enableProguardInReleaseBuilds - setProguardFiles([getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro']) - signingConfig signingConfigs.release - } - } - flavorDimensions "store" productFlavors { @@ -180,6 +181,17 @@ android { } } + buildTypes { + release { + productFlavors.play.signingConfig signingConfigs.playRelease + productFlavors.playExperimental.signingConfig signingConfigs.playExperimentalRelease + + minifyEnabled enableProguardInReleaseBuilds + setProguardFiles([getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro']) + + } + } + splits { abi { reset() diff --git a/android/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/android/app/src/debug/res/mipmap-hdpi/ic_launcher.png deleted file mode 100755 index ea0f58ac0..000000000 Binary files a/android/app/src/debug/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/android/app/src/debug/res/mipmap-mdpi/ic_launcher.png deleted file mode 100755 index f98ca51c4..000000000 Binary files a/android/app/src/debug/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100755 index 9706b70d2..000000000 Binary files a/android/app/src/debug/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100755 index 1ee4de388..000000000 Binary files a/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100755 index 555c58844..000000000 Binary files a/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/debug/res/values/strings.xml b/android/app/src/debug/res/values/strings.xml index a75a0afae..a059145c6 100644 --- a/android/app/src/debug/res/values/strings.xml +++ b/android/app/src/debug/res/values/strings.xml @@ -1,4 +1,4 @@ Rocket.Chat - Development - No Browser Found + Rocket.Chat - Development diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000..49595d0b1 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/drawable/launch_screen_bitmap.xml b/android/app/src/main/res/drawable/launch_screen_bitmap.xml index de474fb1f..d3ae7a3a8 100644 --- a/android/app/src/main/res/drawable/launch_screen_bitmap.xml +++ b/android/app/src/main/res/drawable/launch_screen_bitmap.xml @@ -1,5 +1,5 @@ - + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..85a4fa4fe --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100755 new mode 100644 index 427ab384b..ba480e9b5 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..aa8318239 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_notification.png b/android/app/src/main/res/mipmap-ldpi/ic_notification.png deleted file mode 100644 index 6dfec747b..000000000 Binary files a/android/app/src/main/res/mipmap-ldpi/ic_notification.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png old mode 100755 new mode 100644 index 874d548a6..8d074e644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..9e8e33d32 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png old mode 100755 new mode 100644 index 459fa34d0..b5386e6f0 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..6a3f40db6 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png old mode 100755 new mode 100644 index 91be92cc1..95a2e49ef Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..3f4511f52 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png old mode 100755 new mode 100644 index e0cfa5e34..513f59b2c Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..cc631c10b Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index effdcbed1..9e7e1b8f4 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -1,6 +1,9 @@ #660B0B0B - #FFFFFF + @color/white #CC3333 + + + #FFFFFFFF \ No newline at end of file diff --git a/android/app/src/playExperimental/google-services.json b/android/app/src/playExperimental/google-services.json new file mode 100644 index 000000000..4b3f409be --- /dev/null +++ b/android/app/src/playExperimental/google-services.json @@ -0,0 +1,40 @@ +{ + "project_info": { + "project_number": "115198584049", + "firebase_url": "https://rocketchat-reactnative-test.firebaseio.com", + "project_id": "rocketchat-reactnative-test", + "storage_bucket": "rocketchat-reactnative-test.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:115198584049:android:8be27b1f7c42a2ed", + "android_client_info": { + "package_name": "chat.rocket.reactnative" + } + }, + "oauth_client": [ + { + "client_id": "115198584049-ack609b1338b827fta26s9rd2ab1aad5.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyAWwowhAfACHBw3YxmDOXY3QyakgjhJLqc" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "115198584049-ack609b1338b827fta26s9rd2ab1aad5.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/android/app/src/playExperimental/res/mipmap-hdpi/ic_launcher.png b/android/app/src/playExperimental/res/mipmap-hdpi/ic_launcher.png new file mode 100755 index 000000000..427ab384b Binary files /dev/null and b/android/app/src/playExperimental/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/playExperimental/res/mipmap-ldpi/ic_launcher.png similarity index 100% rename from android/app/src/main/res/mipmap-ldpi/ic_launcher.png rename to android/app/src/playExperimental/res/mipmap-ldpi/ic_launcher.png diff --git a/android/app/src/playExperimental/res/mipmap-mdpi/ic_launcher.png b/android/app/src/playExperimental/res/mipmap-mdpi/ic_launcher.png new file mode 100755 index 000000000..874d548a6 Binary files /dev/null and b/android/app/src/playExperimental/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/playExperimental/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/playExperimental/res/mipmap-xhdpi/ic_launcher.png new file mode 100755 index 000000000..459fa34d0 Binary files /dev/null and b/android/app/src/playExperimental/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/playExperimental/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/playExperimental/res/mipmap-xxhdpi/ic_launcher.png new file mode 100755 index 000000000..91be92cc1 Binary files /dev/null and b/android/app/src/playExperimental/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/playExperimental/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/playExperimental/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100755 index 000000000..e0cfa5e34 Binary files /dev/null and b/android/app/src/playExperimental/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/playExperimental/res/values/strings.xml b/android/app/src/playExperimental/res/values/strings.xml new file mode 100644 index 000000000..e8e7ca8c1 --- /dev/null +++ b/android/app/src/playExperimental/res/values/strings.xml @@ -0,0 +1,4 @@ + + Rocket.Chat Experimental + Rocket.Chat Experimental +