expo-splash-screen2 1.3.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-splash-screen2",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Enhance the development experience on the basis of expo-splash-screen  with web and .9",
   "main": "build",
   "types": "build",
@@ -17,6 +17,7 @@
     "expo-module.config.json",
     "scripts",
     "expo-splash-web",
+    "!tests",
     "!**/__tests__",
     "!**/__fixtures__",
     "!**/__mocks__",
@@ -71,6 +72,7 @@
     "@types/xml2js": "^0.4.14",
     "expo-module-scripts": "^3.0.0",
     "expo-modules-core": "*",
+    "js-yaml": "^4.1.1",
     "standard-version": "^9.5.0",
     "typescript": "^5.0.0"
   },

package/plugin/build/index.js

@@ -84,6 +84,7 @@ function executeBuildSplashWeb(projectRoot) {
 async function bundleSplashWeb(projectRoot) {
     const sourceDir = 'expo-splash-web';
     const dir = path.join(projectRoot, sourceDir);
+    console.log('[expo-splash-screen8] bundleSplashWeb dir:', dir);
     if (!fs.existsSync(dir)) {
         throw new Error(`[expo-splash-screen2] Directory "${sourceDir}" not found in project root. Please create the "${sourceDir}" directory with your HTML, CSS, and JavaScript files.`);
     }
@@ -661,17 +662,23 @@ function copyHtmlFile(projectRoot, androidMainPath, localHtmlPath) {
         console.error(`[expo-splash-screen2] Error copying HTML file: ${error}`);
     }
 }
-function generateCustomSplashActivity(packageName, projectRoot, androidMainPath, backgroundColor) {
+function generateCustomSplashActivity(packageName, projectRoot, androidMainPath, backgroundColor, edgeToEdgeEnabled) {
+    console.log(`[expo-splash-screen5]  666:`, edgeToEdgeEnabled);
     const javaDir = path.join(androidMainPath, 'java', ...packageName.split('.'));
     if (!fs.existsSync(javaDir)) {
         fs.mkdirSync(javaDir, { recursive: true });
     }
     const activityPath = path.join(javaDir, `SplashScreen2Activity.kt`);
-    const activityContent = (0, android_1.replaceTemplatePlaceholders)(android_1.ANDROID_TEMPLATES.customSplashActivity, {
+    let activityContent = (0, android_1.replaceTemplatePlaceholders)(android_1.ANDROID_TEMPLATES.customSplashActivity, {
         packageName,
         activityName: CUSTOM_SPLASH_ACTIVITY_NAME,
         backgroundColor,
     });
+    console.error(`[expo-splash-screen3]  8888:`, edgeToEdgeEnabled);
+    if (edgeToEdgeEnabled === true) {
+        activityContent = activityContent.replace(/import androidx\.core\.view\.WindowCompat\s*\n/, '');
+        activityContent = activityContent.replace(/\s*\/\/\s*Let content extend below status bar and navigation bar instead of hiding them\s*\n\s*WindowCompat\.setDecorFitsSystemWindows\(window,\s*false\)\s*\n/, '');
+    }
     try {
         fs.writeFileSync(activityPath, activityContent);
     }
@@ -680,17 +687,21 @@ function generateCustomSplashActivity(packageName, projectRoot, androidMainPath,
         throw error;
     }
 }
-function generateCustomSplashActivityForBlendMode(packageName, projectRoot, androidMainPath, imageResourceName) {
+function generateCustomSplashActivityForBlendMode(packageName, projectRoot, androidMainPath, imageResourceName, edgeToEdgeEnabled) {
     const javaDir = path.join(androidMainPath, 'java', ...packageName.split('.'));
     if (!fs.existsSync(javaDir)) {
         fs.mkdirSync(javaDir, { recursive: true });
     }
     const activityPath = path.join(javaDir, `SplashScreen2Activity.kt`);
-    const activityContent = (0, android_1.replaceTemplatePlaceholders)(android_1.ANDROID_TEMPLATES.customSplashActivity, {
+    let activityContent = (0, android_1.replaceTemplatePlaceholders)(android_1.ANDROID_TEMPLATES.customSplashActivity, {
         packageName,
         activityName: CUSTOM_SPLASH_ACTIVITY_NAME,
         backgroundColor: '#ffffff',
     });
+    if (edgeToEdgeEnabled === true) {
+        activityContent = activityContent.replace(/import androidx\.core\.view\.WindowCompat\s*\n/, '');
+        activityContent = activityContent.replace(/\s*\/\/\s*Let content extend below status bar and navigation bar instead of hiding them\s*\n\s*WindowCompat\.setDecorFitsSystemWindows\(window,\s*false\)\s*\n/, '');
+    }
     try {
         fs.writeFileSync(activityPath, activityContent);
     }
@@ -1248,7 +1259,7 @@ function modifyMainActivityForNormalMode(content, packageName, backgroundColor,
             modifiedContent.substring(lastBraceIndex));
     }
 }
-function modifyMainActivity(content, packageName, backgroundColor) {
+function modifyMainActivity(content, packageName, backgroundColor, edgeToEdgeEnabled) {
     const classMatch = content.match(/class\s+MainActivity\s*[^:]*:/);
     if (!classMatch) {
         console.warn('[expo-splash-screen2] MainActivity class not found');
@@ -1256,6 +1267,7 @@ function modifyMainActivity(content, packageName, backgroundColor) {
     }
     const hasWebViewCode = content.includes('setupWebViewContainer') || content.includes('webViewContainer');
     const hasCompanionObject = content.includes('companion object') && content.includes('actionStart');
+    const needsWindowCompat = edgeToEdgeEnabled !== true;
     let hasImports = content.includes('import android.os.Build') &&
         content.includes('import android.os.Handler') &&
         content.includes('import android.os.Looper') &&
@@ -1263,8 +1275,11 @@ function modifyMainActivity(content, packageName, backgroundColor) {
         content.includes('import android.view.ViewGroup') &&
         content.includes('import android.webkit.WebView') &&
         content.includes('import android.webkit.WebViewClient') &&
-        content.includes('import androidx.core.view.WindowCompat');
+        (!needsWindowCompat || content.includes('import androidx.core.view.WindowCompat'));
     let modifiedContent = content;
+    if (edgeToEdgeEnabled === true && content.includes('import androidx.core.view.WindowCompat')) {
+        modifiedContent = modifiedContent.replace(/import androidx\.core\.view\.WindowCompat\s*\n/, '');
+    }
     if (!hasImports) {
         const importsToAddList = [
             'import android.os.Build',
@@ -1274,9 +1289,11 @@ function modifyMainActivity(content, packageName, backgroundColor) {
             'import android.view.ViewGroup',
             'import android.webkit.WebView',
             'import android.webkit.WebViewClient',
-            'import androidx.core.view.WindowCompat'
         ];
-        const missingImports = importsToAddList.filter(imp => !content.includes(imp));
+        if (needsWindowCompat) {
+            importsToAddList.push('import androidx.core.view.WindowCompat');
+        }
+        const missingImports = importsToAddList.filter(imp => !modifiedContent.includes(imp));
         if (missingImports.length > 0) {
             const lastImportIndex = modifiedContent.lastIndexOf('import ');
             if (lastImportIndex !== -1) {
@@ -1319,7 +1336,10 @@ function modifyMainActivity(content, packageName, backgroundColor) {
         const hasSetupWebViewContainer = onCreateContent.includes('setupWebViewContainer');
         const hasHandlerPost = onCreateContent.includes('Handler(Looper.getMainLooper()).post');
         const codeBlockExists = hasWindowCompat && hasSetupWebViewContainer && hasHandlerPost;
-        if (codeBlockExists) {
+        if (edgeToEdgeEnabled === true && hasWindowCompat) {
+            cleanedOnCreateContent = cleanedOnCreateContent.replace(/\s*\/\/\s*Let content extend below status bar and navigation bar\s*\n\s*WindowCompat\.setDecorFitsSystemWindows\(window,\s*false\)\s*\n\s*/, '');
+        }
+        else if (codeBlockExists && edgeToEdgeEnabled !== true) {
             const lines = onCreateContent.split('\n');
             const filteredLines = [];
             let inCodeBlock = false;
@@ -1351,6 +1371,26 @@ function modifyMainActivity(content, packageName, backgroundColor) {
                 filteredLines.push(line);
             }
             cleanedOnCreateContent = filteredLines.join('\n');
+            const superOnCreateIndex = cleanedOnCreateContent.indexOf('super.onCreate');
+            if (superOnCreateIndex !== -1) {
+                let superOnCreateEndIndex = cleanedOnCreateContent.indexOf('\n', superOnCreateIndex);
+                if (superOnCreateEndIndex === -1) {
+                    superOnCreateEndIndex = cleanedOnCreateContent.length;
+                }
+                else {
+                    superOnCreateEndIndex = superOnCreateEndIndex + 1;
+                }
+                const windowSettingsCode = `
+    WindowCompat.setDecorFitsSystemWindows(window, false)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      window.isNavigationBarContrastEnforced = false
+    }
+    window.statusBarColor = android.graphics.Color.TRANSPARENT
+    window.navigationBarColor = android.graphics.Color.TRANSPARENT`;
+                cleanedOnCreateContent = cleanedOnCreateContent.substring(0, superOnCreateEndIndex) +
+                    windowSettingsCode + '\n' +
+                    cleanedOnCreateContent.substring(superOnCreateEndIndex);
+            }
         }
         const setThemeRegex = /(\s*\/\/\s*[^\n]*\n)*\s*setTheme\s*\(\s*R\.style\.AppTheme\s*\)\s*;?\s*\n?/g;
         cleanedOnCreateContent = cleanedOnCreateContent.replace(setThemeRegex, '');
@@ -1383,16 +1423,40 @@ function modifyMainActivity(content, packageName, backgroundColor) {
         const hasSetupWebViewContainer = onCreateContent.includes('setupWebViewContainer');
         const hasHandlerPost = onCreateContent.includes('Handler(Looper.getMainLooper()).post');
         const codeBlockExists = hasWindowCompat && hasSetupWebViewContainer && hasHandlerPost;
-        if (!codeBlockExists) {
-            const superOnCreateIndex = onCreateContent.indexOf('super.onCreate');
+        const hasOnlyWindowSettings = hasWindowCompat && !hasSetupWebViewContainer && !hasHandlerPost;
+        const needsWindowCompat = edgeToEdgeEnabled !== true;
+        const shouldAddCode = !codeBlockExists && !hasOnlyWindowSettings && (needsWindowCompat && !hasWindowCompat || (!hasSetupWebViewContainer || !hasHandlerPost));
+        if (shouldAddCode) {
+            let cleanedOnCreateForAdd = onCreateContent;
+            const hasExistingWindowColors = cleanedOnCreateForAdd.includes('window.statusBarColor') || cleanedOnCreateForAdd.includes('window.navigationBarColor');
+            const hasExistingWindowCompat = cleanedOnCreateForAdd.includes('WindowCompat.setDecorFitsSystemWindows');
+            if (hasExistingWindowColors) {
+                cleanedOnCreateForAdd = cleanedOnCreateForAdd.replace(/\s*if\s*\(Build\.VERSION\.SDK_INT\s*>=\s*Build\.VERSION_CODES\.Q\)\s*\{\s*\n\s*window\.isNavigationBarContrastEnforced\s*=\s*false\s*\n\s*\}\s*\n?/g, '');
+                cleanedOnCreateForAdd = cleanedOnCreateForAdd.replace(/\s*window\.statusBarColor\s*=\s*android\.graphics\.Color\.TRANSPARENT\s*\n?/g, '');
+                cleanedOnCreateForAdd = cleanedOnCreateForAdd.replace(/\s*window\.navigationBarColor\s*=\s*android\.graphics\.Color\.TRANSPARENT\s*\n?/g, '');
+            }
+            if (hasExistingWindowCompat) {
+                cleanedOnCreateForAdd = cleanedOnCreateForAdd.replace(/\s*\/\/\s*Let content extend below status bar and navigation bar\s*\n\s*WindowCompat\.setDecorFitsSystemWindows\(window,\s*false\)\s*\n\s*/, '');
+            }
+            const superOnCreateIndex = cleanedOnCreateForAdd.indexOf('super.onCreate');
             if (superOnCreateIndex !== -1) {
-                const superOnCreateEndIndex = onCreateContent.indexOf('\n', superOnCreateIndex);
-                if (superOnCreateEndIndex !== -1) {
-                    const setupCall = android_1.ANDROID_TEMPLATES.mainActivityOnCreateCode;
-                    modifiedContent = modifiedContent.substring(0, onCreateIndex + superOnCreateEndIndex + 1) +
-                        setupCall + '\n' +
-                        modifiedContent.substring(onCreateIndex + superOnCreateEndIndex + 1);
+                let superOnCreateEndIndex = cleanedOnCreateForAdd.indexOf('\n', superOnCreateIndex);
+                if (superOnCreateEndIndex === -1) {
+                    superOnCreateEndIndex = cleanedOnCreateForAdd.length;
                 }
+                else {
+                    superOnCreateEndIndex = superOnCreateEndIndex + 1;
+                }
+                let setupCall = android_1.ANDROID_TEMPLATES.mainActivityOnCreateCode;
+                if (edgeToEdgeEnabled === true) {
+                    setupCall = setupCall.replace(/\s*\/\/\s*Let content extend below status bar and navigation bar\s*\n\s*WindowCompat\.setDecorFitsSystemWindows\(window,\s*false\)\s*\n\s*/, '');
+                }
+                const newOnCreateContent = cleanedOnCreateForAdd.substring(0, superOnCreateEndIndex) +
+                    setupCall + '\n' +
+                    cleanedOnCreateForAdd.substring(superOnCreateEndIndex);
+                modifiedContent = modifiedContent.substring(0, onCreateIndex) +
+                    newOnCreateContent +
+                    modifiedContent.substring(onCreateEndIndex);
             }
         }
     }
@@ -1490,12 +1554,12 @@ function modifyMainActivity(content, packageName, backgroundColor) {
     }
     return modifiedContent;
 }
-function modifyMainActivityForBlendMode(content, packageName, imageResourceName) {
+function modifyMainActivityForBlendMode(content, packageName, imageResourceName, edgeToEdgeEnabled) {
     if (content.includes('splashImageViewContainer') && content.includes('setupSplashImageView') &&
         content.includes('onContentChanged') && content.includes('setupWebViewContainer')) {
         return content;
     }
-    let modifiedContent = modifyMainActivity(content, packageName, '#ffffff');
+    let modifiedContent = modifyMainActivity(content, packageName, '#ffffff', edgeToEdgeEnabled);
     const fitsSystemWindowsPattern = /(\s*\/\/\s*Ensure container is not affected by system window insets[^\n]*\n\s*fitsSystemWindows\s*=\s*false\s*)(\s*\/\/\s*Set \.9 patch image as container background[\s\S]*?android\.util\.Log\.e\("MainActivity", "Error setting background drawable", e\)[\s\S]*?\}\s*)(\n\s*\})/;
     if (fitsSystemWindowsPattern.test(modifiedContent)) {
         modifiedContent = modifiedContent.replace(fitsSystemWindowsPattern, '$1$3');
@@ -1521,8 +1585,73 @@ function modifyMainActivityForBlendMode(content, packageName, imageResourceName)
         }
         const onCreateContent = modifiedContent.substring(onCreateIndex, onCreateEndIndex);
         let cleanedOnCreateContent = onCreateContent;
-        const setupWebViewRegex = /(\s*\/\/\s*[^\n]*\n)*\s*(WindowCompat\.setDecorFitsSystemWindows|setupWebViewContainer|Handler\s*\(\s*Looper\.getMainLooper\(\)\s*\)\.post)[\s\S]*?\}\s*/g;
-        cleanedOnCreateContent = cleanedOnCreateContent.replace(setupWebViewRegex, '');
+        const hasWindowCompat = onCreateContent.includes('WindowCompat.setDecorFitsSystemWindows');
+        const hasSetupWebViewContainer = onCreateContent.includes('setupWebViewContainer');
+        const hasHandlerPost = onCreateContent.includes('Handler(Looper.getMainLooper()).post');
+        if (hasSetupWebViewContainer || hasHandlerPost) {
+            const lines = onCreateContent.split('\n');
+            const filteredLines = [];
+            let inHandlerBlock = false;
+            let handlerBraceCount = 0;
+            let foundHandlerStart = false;
+            for (let i = 0; i < lines.length; i++) {
+                const line = lines[i];
+                if (!inHandlerBlock && line.includes('Handler(Looper.getMainLooper()).post')) {
+                    inHandlerBlock = true;
+                    foundHandlerStart = true;
+                    continue;
+                }
+                if (inHandlerBlock) {
+                    handlerBraceCount += (line.match(/\{/g) || []).length;
+                    handlerBraceCount -= (line.match(/\}/g) || []).length;
+                    if (handlerBraceCount <= 0) {
+                        inHandlerBlock = false;
+                        handlerBraceCount = 0;
+                        foundHandlerStart = false;
+                        continue;
+                    }
+                    continue;
+                }
+                if (line.includes('setupWebViewContainer')) {
+                    continue;
+                }
+                filteredLines.push(line);
+            }
+            cleanedOnCreateContent = filteredLines.join('\n');
+        }
+        if (edgeToEdgeEnabled !== true) {
+            const hasWindowCompatAfterClean = cleanedOnCreateContent.includes('WindowCompat.setDecorFitsSystemWindows');
+            const hasStatusBarColor = cleanedOnCreateContent.includes('window.statusBarColor');
+            const hasNavigationBarColor = cleanedOnCreateContent.includes('window.navigationBarColor');
+            const hasIsNavigationBarContrastEnforced = cleanedOnCreateContent.includes('isNavigationBarContrastEnforced');
+            if (!hasWindowCompatAfterClean || !hasStatusBarColor || !hasNavigationBarColor || !hasIsNavigationBarContrastEnforced) {
+                cleanedOnCreateContent = cleanedOnCreateContent.replace(/\s*\/\/\s*Let content extend below status bar and navigation bar\s*\n\s*/g, '');
+                cleanedOnCreateContent = cleanedOnCreateContent.replace(/\s*WindowCompat\.setDecorFitsSystemWindows\(window,\s*false\)\s*\n?/g, '');
+                cleanedOnCreateContent = cleanedOnCreateContent.replace(/\s*if\s*\(Build\.VERSION\.SDK_INT\s*>=\s*Build\.VERSION_CODES\.Q\)\s*\{\s*\n\s*window\.isNavigationBarContrastEnforced\s*=\s*false\s*\n\s*\}\s*\n?/g, '');
+                cleanedOnCreateContent = cleanedOnCreateContent.replace(/\s*window\.statusBarColor\s*=\s*android\.graphics\.Color\.TRANSPARENT\s*\n?/g, '');
+                cleanedOnCreateContent = cleanedOnCreateContent.replace(/\s*window\.navigationBarColor\s*=\s*android\.graphics\.Color\.TRANSPARENT\s*\n?/g, '');
+                const superOnCreateIndex = cleanedOnCreateContent.indexOf('super.onCreate');
+                if (superOnCreateIndex !== -1) {
+                    let superOnCreateEndIndex = cleanedOnCreateContent.indexOf('\n', superOnCreateIndex);
+                    if (superOnCreateEndIndex === -1) {
+                        superOnCreateEndIndex = cleanedOnCreateContent.length;
+                    }
+                    else {
+                        superOnCreateEndIndex = superOnCreateEndIndex + 1;
+                    }
+                    const windowSettingsCode = `
+    WindowCompat.setDecorFitsSystemWindows(window, false)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      window.isNavigationBarContrastEnforced = false
+    }
+    window.statusBarColor = android.graphics.Color.TRANSPARENT
+    window.navigationBarColor = android.graphics.Color.TRANSPARENT`;
+                    cleanedOnCreateContent = cleanedOnCreateContent.substring(0, superOnCreateEndIndex) +
+                        windowSettingsCode + '\n' +
+                        cleanedOnCreateContent.substring(superOnCreateEndIndex);
+                }
+            }
+        }
         if (cleanedOnCreateContent !== onCreateContent) {
             modifiedContent = modifiedContent.substring(0, onCreateIndex) +
                 cleanedOnCreateContent +
@@ -1561,6 +1690,47 @@ function modifyMainActivityForBlendMode(content, packageName, imageResourceName)
   private var splashImageViewContainer: ViewGroup? = null
   private var preventAutoHideImageView = false
 
+  /**
+   * 安全地设置视图可见性，自动处理异常
+   */
+  private fun safeSetVisibility(view: View?, visibility: Int, viewName: String) {
+    try {
+      view?.visibility = visibility
+    } catch (e: Exception) {
+      android.util.Log.e("MainActivity", "Error setting $viewName visibility", e)
+    }
+  }
+
+  private fun safeRemoveViewFromParent(child: View?, parent: ViewGroup?, viewName: String): Boolean {
+    if (child == null || parent == null) {
+      android.util.Log.d("MainActivity", "$viewName or parent is null, cannot remove")
+      return false
+    }
+    
+    try {
+      val childCount = parent.childCount
+      var found = false
+      for (i in 0 until childCount) {
+        if (parent.getChildAt(i) == child) {
+          found = true
+          break
+        }
+      }
+      
+      if (found) {
+        parent.removeView(child)
+        android.util.Log.d("MainActivity", "$viewName removed from parent")
+        return true
+      } else {
+        android.util.Log.d("MainActivity", "$viewName not found in parent")
+        return false
+      }
+    } catch (e: Exception) {
+      android.util.Log.e("MainActivity", "Error removing $viewName", e)
+      return false
+    }
+  }
+
   private fun setupSplashImageView() {
     try {
       // If container already exists, return directly
@@ -1637,6 +1807,18 @@ function modifyMainActivityForBlendMode(content, packageName, imageResourceName)
   }
 
   fun hideSplashImageViewContainer(force: Boolean = false) {
+    // Ensure all UI operations execute on main thread
+    if (Looper.myLooper() == Looper.getMainLooper()) {
+      hideSplashImageViewContainerInternal(force)
+    } else {
+      android.util.Log.d("MainActivity", "hideSplashImageViewContainer called from background thread, posting to main thread")
+      Handler(Looper.getMainLooper()).post {
+        hideSplashImageViewContainerInternal(force)
+      }
+    }
+  }
+
+  private fun hideSplashImageViewContainerInternal(force: Boolean = false) {
     try {
       // If preventAutoHideImageView is true and not force hide, don't execute hide operation
       if (preventAutoHideImageView && !force) {
@@ -1644,14 +1826,55 @@ function modifyMainActivityForBlendMode(content, packageName, imageResourceName)
         return
       }
 
-      val parent = splashImageViewContainer?.parent as? ViewGroup
-      parent?.removeView(splashImageViewContainer)
+      if (splashImageViewContainer != null) {
+        android.util.Log.d("MainActivity", "Hiding Splash ImageView container")
 
-      splashImageViewContainer?.visibility = View.GONE
-      splashImageViewContainer?.removeAllViews()
-      splashImageViewContainer = null
-      preventAutoHideImageView = false
-      android.util.Log.d("MainActivity", "Splash ImageView container hidden")
+        // First set visibility to GONE to ensure invisible
+        safeSetVisibility(splashImageViewContainer, View.GONE, "Splash ImageView container")
+
+        // Try to remove from parent view with validation
+        val parent = splashImageViewContainer?.parent as? ViewGroup
+        if (parent != null) {
+          val removed = safeRemoveViewFromParent(splashImageViewContainer, parent, "Splash ImageView container")
+          if (!removed) {
+            android.util.Log.d("MainActivity", "Splash ImageView container not found in parent, trying to remove from decorView")
+            // If not found in parent, try to remove directly from decorView
+            try {
+              val decorView = window.decorView as? ViewGroup
+              if (decorView != null) {
+                safeRemoveViewFromParent(splashImageViewContainer, decorView, "Splash ImageView container from decorView")
+              }
+            } catch (e: Exception) {
+              android.util.Log.e("MainActivity", "Error removing Splash ImageView container from decorView", e)
+            }
+          }
+        } else {
+          android.util.Log.d("MainActivity", "Splash ImageView container has no parent, trying to remove from decorView")
+          // If parent is null, try to remove directly from decorView
+          try {
+            val decorView = window.decorView as? ViewGroup
+            if (decorView != null) {
+              safeRemoveViewFromParent(splashImageViewContainer, decorView, "Splash ImageView container from decorView")
+            }
+          } catch (e: Exception) {
+            android.util.Log.e("MainActivity", "Error removing Splash ImageView container from decorView", e)
+          }
+        }
+
+        // Clean up all child views
+        try {
+          splashImageViewContainer?.removeAllViews()
+        } catch (e: Exception) {
+          android.util.Log.e("MainActivity", "Error removing all views from Splash ImageView container", e)
+        }
+
+        // Clear reference
+        splashImageViewContainer = null
+        preventAutoHideImageView = false
+        android.util.Log.d("MainActivity", "Splash ImageView container hidden")
+      } else {
+        android.util.Log.d("MainActivity", "Splash ImageView container is null, skipping")
+      }
     } catch (e: Exception) {
       android.util.Log.e("MainActivity", "Error hiding splash ImageView container", e)
     }
@@ -1763,31 +1986,43 @@ function modifyMainActivityForBlendMode(content, packageName, imageResourceName)
         android.util.Log.d("MainActivity", "Hiding MainActivity WebView container")
 
         // First set visibility to GONE to ensure invisible
-        webViewContainer?.visibility = View.GONE
+        safeSetVisibility(webViewContainer, View.GONE, "WebView container")
 
-        // Try to remove from parent view
+        // Try to remove from parent view with validation
         val parent = webViewContainer?.parent as? ViewGroup
         if (parent != null) {
-          try {
-            parent.removeView(webViewContainer)
-            android.util.Log.d("MainActivity", "WebView container removed from parent")
-          } catch (e: Exception) {
-            android.util.Log.e("MainActivity", "Error removing WebView container from parent", e)
+          val removed = safeRemoveViewFromParent(webViewContainer, parent, "WebView container")
+          if (!removed) {
+            android.util.Log.d("MainActivity", "WebView container not found in parent, trying to remove from decorView")
+            // If not found in parent, try to remove directly from decorView
+            try {
+              val decorView = window.decorView as? ViewGroup
+              if (decorView != null) {
+                safeRemoveViewFromParent(webViewContainer, decorView, "WebView container from decorView")
+              }
+            } catch (e: Exception) {
+              android.util.Log.e("MainActivity", "Error removing WebView container from decorView", e)
+            }
           }
         } else {
           android.util.Log.d("MainActivity", "WebView container has no parent, trying to remove from decorView")
           // If parent is null, try to remove directly from decorView
           try {
             val decorView = window.decorView as? ViewGroup
-            decorView?.removeView(webViewContainer)
-            android.util.Log.d("MainActivity", "WebView container removed from decorView")
+            if (decorView != null) {
+              safeRemoveViewFromParent(webViewContainer, decorView, "WebView container from decorView")
+            }
           } catch (e: Exception) {
             android.util.Log.e("MainActivity", "Error removing WebView container from decorView", e)
           }
         }
 
         // Clean up all child views
-        webViewContainer?.removeAllViews()
+        try {
+          webViewContainer?.removeAllViews()
+        } catch (e: Exception) {
+          android.util.Log.e("MainActivity", "Error removing all views from WebView container", e)
+        }
 
         // Clear reference
         webViewContainer = null
@@ -1840,19 +2075,36 @@ function modifyMainActivityForBlendMode(content, packageName, imageResourceName)
     const onContentChangedCode = `
   override fun onContentChanged() {
     super.onContentChanged()
-    // Show ImageView container and WebView container when content changed
-    // ImageView container (.9图背景) should be added first, then WebView container (透明背景) on top
-    Handler(Looper.getMainLooper()).post {
+    // 同步添加视图，避免在渲染过程中出现 null 引用导致崩溃
+    try {
       setupSplashImageView()
-      // Small delay to ensure ImageView container is added first
-      Handler(Looper.getMainLooper()).postDelayed({
-        setupWebViewContainer()
-      }, 50)
+      setupWebViewContainer()
+    } catch (e: Exception) {
+      android.util.Log.e("MainActivity", "Error in onContentChanged", e)
     }
   }`;
     const onCreateMatchForStatusBar = modifiedContent.match(/override\s+fun\s+onCreate\s*\([^)]*\)\s*\{/);
     if (onCreateMatchForStatusBar) {
-        const onCreateIndex = modifiedContent.indexOf(onCreateMatchForStatusBar[0]);
+        let onCreateIndex = -1;
+        const allOnCreateMatches = [];
+        let searchStart = 0;
+        while (true) {
+            const match = modifiedContent.substring(searchStart).match(/override\s+fun\s+onCreate\s*\([^)]*\)\s*\{/);
+            if (!match)
+                break;
+            const matchIndex = searchStart + match.index;
+            allOnCreateMatches.push(matchIndex);
+            searchStart = matchIndex + match[0].length;
+        }
+        if (allOnCreateMatches.length > 0) {
+            onCreateIndex = allOnCreateMatches[allOnCreateMatches.length - 1];
+        }
+        else {
+            onCreateIndex = modifiedContent.indexOf(onCreateMatchForStatusBar[0]);
+        }
+        const lineStartIndex = modifiedContent.lastIndexOf('\n', onCreateIndex - 1) + 1;
+        const onCreateLinePrefix = modifiedContent.substring(lineStartIndex, onCreateIndex);
+        const hasWrongIndentation = onCreateLinePrefix !== '  ';
         let braceCount = 0;
         let onCreateEndIndex = onCreateIndex + onCreateMatchForStatusBar[0].length;
         let foundStart = false;
@@ -1870,20 +2122,43 @@ function modifyMainActivityForBlendMode(content, packageName, imageResourceName)
             }
         }
         const onCreateContent = modifiedContent.substring(onCreateIndex, onCreateEndIndex);
+        const openBraceIndex = onCreateContent.indexOf('{');
+        const superOnCreateIndex = onCreateContent.indexOf('super.onCreate');
+        const betweenBraceAndSuper = onCreateContent.substring(openBraceIndex + 1, superOnCreateIndex);
+        const hasFormatIssue = openBraceIndex !== -1 &&
+            superOnCreateIndex !== -1 &&
+            openBraceIndex < superOnCreateIndex &&
+            !betweenBraceAndSuper.includes('\n') &&
+            !onCreateContent.includes('\n    super.onCreate') &&
+            !onCreateContent.includes('\n    super.onCreate(null)');
         const isCompressed = /override\s+fun\s+onCreate\s*\([^)]*\)\s*\{[^}]*super\.onCreate[^}]*window\.statusBarColor[^}]*window\.navigationBarColor[^}]*\}/.test(onCreateContent) &&
             !onCreateContent.includes('\n    super.onCreate') &&
             !onCreateContent.includes('\n    window.statusBarColor');
-        if (isCompressed) {
+        if (hasFormatIssue || isCompressed || hasWrongIndentation) {
             const superOnCreateMatch = onCreateContent.match(/super\.onCreate\([^)]*\)/);
+            const windowCompatMatch = onCreateContent.match(/WindowCompat\.setDecorFitsSystemWindows\(window,\s*false\)/);
+            const isNavigationBarContrastEnforcedMatch = onCreateContent.match(/if\s*\(Build\.VERSION\.SDK_INT\s*>=\s*Build\.VERSION_CODES\.Q\)\s*\{[\s\S]*?window\.isNavigationBarContrastEnforced\s*=\s*false[\s\S]*?\}/);
             const statusBarMatch = onCreateContent.match(/window\.statusBarColor\s*=\s*[^}\n]+/);
             const navBarMatch = onCreateContent.match(/window\.navigationBarColor\s*=\s*[^}\n]+/);
-            if (superOnCreateMatch && statusBarMatch && navBarMatch) {
-                const formattedOnCreate = `
-  override fun onCreate(savedInstanceState: Bundle?) {
-    ${superOnCreateMatch[0]}
-    ${statusBarMatch[0].trim()}
-    ${navBarMatch[0].replace(/[}]/g, '').trim()}
-  }`;
+            if (superOnCreateMatch) {
+                const indentation = '  ';
+                let formattedOnCreate = `${indentation}override fun onCreate(savedInstanceState: Bundle?) {
+${indentation}  ${superOnCreateMatch[0]}`;
+                if (windowCompatMatch) {
+                    formattedOnCreate += `\n${indentation}  WindowCompat.setDecorFitsSystemWindows(window, false)`;
+                }
+                if (isNavigationBarContrastEnforcedMatch) {
+                    formattedOnCreate += `\n${indentation}  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+${indentation}    window.isNavigationBarContrastEnforced = false
+${indentation}  }`;
+                }
+                if (statusBarMatch) {
+                    formattedOnCreate += `\n${indentation}  ${statusBarMatch[0].replace(/[}]/g, '').trim()}`;
+                }
+                if (navBarMatch) {
+                    formattedOnCreate += `\n${indentation}  ${navBarMatch[0].replace(/[}]/g, '').trim()}`;
+                }
+                formattedOnCreate += `\n${indentation}}`;
                 modifiedContent = modifiedContent.substring(0, onCreateIndex) +
                     formattedOnCreate +
                     modifiedContent.substring(onCreateEndIndex);
@@ -1911,7 +2186,23 @@ function modifyMainActivityForBlendMode(content, packageName, imageResourceName)
     if (!modifiedContent.includes('override fun onContentChanged()')) {
         const onCreateMatchForInsert = modifiedContent.match(/override\s+fun\s+onCreate\s*\([^)]*\)\s*\{/);
         if (onCreateMatchForInsert) {
-            const onCreateIndexForInsert = modifiedContent.indexOf(onCreateMatchForInsert[0]);
+            let onCreateIndexForInsert = -1;
+            const allMatches = [];
+            let searchStart = 0;
+            while (true) {
+                const match = modifiedContent.substring(searchStart).match(/override\s+fun\s+onCreate\s*\([^)]*\)\s*\{/);
+                if (!match)
+                    break;
+                const matchIndex = searchStart + match.index;
+                allMatches.push(matchIndex);
+                searchStart = matchIndex + match[0].length;
+            }
+            if (allMatches.length > 0) {
+                onCreateIndexForInsert = allMatches[allMatches.length - 1];
+            }
+            else {
+                onCreateIndexForInsert = modifiedContent.indexOf(onCreateMatchForInsert[0]);
+            }
             let braceCount = 0;
             let onCreateEndIndexForInsert = onCreateIndexForInsert + onCreateMatchForInsert[0].length;
             let foundStart = false;
@@ -1931,6 +2222,48 @@ function modifyMainActivityForBlendMode(content, packageName, imageResourceName)
             modifiedContent = modifiedContent.substring(0, onCreateEndIndexForInsert) +
                 '\n' + onContentChangedCode + '\n' +
                 modifiedContent.substring(onCreateEndIndexForInsert);
+            const onContentChangedMethodStart = modifiedContent.indexOf('override fun onContentChanged()');
+            if (onContentChangedMethodStart !== -1) {
+                const methodSignatureEnd = modifiedContent.indexOf('{', onContentChangedMethodStart);
+                if (methodSignatureEnd !== -1) {
+                    let braceCount = 0;
+                    let methodEnd = methodSignatureEnd + 1;
+                    let foundStart = false;
+                    for (let i = methodSignatureEnd; i < modifiedContent.length; i++) {
+                        if (modifiedContent[i] === '{') {
+                            braceCount++;
+                            foundStart = true;
+                        }
+                        else if (modifiedContent[i] === '}') {
+                            braceCount--;
+                            if (foundStart && braceCount === 0) {
+                                methodEnd = i + 1;
+                                break;
+                            }
+                        }
+                    }
+                    const afterOnContentChanged = modifiedContent.substring(methodEnd);
+                    const trimmedAfter = afterOnContentChanged.trimStart();
+                    if (trimmedAfter.startsWith('}')) {
+                        const duplicateBracePos = methodEnd + afterOnContentChanged.indexOf('}');
+                        const afterDuplicateBrace = modifiedContent.substring(duplicateBracePos + 1).trimStart();
+                        if (afterDuplicateBrace.startsWith('/**') ||
+                            afterDuplicateBrace.match(/^\s*override\s+fun/) ||
+                            afterDuplicateBrace.startsWith('companion object')) {
+                            let removeEndIndex = duplicateBracePos + 1;
+                            while (removeEndIndex < modifiedContent.length &&
+                                (modifiedContent[removeEndIndex] === ' ' || modifiedContent[removeEndIndex] === '\t')) {
+                                removeEndIndex++;
+                            }
+                            if (removeEndIndex < modifiedContent.length && modifiedContent[removeEndIndex] === '\n') {
+                                removeEndIndex++;
+                            }
+                            modifiedContent = modifiedContent.substring(0, methodEnd) +
+                                modifiedContent.substring(removeEndIndex);
+                        }
+                    }
+                }
+            }
         }
         else {
             const getMainComponentMatch = modifiedContent.match(/override\s+fun\s+getMainComponentName/);
@@ -1942,6 +2275,11 @@ function modifyMainActivityForBlendMode(content, packageName, imageResourceName)
             }
         }
     }
+    const companionObjectIndentPattern = /^(\s*)companion\s+object\s*\{/m;
+    const companionObjectIndentMatch = modifiedContent.match(companionObjectIndentPattern);
+    if (companionObjectIndentMatch && companionObjectIndentMatch[1] !== '  ') {
+        modifiedContent = modifiedContent.replace(companionObjectIndentPattern, '  companion object {');
+    }
     return modifiedContent;
 }
 function generatePrivacyPolicyActivity(packageName, projectRoot, androidMainPath) {
@@ -4290,8 +4628,9 @@ function setupWebViewMode(config, pluginConfig) {
             }
             updateIcLauncherBackground(androidMainPath, pluginConfig.backgroundColor || '#ffffff', imageWidth);
             createSplashColorsXml(androidMainPath, pluginConfig.backgroundColor || '#ffffff');
+            const edgeToEdgeEnabled = config.android?.edgeToEdgeEnabled;
             if (projectRoot) {
-                generateCustomSplashActivity(packageName, projectRoot, androidMainPath, pluginConfig.backgroundColor || '#ffffff');
+                generateCustomSplashActivity(packageName, projectRoot, androidMainPath, pluginConfig.backgroundColor || '#ffffff', edgeToEdgeEnabled);
                 generatePrivacyPolicyActivity(packageName, projectRoot, androidMainPath);
             }
             else {
@@ -4305,7 +4644,8 @@ function setupWebViewMode(config, pluginConfig) {
         return config;
     });
     config = (0, config_plugins_1.withMainActivity)(config, (config) => {
-        config.modResults.contents = modifyMainActivity(config.modResults.contents, packageName, pluginConfig.backgroundColor || '#ffffff');
+        const edgeToEdgeEnabled = config.android?.edgeToEdgeEnabled;
+        config.modResults.contents = modifyMainActivity(config.modResults.contents, packageName, pluginConfig.backgroundColor || '#ffffff', edgeToEdgeEnabled);
         return config;
     });
     config = (0, config_plugins_1.withDangerousMod)(config, [
@@ -4762,8 +5102,9 @@ function setupBlendMode(config, pluginConfig) {
                 copyHtmlFile(projectRoot, androidMainPath, resolvedHtml);
             }
             createSplashColorsXml(androidMainPath, pluginConfig.backgroundColor || '#ffffff');
+            const edgeToEdgeEnabled = config.android?.edgeToEdgeEnabled;
             if (projectRoot) {
-                generateCustomSplashActivityForBlendMode(packageName, projectRoot, androidMainPath, imageResourceName);
+                generateCustomSplashActivityForBlendMode(packageName, projectRoot, androidMainPath, imageResourceName, edgeToEdgeEnabled);
                 generatePrivacyPolicyActivity(packageName, projectRoot, androidMainPath);
             }
             else {
@@ -4777,7 +5118,8 @@ function setupBlendMode(config, pluginConfig) {
         return config;
     });
     config = (0, config_plugins_1.withMainActivity)(config, (config) => {
-        config.modResults.contents = modifyMainActivityForBlendMode(config.modResults.contents, packageName, savedImageResourceName);
+        const edgeToEdgeEnabled = config.android?.edgeToEdgeEnabled;
+        config.modResults.contents = modifyMainActivityForBlendMode(config.modResults.contents, packageName, savedImageResourceName, edgeToEdgeEnabled);
         return config;
     });
     config = (0, config_plugins_1.withAndroidStyles)(config, (config) => {

package/plugin/build/templates/android.js

@@ -682,7 +682,8 @@ class SplashScreen2PrivacyPolicyActivity : AppCompatActivity() {
         context.overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
       }
     }
-  }`,
+  }
+`,
     mainActivityWebViewCode: `
   private var webViewContainer: ViewGroup? = null
   private var preventAutoHide = false