diff --git a/android/app/src/main/java/com/myapp/MainActivity.java b/android/app/src/main/java/com/myapp/MainActivity.java index 557797a..2ccae2e 100644 --- a/android/app/src/main/java/com/myapp/MainActivity.java +++ b/android/app/src/main/java/com/myapp/MainActivity.java @@ -1,4 +1,5 @@ package com.myapp; +import expo.modules.ReactActivityDelegateWrapper; import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivityDelegate; @@ -21,7 +22,7 @@ public class MainActivity extends ReactActivity { */ @Override protected ReactActivityDelegate createReactActivityDelegate() { - return new MainActivityDelegate(this, getMainComponentName()); + return new ReactActivityDelegateWrapper(this, new MainActivityDelegate(this, getMainComponentName())); } public static class MainActivityDelegate extends ReactActivityDelegate { diff --git a/android/app/src/main/java/com/myapp/MainApplication.java b/android/app/src/main/java/com/myapp/MainApplication.java index fd8ec88..73cbea8 100644 --- a/android/app/src/main/java/com/myapp/MainApplication.java +++ b/android/app/src/main/java/com/myapp/MainApplication.java @@ -1,4 +1,7 @@ package com.myapp; +import android.content.res.Configuration; +import expo.modules.ApplicationLifecycleDispatcher; +import expo.modules.ReactNativeHostWrapper; import android.app.Application; import android.content.Context; @@ -16,7 +19,7 @@ import java.util.List; public class MainApplication extends Application implements ReactApplication { private final ReactNativeHost mReactNativeHost = - new ReactNativeHost(this) { + new ReactNativeHostWrapper(this, new ReactNativeHost(this) { @Override public boolean getUseDeveloperSupport() { return BuildConfig.DEBUG; @@ -35,10 +38,10 @@ public class MainApplication extends Application implements ReactApplication { protected String getJSMainModuleName() { return "index"; } - }; + }); private final ReactNativeHost mNewArchitectureNativeHost = - new MainApplicationReactNativeHost(this); + new ReactNativeHostWrapper(this, new MainApplicationReactNativeHost(this)); @Override public ReactNativeHost getReactNativeHost() { @@ -56,6 +59,7 @@ public class MainApplication extends Application implements ReactApplication { ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; SoLoader.init(this, /* native exopackage */ false); initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); + ApplicationLifecycleDispatcher.onApplicationCreate(this); } /** @@ -88,4 +92,10 @@ public class MainApplication extends Application implements ReactApplication { } } } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig); + } } diff --git a/android/settings.gradle b/android/settings.gradle index 47725a0..e787ab1 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -7,3 +7,6 @@ if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") include(":ReactAndroid") project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid') } + +apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle") +useExpoModules()