Fix appearance changed into wrong activity (#34)

the original `AppCompatDelegate.setDefaultNightMode()` is a global setup. when changing the night mode, it will actually call HomeActivity's `onConfigurationChanged`. this pr tries to set night mode to current activity by using the `setLocalNightMode()` (cherry picked from commit cf55a59)
expo · Jan 23, 2024 · 2d00e21 · 2d00e21
1 parent d4714e4
commit 2d00e21
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...ve/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.java b/...ve/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.java
@@ -84,12 +84,20 @@ private String colorSchemeForCurrentConfiguration(Context context) {
 
   @Override
   public void setColorScheme(String style) {
+    int nightMode = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
     if (style.equals("dark")) {
-      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+      nightMode = AppCompatDelegate.MODE_NIGHT_YES;
     } else if (style.equals("light")) {
-      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+      nightMode = AppCompatDelegate.MODE_NIGHT_NO;
     } else if (style.equals("unspecified")) {
-      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+      nightMode = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
+    }
+
+    Activity activity = getCurrentActivity();
+    if (activity instanceof AppCompatActivity) {
+      ((AppCompatActivity) activity).getDelegate().setLocalNightMode(nightMode);
+    } else {
+      AppCompatDelegate.setDefaultNightMode(nightMode);
     }
   }