codeplay-common 4.6.2 → 4.6.3

package/files/buildCodeplay/{setSplashAnimation-1.3.js → setSplashAnimation-1.4.js}

@@ -122,21 +122,73 @@ animations.forEach((animation) => {
     const newMainActivityCode =
 `package ${findPackageName()};
 
-import android.os.Build;
-import android.os.Bundle;
-import com.getcapacitor.BridgeActivity;
-
-import androidx.activity.EdgeToEdge;
-
-    public class MainActivity extends BridgeActivity {
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            // Android 15+ enforces edge-to-edge. Older Android and Fire OS
-            // should let the system keep the WebView clear of system bars.
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-                EdgeToEdge.enable(this);
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.webkit.WebView;
+import com.getcapacitor.BridgeActivity;
+import com.getcapacitor.CapConfig;
+import com.getcapacitor.WebViewListener;
+import org.json.JSONException;
+import java.util.Locale;
+
+import androidx.activity.EdgeToEdge;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+    public class MainActivity extends BridgeActivity {
+        @Override
+        protected void load() {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                config = CapConfig.loadDefault(this);
+                try {
+                    config.getPluginConfiguration("SystemBars").getConfigJSON().put("insetsHandling", "disable");
+                } catch (JSONException e) {
+                    throw new IllegalStateException("Unable to configure system bars", e);
+                }
+            }
+            super.load();
+        }
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                bridgeBuilder.addWebViewListener(new WebViewListener() {
+                    @Override
+                    public void onPageCommitVisible(WebView webView, String url) {
+                        ViewCompat.requestApplyInsets(getWindow().getDecorView());
+                    }
+                });
+            }
+            super.onCreate(savedInstanceState);
+
+            EdgeToEdge.enable(this);
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                View decorView = getWindow().getDecorView();
+                ViewCompat.setOnApplyWindowInsetsListener(decorView, (view, insets) -> {
+                    Insets bars = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+                    float density = getResources().getDisplayMetrics().density;
+                    int top = Math.round(bars.top / density);
+                    int right = Math.round(bars.right / density);
+                    int bottom = insets.isVisible(WindowInsetsCompat.Type.ime()) ? 0 : Math.round(bars.bottom / density);
+                    int left = Math.round(bars.left / density);
+
+                    if (bridge != null && bridge.getWebView() != null) {
+                        String script = String.format(Locale.US, """
+                            try {
+                              const root = document.documentElement;
+                              root.style.setProperty('--android-system-bar-top', '%dpx');
+                              root.style.setProperty('--android-system-bar-right', '%dpx');
+                              root.style.setProperty('--android-system-bar-bottom', '%dpx');
+                              root.style.setProperty('--android-system-bar-left', '%dpx');
+                            } catch (e) {}
+                            """, top, right, bottom, left);
+                        bridge.getWebView().evaluateJavascript(script, null);
+                    }
+                    return insets;
+                });
+                ViewCompat.requestApplyInsets(decorView);
             }
 
             // Handle custom splash screen exit animation
@@ -152,8 +204,8 @@ import androidx.activity.EdgeToEdge;
                 });
             }
         }
-    }
-    `;
+    }
+`;
 
     // Write the new MainActivity.java content
     writeMainActivity(newMainActivityCode);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "description": "Common build scripts and files",
   "scripts": {
 	"postinstall": "node scripts/sync-files.js",