From b7a557cac759bd7fbb930ae931a00b1a7aa9d3aa Mon Sep 17 00:00:00 2001 From: diegolmello Date: Fri, 2 Aug 2019 10:25:34 -0300 Subject: [PATCH] Fix android build --- android/app/build.gradle | 26 ------------------- .../chat/rocket/reactnative/MainActivity.java | 25 +++++++++--------- android/settings.gradle | 2 +- 3 files changed, 14 insertions(+), 39 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index dbc9c6fb2..971d50c44 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -201,32 +201,6 @@ android { } dependencies { - // addUnimodulesDependencies() - // implementation "org.webkit:android-jsc:r241213" - // implementation project(':react-native-action-sheet') - // implementation(project(":react-native-device-info"), { - // exclude group: "com.google.android.gms" - // }) - // implementation project(":reactnativekeyboardinput") - // implementation project(':realm') - // implementation project(':reactnativenotifications') - // implementation fileTree(dir: "libs", include: ["*.jar"]) - // implementation "com.android.support:appcompat-v7:${ rootProject.ext.supportLibVersion }" - // implementation "com.android.support:support-v4:${ rootProject.ext.supportLibVersion }" - // implementation "com.android.support:customtabs:${ rootProject.ext.supportLibVersion }" - // implementation "com.android.support:design:${ rootProject.ext.supportLibVersion }" - // implementation "com.facebook.react:react-native:+" // From node_modules - // implementation 'com.facebook.fresco:fresco:1.10.0' - // implementation 'com.facebook.fresco:animated-gif:1.10.0' - // implementation 'com.facebook.fresco:animated-webp:1.10.0' - // implementation 'com.facebook.fresco:webpsupport:1.10.0' - // implementation "com.google.android.gms:play-services-base:16.1.0" - // implementation "com.google.firebase:firebase-messaging:18.0.0" - // implementation "com.google.firebase:firebase-core:16.0.9" - // implementation "com.google.firebase:firebase-perf:16.2.5" - // implementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') { - // transitive = true - // } addUnimodulesDependencies() implementation project(':reactnativenotifications') implementation project(':react-native-firebase') diff --git a/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java b/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java index f71ade0c1..e4a8c2276 100644 --- a/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java +++ b/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java @@ -11,11 +11,11 @@ import android.content.res.Configuration; public class MainActivity extends ReactFragmentActivity { - // @Override - // protected void onCreate(Bundle savedInstanceState) { - // SplashScreen.show(this); - // super.onCreate(null); - // } + @Override + protected void onCreate(Bundle savedInstanceState) { + SplashScreen.show(this); + super.onCreate(null); + } /** * Returns the name of the main component registered from JavaScript. @@ -36,12 +36,13 @@ public class MainActivity extends ReactFragmentActivity { }; } - // @Override - // public void onConfigurationChanged(Configuration newConfig) { - // super.onConfigurationChanged(newConfig); - // Intent intent = new Intent("onConfigurationChanged"); - // intent.putExtra("newConfig", newConfig); - // this.sendBroadcast(intent); - // } + // from react-native-orientation + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + Intent intent = new Intent("onConfigurationChanged"); + intent.putExtra("newConfig", newConfig); + this.sendBroadcast(intent); + } } diff --git a/android/settings.gradle b/android/settings.gradle index e39e8af76..7ca955987 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,7 +1,7 @@ apply from: '../node_modules/react-native-unimodules/gradle.groovy' includeUnimodulesProjects() -rootProject.name = 'EmptyRN' +rootProject.name = 'RocketChatRN' include ':reactnativenotifications' project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android') include ':react-native-firebase'