@capawesome/capacitor-android-edge-to-edge-support 8.0.2 → 8.0.4

package/android/src/main/java/io/capawesome/capacitorjs/plugins/androidedgetoedgesupport/EdgeToEdge.java

@@ -28,19 +28,27 @@ public class EdgeToEdge {
     @Nullable
     private View statusBarOverlay;
 
+    private int currentNavigationBarColor;
+
+    private int currentStatusBarColor;
+
     public EdgeToEdge(@NonNull EdgeToEdgePlugin plugin, @NonNull EdgeToEdgeConfig config) {
         this.config = config;
         this.plugin = plugin;
-        // Create color overlays
-        createColorOverlays();
-        // Set colors from config
-        setStatusBarColor(config.getStatusBarColor());
-        setNavigationBarColor(config.getNavigationBarColor());
-        // Apply insets to enable the edge-to-edge feature
-        applyInsets();
+        // Store initial colors from config
+        this.currentStatusBarColor = config.getStatusBarColor();
+        this.currentNavigationBarColor = config.getNavigationBarColor();
+        // Enable edge-to-edge
+        enable();
     }
 
     public void enable() {
+        // Create color overlays if they don't exist
+        createColorOverlays();
+        // Restore previously set colors
+        setStatusBarColor(currentStatusBarColor);
+        setNavigationBarColor(currentNavigationBarColor);
+        // Apply insets
         applyInsets();
     }
 
@@ -79,10 +87,12 @@ public class EdgeToEdge {
             );
             Insets imeInsets = currentInsets.getInsets(WindowInsetsCompat.Type.ime());
             boolean keyboardVisible = currentInsets.isVisible(WindowInsetsCompat.Type.ime());
+            // Only use IME insets if keyboard is visible AND larger than system bars (handles external keyboard case)
+            boolean useImeInsets = keyboardVisible && imeInsets.bottom > systemBarsInsets.bottom;
 
             ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
 
-            mlp.bottomMargin = keyboardVisible ? imeInsets.bottom : systemBarsInsets.bottom;
+            mlp.bottomMargin = useImeInsets ? imeInsets.bottom : systemBarsInsets.bottom;
             mlp.topMargin = systemBarsInsets.top;
             mlp.leftMargin = systemBarsInsets.left;
             mlp.rightMargin = systemBarsInsets.right;
@@ -101,11 +111,13 @@ public class EdgeToEdge {
             // Retrieve keyboard (IME) insets
             Insets imeInsets = windowInsets.getInsets(WindowInsetsCompat.Type.ime());
             boolean keyboardVisible = windowInsets.isVisible(WindowInsetsCompat.Type.ime());
+            // Only use IME insets if keyboard is visible AND larger than system bars (handles external keyboard case)
+            boolean useImeInsets = keyboardVisible && imeInsets.bottom > systemBarsInsets.bottom;
 
             ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
 
             // Apply the appropriate bottom inset: use keyboard inset if visible, else system bars inset
-            mlp.bottomMargin = keyboardVisible ? imeInsets.bottom : systemBarsInsets.bottom;
+            mlp.bottomMargin = useImeInsets ? imeInsets.bottom : systemBarsInsets.bottom;
 
             // Set the other margins using system bars insets
             mlp.topMargin = systemBarsInsets.top;
@@ -169,12 +181,14 @@ public class EdgeToEdge {
     }
 
     private void setNavigationBarColor(int color) {
+        this.currentNavigationBarColor = color;
         if (navigationBarOverlay != null) {
             navigationBarOverlay.setBackgroundColor(color);
         }
     }
 
     private void setStatusBarColor(int color) {
+        this.currentStatusBarColor = color;
         if (statusBarOverlay != null) {
             statusBarOverlay.setBackgroundColor(color);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/capacitor-android-edge-to-edge-support",
-  "version": "8.0.2",
+  "version": "8.0.4",
   "description": "Capacitor plugin to support edge-to-edge display on Android.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",