Handle activity theme

Author: zoontek

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateEntryPointTask.kt

@@ -97,7 +97,9 @@ abstract class GenerateEntryPointTask : DefaultTask() {
               DefaultNewArchitectureEntryPoint.load();
             }
             
-            WindowUtilKt.initEdgeToEdge(context, {{packageName}}.BuildConfig.IS_EDGE_TO_EDGE_ENABLED);
+            if ({{packageName}}.BuildConfig.IS_EDGE_TO_EDGE_ENABLED) {
+              WindowUtilKt.setEdgeToEdgeFeatureFlagOn();
+            }
           }
         }
         """

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateEntryPointTaskTest.kt

@@ -80,7 +80,9 @@ class GenerateEntryPointTaskTest {
                   DefaultNewArchitectureEntryPoint.load();
                 }
                 
-                WindowUtilKt.initEdgeToEdge(context, com.facebook.react.BuildConfig.IS_EDGE_TO_EDGE_ENABLED);
+                if (com.facebook.react.BuildConfig.IS_EDGE_TO_EDGE_ENABLED) {
+                  WindowUtilKt.setEdgeToEdgeFeatureFlagOn();
+                }
               }
             }
             """

packages/react-native/ReactAndroid/api/ReactAndroid.api

@@ -6545,7 +6545,6 @@ public final class com/facebook/react/views/view/ReactViewManager$Companion {
 public final class com/facebook/react/views/view/WindowUtilKt {
 	public static final fun isEdgeToEdgeFeatureFlagOn ()Z
 	public static final fun setEdgeToEdgeFeatureFlagOn ()V
-	public static final fun initEdgeToEdge (Landroid/content/Context;Z)V
 }
 
 public final class com/facebook/react/views/virtual/VirtualViewMode : java/lang/Enum {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java

@@ -138,9 +138,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
           if (mActivity != null) {
             Window window = mActivity.getWindow();
             if (window != null) {
-              if (WindowUtilKt.isDeviceRunningEdgeToEdge()) {
-                WindowUtilKt.enableEdgeToEdge(window);
-              }
+              WindowUtilKt.initEdgeToEdge(mActivity);
               if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isWideColorGamutEnabled()) {
                 window.setColorMode(ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT);
               }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/WindowUtil.kt

@@ -7,7 +7,7 @@
 
 package com.facebook.react.views.view
 
-import android.content.Context
+import android.app.Activity
 import android.graphics.Color
 import android.os.Build
 import android.view.Window
@@ -48,18 +48,14 @@ public fun setEdgeToEdgeFeatureFlagOn() {
   isEdgeToEdgeFeatureFlagOn = true
 }
 
-public fun initEdgeToEdge(context: Context, flag: Boolean) {
-  if (flag) {
-    setEdgeToEdgeFeatureFlagOn()
-  }
-
+internal fun initEdgeToEdge(activity: Activity) {
   isDeviceRunningEdgeToEdge =
       when {
-        !AndroidVersion.isAtLeastTargetSdk35(context) -> flag
+        !AndroidVersion.isAtLeastTargetSdk35(activity) -> isEdgeToEdgeFeatureFlagOn
         Build.VERSION.SDK_INT >= AndroidVersion.VERSION_CODE_BAKLAVA -> true
         else -> {
           val attributes = intArrayOf(AndroidVersion.ATTR_WINDOW_OPT_OUT_EDGE_TO_EDGE_ENFORCEMENT)
-          val typedArray = context.theme.obtainStyledAttributes(attributes)
+          val typedArray = activity.theme.obtainStyledAttributes(attributes)
 
           try {
             !typedArray.getBoolean(0, false)
@@ -68,6 +64,10 @@ public fun initEdgeToEdge(context: Context, flag: Boolean) {
           }
         }
       }
+
+  if (isDeviceRunningEdgeToEdge) {
+    activity.window.enableEdgeToEdge()
+  }
 }
 
 @Suppress("DEPRECATION")