Remove non edge-to-edge themes

zoontek · zoontek · commit d37333e701a4 · 2025-11-07T00:08:19.000+01:00
diff --git a/README.md b/README.md
@@ -182,7 +182,6 @@ _📌 The available plugins options are:_
 type PluginOptions = {
   assetsDir?: string; // optional, default is "assets/bootsplash"
   android?: {
-    parentTheme?: "TransparentStatus" | "EdgeToEdge"; // optional, default is `undefined` (`Theme.BootSplash`)
     darkContentBarsStyle?: boolean; // optional, default is `undefined`
   };
 };
@@ -413,24 +412,18 @@ const App = () => {
 
 ## FAQ
 
-### How can I have a transparent status bar, or [edge-to-edge layout](https://developer.android.com/develop/ui/views/layout/edge-to-edge)?
+### How can I enforce the splash screen system bar colors?
 
-Edit your `values/styles.xml` file to inherit from `Theme.BootSplash.TransparentStatus` / `Theme.BootSplash.EdgeToEdge` instead of `Theme.BootSplash`:
+By default, the system bars `dark-content` in light mode and `light-content` in dark mode. To enforce a specific value, edit your `values/styles.xml` file:
 
 ```xml
 <resources>
-
   <!-- … -->
 
-  <!-- make BootTheme inherit from Theme.BootSplash.TransparentStatus / Theme.BootSplash.EdgeToEdge -->
-  <style name="BootTheme" parent="Theme.BootSplash.EdgeToEdge">
-    <!-- … -->
-
-    <!-- optional, used to enforce the initial bars styles -->
-    <!-- default is true in light mode, false in dark mode -->
+  <style name="BootTheme" parent="Theme.BootSplash">
     <item name="darkContentBarsStyle">true</item>
+    <!-- … -->
   </style>
-
 </resources>
 ```
 
diff --git a/android/src/main/res/drawable-v23/compat_splash_screen.xml b/android/src/main/res/drawable-v23/compat_splash_screen.xml
diff --git a/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml b/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml
diff --git a/android/src/main/res/drawable/compat_splash_screen.xml b/android/src/main/res/drawable/compat_splash_screen.xml
@@ -4,11 +4,16 @@
         <color android:color="?attr/bootSplashBackground" />
     </item>
 
-    <item android:gravity="fill">
-        <bitmap android:src="?bootSplashLogo" android:gravity="center" />
-    </item>
+    <item
+        android:drawable="?bootSplashLogo"
+        android:gravity="center"
+        android:width="288dp"
+        android:height="288dp" />
 
-    <item android:gravity="fill" android:bottom="60dp">
-        <bitmap android:src="?bootSplashBrand" android:gravity="bottom|center_horizontal" />
-    </item>
+    <item
+        android:drawable="?bootSplashBrand"
+        android:gravity="bottom|center_horizontal"
+        android:width="200dp"
+        android:height="80dp"
+        android:bottom="60dp" />
 </layer-list>
diff --git a/android/src/main/res/drawable/compat_splash_screen_oneui_4.xml b/android/src/main/res/drawable/compat_splash_screen_oneui_4.xml
@@ -4,11 +4,18 @@
         <color android:color="?attr/bootSplashBackground" />
     </item>
 
-    <item android:gravity="fill">
-        <bitmap android:src="?bootSplashLogo" android:gravity="center" />
-    </item>
+    <!-- There's an issue with logo size on Samsung OneUI v4
+     We need to render it 2 times smaller (288 / 2 = 144) -->
+    <item
+        android:drawable="?bootSplashLogo"
+        android:gravity="center"
+        android:width="144dp"
+        android:height="144dp" />
 
-    <item android:gravity="fill" android:bottom="60dp">
-        <bitmap android:src="?bootSplashBrand" android:gravity="bottom|center_horizontal" />
-    </item>
+    <item
+        android:drawable="?bootSplashBrand"
+        android:gravity="bottom|center_horizontal"
+        android:width="200dp"
+        android:height="80dp"
+        android:bottom="60dp" />
 </layer-list>
diff --git a/android/src/main/res/values-night/styles.xml b/android/src/main/res/values-night/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.BootSplash.Base" parent="Theme.BootSplash.DayNight">
+    <style name="Theme.BootSplash.Attr" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="darkContentBarsStyle">false</item>
     </style>
 </resources>
diff --git a/android/src/main/res/values-v23/styles.xml b/android/src/main/res/values-v23/styles.xml
diff --git a/android/src/main/res/values-v27/colors.xml b/android/src/main/res/values-v27/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="navigationBarColor">@android:color/transparent</color>
+</resources>
diff --git a/android/src/main/res/values-v27/styles.xml b/android/src/main/res/values-v27/styles.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.BootSplash.EdgeToEdge" parent="Theme.BootSplash.EdgeToEdge.Common">
+    <style name="Theme.BootSplash.v27" parent="Theme.BootSplash.Base">
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">?darkContentBarsStyle</item>
-
-        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">?darkContentBarsStyle</item>
     </style>
 </resources>
diff --git a/android/src/main/res/values-v29/styles.xml b/android/src/main/res/values-v29/styles.xml
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.BootSplash.DayNight" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="Theme.BootSplash.v29" parent="Theme.BootSplash.v27">
         <item name="android:forceDarkAllowed">false</item>
-    </style>
-
-    <style name="Theme.BootSplash.EdgeToEdge" parent="Theme.BootSplash.EdgeToEdge.Common">
-        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-
         <item name="android:enforceStatusBarContrast">false</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">?darkContentBarsStyle</item>
-
         <item name="android:enforceNavigationBarContrast">false</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowLightNavigationBar">?darkContentBarsStyle</item>
     </style>
 </resources>
diff --git a/android/src/main/res/values-v30/styles.xml b/android/src/main/res/values-v30/styles.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.BootSplash.EdgeToEdge" parent="Theme.BootSplash.EdgeToEdge.Common">
+    <style name="Theme.BootSplash.v30" parent="Theme.BootSplash.v29">
         <item name="android:windowLayoutInDisplayCutoutMode">always</item>
-
-        <item name="android:enforceStatusBarContrast">false</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">?darkContentBarsStyle</item>
-
-        <item name="android:enforceNavigationBarContrast">false</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowLightNavigationBar">?darkContentBarsStyle</item>
     </style>
 </resources>
diff --git a/android/src/main/res/values-v31/styles.xml b/android/src/main/res/values-v31/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.BootSplash" parent="Theme.BootSplash.Common">
+    <style name="Theme.BootSplash" parent="Theme.BootSplash.v30">
         <item name="android:windowSplashScreenBackground">?bootSplashBackground</item>
         <item name="android:windowSplashScreenAnimatedIcon">?bootSplashLogo</item>
         <item name="android:windowSplashScreenBrandingImage">?bootSplashBrand</item>
diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml
@@ -2,7 +2,5 @@
 <resources>
     <!-- https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/res/remote_color_resources_res/values/colors.xml;l=67 -->
     <!-- https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/res/res/color/system_bar_background_semi_transparent.xml -->
-    <color name="systemBarDarkScrim">#801b1b1b</color>
-    <!-- https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/com/android/internal/policy/DecorView.java;l=142 -->
-    <color name="systemBarLightScrim">#e6ffffff</color>
+    <color name="navigationBarColor">#801b1b1b</color>
 </resources>
diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
@@ -10,35 +10,29 @@
         <item name="android:windowExitAnimation">@anim/bootsplash_fade_out</item>
     </style>
 
-    <style name="Theme.BootSplash.DayNight" parent="Theme.AppCompat.DayNight.NoActionBar">
-    </style>
-
-    <style name="Theme.BootSplash.Base" parent="Theme.BootSplash.DayNight">
+    <style name="Theme.BootSplash.Attr" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="darkContentBarsStyle">true</item>
     </style>
 
-    <style name="Theme.BootSplash.Common" parent="Theme.BootSplash.Base">
+    <style name="Theme.BootSplash.Base" parent="Theme.BootSplash.Attr">
         <item name="android:opacity">opaque</item>
         <item name="android:windowBackground">@drawable/compat_splash_screen</item>
         <item name="bootSplashBrand">@drawable/transparent_pixel</item>
+
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:fitsSystemWindows">false</item>
+        <item name="android:navigationBarColor">@color/navigationBarColor</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">?darkContentBarsStyle</item>
     </style>
 
-    <style name="Theme.BootSplash" parent="Theme.BootSplash.Common">
+    <style name="Theme.BootSplash.v27" parent="Theme.BootSplash.Base" />
+    <style name="Theme.BootSplash.v29" parent="Theme.BootSplash.v27" />
+    <style name="Theme.BootSplash.v30" parent="Theme.BootSplash.v29" />
+
+    <style name="Theme.BootSplash" parent="Theme.BootSplash.v30">
         <item name="bootSplashBackground">?android:colorBackground</item>
         <item name="bootSplashLogo">@android:drawable/sym_def_app_icon</item>
         <item name="postBootSplashTheme">?android:attr/theme</item>
     </style>
-
-    <style name="Theme.BootSplash.TransparentStatus" parent="Theme.BootSplash">
-    </style>
-
-    <style name="Theme.BootSplash.EdgeToEdge.Common" parent="Theme.BootSplash">
-        <item name="android:fitsSystemWindows">false</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-    </style>
-
-    <style name="Theme.BootSplash.EdgeToEdge" parent="Theme.BootSplash.EdgeToEdge.Common">
-        <item name="android:statusBarColor">@color/systemBarDarkScrim</item>
-        <item name="android:navigationBarColor">@color/systemBarDarkScrim</item>
-    </style>
 </resources>
diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml
@@ -5,7 +5,7 @@
         <item name="enforceNavigationBarContrast">false</item>
     </style>
 
-    <style name="BootTheme" parent="Theme.BootSplash.EdgeToEdge">
+    <style name="BootTheme" parent="Theme.BootSplash">
         <!-- enforce status bar style as the example app doesn't support dark mode -->
         <item name="darkContentBarsStyle">true</item>
 
diff --git a/src/expo.ts b/src/expo.ts
@@ -11,7 +11,6 @@ import { cleanIOSAssets, getExpoConfig, hfs, log } from "./generate";
 type Props = {
   assetsDir?: string;
   android?: {
-    parentTheme?: "TransparentStatus" | "EdgeToEdge";
     darkContentBarsStyle?: boolean;
   };
 };
@@ -125,7 +124,7 @@ const withMainActivity: Expo.ConfigPlugin<Props> = (config) =>
 const withAndroidStyles: Expo.ConfigPlugin<Props> = (config, props) =>
   Expo.withAndroidStyles(config, async (config) => {
     const { assetsDir = "assets/bootsplash", android = {} } = props;
-    const { parentTheme, darkContentBarsStyle } = android;
+    const { darkContentBarsStyle } = android;
 
     const { modRequest, modResults } = config;
     const { resources } = modResults;
@@ -168,12 +167,7 @@ const withAndroidStyles: Expo.ConfigPlugin<Props> = (config, props) =>
       {
         $: {
           name: "BootTheme",
-          parent:
-            parentTheme === "TransparentStatus"
-              ? "Theme.BootSplash.TransparentStatus"
-              : parentTheme === "EdgeToEdge"
-                ? "Theme.BootSplash.EdgeToEdge"
-                : "Theme.BootSplash",
+          parent: "Theme.BootSplash",
         },
         item,
       },
