edge-to-edge fixes

This seems a mess at the moment so let's just inline the plugin workarounds we
need. Should fix bottom bar issues on Android.

Author: microbit-matt-hillsdon

android/app/capacitor.build.gradle

@@ -10,7 +10,6 @@ android {
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-community-bluetooth-le')
-    implementation project(':capacitor-community-safe-area')
     implementation project(':capacitor-app')
     implementation project(':capacitor-filesystem')
     implementation project(':microbit-capacitor-community-nordic-dfu')

android/app/src/main/java/org/microbit/createai/MainActivity.java

@@ -1,6 +1,12 @@
 package org.microbit.createai;
 
+import android.webkit.WebView;
+
 import androidx.activity.EdgeToEdge;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 
 import com.getcapacitor.BridgeActivity;
 
@@ -10,6 +16,43 @@ public class MainActivity extends BridgeActivity {
     public void onStart() {
         super.onStart();
         EdgeToEdge.enable(this);
+
+        // Set dark icons on status bar (for light content showing through transparent bar)
+        WindowInsetsControllerCompat controller = ViewCompat.getWindowInsetsController(getWindow().getDecorView());
+        if (controller != null) {
+            controller.setAppearanceLightStatusBars(true);
+        }
+
+        // Inject CSS custom properties for safe area insets.
+        // This works around WebView bugs in Chromium < 136 where env(safe-area-inset-*)
+        // returns 0px. CSS can use: var(--safe-area-inset-top, env(safe-area-inset-top))
+        // See: https://github.com/ionic-team/capacitor/issues/7951
+        ViewCompat.setOnApplyWindowInsetsListener(getBridge().getWebView(), (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() |
+                WindowInsetsCompat.Type.displayCutout() |
+                WindowInsetsCompat.Type.ime()
+            );
+
+            float density = getApplicationContext().getResources().getDisplayMetrics().density;
+            int top = Math.round(insets.top / density);
+            int right = Math.round(insets.right / density);
+            int bottom = Math.round(insets.bottom / density);
+            int left = Math.round(insets.left / density);
+
+            WebView webView = getBridge().getWebView();
+            runOnUiThread(() -> {
+                webView.evaluateJavascript(
+                    "document.documentElement.style.setProperty('--safe-area-inset-top', '" + top + "px');" +
+                    "document.documentElement.style.setProperty('--safe-area-inset-right', '" + right + "px');" +
+                    "document.documentElement.style.setProperty('--safe-area-inset-bottom', '" + bottom + "px');" +
+                    "document.documentElement.style.setProperty('--safe-area-inset-left', '" + left + "px');",
+                    null
+                );
+            });
+
+            return WindowInsetsCompat.CONSUMED;
+        });
     }
 
 }

android/capacitor.settings.gradle

@@ -5,9 +5,6 @@ project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/
 include ':capacitor-community-bluetooth-le'
 project(':capacitor-community-bluetooth-le').projectDir = new File('../node_modules/@capacitor-community/bluetooth-le/android')
 
-include ':capacitor-community-safe-area'
-project(':capacitor-community-safe-area').projectDir = new File('../node_modules/@capacitor-community/safe-area/android')
-
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
 

ios/App/App/Info.plist

@@ -57,6 +57,8 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleDarkContent</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

ios/App/Podfile

@@ -12,7 +12,6 @@ def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCommunityBluetoothLe', :path => '../../node_modules/@capacitor-community/bluetooth-le'
-  pod 'CapacitorCommunitySafeArea', :path => '../../node_modules/@capacitor-community/safe-area'
   pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
   pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
   pod 'MicrobitCapacitorCommunityNordicDfu', :path => '../../node_modules/@microbit/capacitor-community-nordic-dfu'

ios/App/Podfile.lock

@@ -5,8 +5,6 @@ PODS:
     - Capacitor
   - CapacitorCommunityBluetoothLe (7.3.0):
     - Capacitor
-  - CapacitorCommunitySafeArea (7.0.0-beta.5):
-    - Capacitor
   - CapacitorCordova (7.4.4)
   - CapacitorFilesystem (7.1.6):
     - Capacitor
@@ -23,7 +21,6 @@ DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorApp (from `../../node_modules/@capacitor/app`)"
   - "CapacitorCommunityBluetoothLe (from `../../node_modules/@capacitor-community/bluetooth-le`)"
-  - "CapacitorCommunitySafeArea (from `../../node_modules/@capacitor-community/safe-area`)"
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorFilesystem (from `../../node_modules/@capacitor/filesystem`)"
   - "MicrobitCapacitorCommunityNordicDfu (from `../../node_modules/@microbit/capacitor-community-nordic-dfu`)"
@@ -41,8 +38,6 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/app"
   CapacitorCommunityBluetoothLe:
     :path: "../../node_modules/@capacitor-community/bluetooth-le"
-  CapacitorCommunitySafeArea:
-    :path: "../../node_modules/@capacitor-community/safe-area"
   CapacitorCordova:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorFilesystem:
@@ -54,14 +49,13 @@ SPEC CHECKSUMS:
   Capacitor: 358dd1c3fdd71d969547b17e159fd8a7736cb45f
   CapacitorApp: 26587c2ce485d88ddb39adb21cac64f8e481afe3
   CapacitorCommunityBluetoothLe: 41f9dec8a4c16ab6b81e56402b6047fc19b4735d
-  CapacitorCommunitySafeArea: 53e3ad999bada9892cb4e9aca8fa8012aabad4b2
   CapacitorCordova: bf648a636f3c153f652d312ae145fb508b6ffced
   CapacitorFilesystem: 66f05ee0d8b1ccdc00d509091273a9b3b57c4a0b
   IONFilesystemLib: 89258b8e3e85465da93127d25d7ce37f977e8a6f
   MicrobitCapacitorCommunityNordicDfu: 2fc86a9ebd698d5609023cafd74ece8b5d64a59e
   NordicDFU: 116a4ec458945889f8e0e71759e03b23c39c3482
   ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
 
-PODFILE CHECKSUM: 1b18202e6f59ad2a7694de09b5a672105ac90e81
+PODFILE CHECKSUM: ea570df87063d164872fb4820e9e9d2e9666790b
 
 COCOAPODS: 1.16.2