@totalpave/cordova-plugin-insets 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@totalpave/cordova-plugin-insets",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Cordova Android Plugin to receive native information regarding the unsafe area insets.",
   "main": "www/insets.js",
   "types": "www/api.d.ts",

package/plugin.xml

@@ -2,7 +2,7 @@
 <plugin
   xmlns="http://apache.org/cordova/ns/plugins/1.0"
   id="@totalpave/cordova-plugin-insets"
-  version="0.3.0"
+  version="0.3.1"
 >
   <name>cordova-plugin-insets</name>
   <description>Cordova Android Plugin to receive native information regarding the unsafe area insets</description>

package/src/android/com/totalpave/cordova/inset/Inset.java

@@ -16,6 +16,7 @@
 
 package com.totalpave.cordova.inset;
 
+import android.content.res.Configuration;
 import android.content.Context;
 import android.os.Build;
 import android.view.RoundedCorner;
@@ -136,16 +137,42 @@ public class Inset extends CordovaPlugin {
                 double bottom = insets.bottom / density;
                 double left = insets.left / density;
 
+                // First we will get the screen orientation. This may be locked by the user, so it
+                // may not match the physical orientation. If the orientation cannot be determined,
+                // we will assume PORTRAIT
+                int orientation = Configuration.ORIENTATION_UNDEFINED;
+
+                // There are other orientation types, albeit deprecated and supposedly no longer
+                // used, but this limits us from handling only portrait and landscape.
+                switch ($context.getResources().getConfiguration().orientation) {
+                    case Configuration.ORIENTATION_LANDSCAPE:
+                    case Configuration.ORIENTATION_PORTRAIT:
+                        orientation = $context.getResources().getConfiguration().orientation;
+                        break;
+                    case Configuration.ORIENTATION_SQUARE:
+                    case Configuration.ORIENTATION_UNDEFINED:
+                        // SQUARE is not used anymore since API 16, but included just to satisfy
+                        // lint warnings. If undefined, then fallback to PORTRAIT
+                        orientation = Configuration.ORIENTATION_PORTRAIT;
+                        break;
+                }
+
                 // Insets do not include rounded corner radius. If an inset is present, it
                 // generally will be big enough to cover the rounded corner. This is a coincidence,
                 // not a designed thing. In either case, we need to determine how much space is
                 // required to cover the rounded corner and take the higher between the inset and
                 // the rounded corner.
 
-                top = Math.max(Math.max(top, topLeftRadius), topRightRadius);
-                bottom = Math.max(Math.max(bottom, botLeftRadius), botRightRadius);
-                left = Math.max(Math.max(left, topLeftRadius), botLeftRadius);
-                right = Math.max(Math.max(right, topRightRadius), botRightRadius);
+                // If portrait, then top-left & top-right is applied to the top inset,
+                // and bot-left & bot-right is applied to the bottom inset
+                if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                    top = Math.max(Math.max(top, topLeftRadius), topRightRadius);
+                    bottom = Math.max(Math.max(bottom, botLeftRadius), botRightRadius);
+                }
+                else {
+                    left = Math.max(Math.max(left, topLeftRadius), botLeftRadius);
+                    right = Math.max(Math.max(right, topRightRadius), botRightRadius);
+                }
 
                 result.put("top", top);
                 result.put("right", right);

package/www/Insets.d.ts

@@ -23,7 +23,6 @@ declare class InsetsAPI implements IInsetsAPI {
     private initPromise;
     private listeners;
     private insets;
-    setMask(mask: number): Promise<IInsets>;
     /**
      * Initializes javascript side of the plugin.
      *

package/www/InsetType.d.ts

@@ -1,22 +0,0 @@
-/**
- * An enumeration of Inset Types.
- * These are mapped to android's native WindowInsetsCompat.TYPE
- *
- * See https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type
- * for more information.
- *
- * Note that the native constant values is an implementation detail,
- * therefore the values here isn't a direct mapping, but will be resolved
- * appropriately.
- */
-export declare enum InsetType {
-    CAPTION_BAR = 1,
-    DISPLAY_CUTOUT = 2,
-    IME = 4,
-    MANDATORY_SYSTEM_GESTURES = 8,
-    NAVIGATION_BARS = 16,
-    STATUS_BARS = 32,
-    SYSTEM_BARS = 64,
-    SYSTEM_GESTURES = 128,
-    TAPPABLE_ELEMENT = 256
-}