@totalpave/cordova-plugin-insets 0.1.5 → 0.1.6

package/CHANGELOG.md

@@ -0,0 +1,14 @@
+
+@totalpave/cordova-plugin-insets
+--------------------------------
+
+# Changelog
+
+## 0.1.6 (April 20, 2023)
+-   Replaced `insets.getSystemWindowInset*` usages that was deprecated in API 30.
+-   Replaced `insets.consumeSystemWindowInsets` usages that was deprecated in API 30.
+-   Fix an issue on API 30 and earlier devices where the inset provided on launch may be incorrect.
+
+## 0.1.5 (April 13, 2023)
+
+-   Initial Release to NPM

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@totalpave/cordova-plugin-insets",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Cordova Android Plugin to receive native information regarding the unsafe area insets.",
   "main": "www/insets.js",
   "types": "www/api.d.ts",
@@ -33,7 +33,7 @@
     "@rollup/plugin-commonjs": "24.1.0",
     "@rollup/plugin-node-resolve": "15.0.2",
     "@types/cordova": "11.0.0",
-    "rollup": "3.20.2",
+    "rollup": "3.20.6",
     "rollup-plugin-progress": "1.1.2",
     "rollup-plugin-typescript2": "0.34.1",
     "ts-node": "10.9.1",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="@totalpave/cordova-plugin-insets" version="0.1.3">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="@totalpave/cordova-plugin-insets" version="0.1.6">
   <name>cordova-plugin-insets</name>
   <description>Cordova Android Plugin to receive native information regarding the unsafe area insets</description>
   <author>Total Pave Inc.</author>

package/src/android/com/totalpave/cordova/insets/Insets.java

@@ -36,18 +36,22 @@ public class Insets extends CordovaPlugin {
     @Override
     protected void pluginInitialize() {
         ViewCompat.setOnApplyWindowInsetsListener(
-            this.cordova.getActivity().findViewById(android.R.id.content), (v, insets) -> {
+            this.cordova.getActivity().findViewById(android.R.id.content), (v, insetProvider) -> {
                 JSONObject result = new JSONObject();
+                
                 try {
                     float density = this.cordova.getActivity().getResources().getDisplayMetrics().density;
-                    result.put("top", insets.getSystemWindowInsetTop() / density);
-                    result.put("right", insets.getSystemWindowInsetRight() / density);
-                    result.put("bottom", insets.getSystemWindowInsetBottom() / density);
-                    result.put("left", insets.getSystemWindowInsetLeft() / density);
 
+                    // Ideally, we'd import this, but it shares the same name as our plugin
+                    androidx.core.graphics.Insets insets = insetProvider.getInsets(WindowInsetsCompat.Type.systemBars());
+                    
+                    result.put("top", insets.top / density);
+                    result.put("right", insets.right / density);
+                    result.put("bottom", insets.bottom / density);
+                    result.put("left", insets.left / density);
                 } catch (JSONException e) {
                     e.printStackTrace();
-                    return insets.consumeSystemWindowInsets();
+                    return insetProvider.CONSUMED; // Stop dispatching to child views
                 }
                 this.insets = result;
                 if (listener != null) {
@@ -55,7 +59,7 @@ public class Insets extends CordovaPlugin {
                     presult.setKeepCallback(true);
                     listener.sendPluginResult(presult);
                 }
-                return insets.consumeSystemWindowInsets();
+                return insetProvider.CONSUMED; // Stop dispatching to child views
             }
         );
     }
@@ -64,29 +68,17 @@ public class Insets extends CordovaPlugin {
     public boolean execute(String action, JSONArray args, CallbackContext callback) throws JSONException, NumberFormatException {
         if (action.equals("setListener")) {
             listener = callback;
-            if (this.insets == null) {
-                WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(this.cordova.getActivity().findViewById(android.R.id.content));
-                if (insets != null) {
-                    JSONObject result = new JSONObject();
-                    try {
-                        float density = this.cordova.getActivity().getResources().getDisplayMetrics().density;
-                        result.put("top", insets.getSystemWindowInsetTop() / density);
-                        result.put("right", insets.getSystemWindowInsetRight() / density);
-                        result.put("bottom", insets.getSystemWindowInsetBottom() / density);
-                        result.put("left", insets.getSystemWindowInsetLeft() / density);
-                        this.insets = result;
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                        listener.error(e.getMessage());
-                        return true;
-                    }
+            cordova.getActivity().runOnUiThread(() -> {
+                if (this.insets == null) {
+                    // Trigger a inset dispatch (will eventually jump to the ApplyWindowInsetsListener above)
+                    ViewCompat.requestApplyInsets(cordova.getActivity().findViewById(android.R.id.content));
                 }
-            }
-            if (this.insets != null) {
-                PluginResult presult = new PluginResult(Status.OK, this.insets);
-                presult.setKeepCallback(true);
-                listener.sendPluginResult(presult);
-            }
+                else {
+                    PluginResult presult = new PluginResult(Status.OK, this.insets);
+                    presult.setKeepCallback(true);
+                    listener.sendPluginResult(presult);
+                }
+            });
             return true;
         }
         return false;