@hiloenergie/capacitor-plugin-safe-area 0.0.8 → 0.0.10

package/HiloenergieCapacitorPluginSafeArea.podspec

@@ -1,17 +1,17 @@
-require 'json'
-
-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-
-Pod::Spec.new do |s|
-  s.name = 'HiloenergieCapacitorPluginSafeArea'
-  s.version = package['version']
-  s.summary = package['description']
-  s.license = package['license']
-  s.homepage = package['repository']['url']
-  s.author = package['author']
-  s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
-  s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
-  s.ios.deployment_target  = '12.0'
-  s.dependency 'Capacitor'
-  s.swift_version = '5.1'
-end
+require 'json'
+
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
+Pod::Spec.new do |s|
+  s.name = 'HiloenergieCapacitorPluginSafeArea'
+  s.version = package['version']
+  s.summary = package['description']
+  s.license = package['license']
+  s.homepage = package['repository']['url']
+  s.author = package['author']
+  s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
+  s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
+  s.ios.deployment_target  = '14.0'
+  s.dependency 'Capacitor'
+  s.swift_version = '5.1'
+end

package/android/build.gradle

@@ -1,58 +1,58 @@
-ext {
-    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.1'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.2.0'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.2'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.3.0'
-}
-
-buildscript {
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
-    }
-}
-
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 30
-    defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    lintOptions {
-        abortOnError false
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-repositories {
-    google()
-    jcenter()
-    mavenCentral()
-}
-
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':capacitor-android')
-    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
-    testImplementation "junit:junit:$junitVersion"
-    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-}
+ext {
+    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.3'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
+}
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.0.0'
+    }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+    namespace "com.getcapacitor.community.plugins.safearea"
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 32
+    defaultConfig {
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 32
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    lintOptions {
+        abortOnError false
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+}
+
+repositories {
+    google()
+    mavenCentral()
+}
+
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':capacitor-android')
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
+    testImplementation "junit:junit:$junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+}

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.getcapacitor.community.plugins.safearea">
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

package/android/src/main/java/com/getcapacitor/community/plugins/safearea/SafeAreaPlugin.java

@@ -1,158 +1,158 @@
-package com.getcapacitor.community.plugins.safearea;
-
-import android.annotation.SuppressLint;
-import android.graphics.Insets;
-import android.os.Build;
-import android.view.DisplayCutout;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowInsets;
-import android.widget.FrameLayout;
-
-import com.getcapacitor.JSObject;
-import com.getcapacitor.Plugin;
-import com.getcapacitor.PluginCall;
-import com.getcapacitor.PluginMethod;
-import com.getcapacitor.annotation.CapacitorPlugin;
-
-@CapacitorPlugin(name = "SafeArea")
-public class SafeAreaPlugin extends Plugin {
-    private static final String KEY_INSET = "insets";
-	private static final String EVENT_ON_INSETS_CHANGED = "safeAreaPluginsInsetChange";
-	private SafeAreaInsets safeAreaInsets = new com.getcapacitor.community.plugins.safearea.SafeAreaInsets();
-	private SafeAreaView safeAreaView;
-
-	@Override
-	public void load() {
-		this.getBridge().getActivity().runOnUiThread(() -> {
-			safeAreaView = new SafeAreaView(this.getBridge().getActivity(), (WindowInsets insets) -> {
-				this.getSafeArea(insets);
-				this.doNotify();
-			});
-
-			FrameLayout.LayoutParams safeAreaPreviewParams = new FrameLayout.LayoutParams(
-				FrameLayout.LayoutParams.MATCH_PARENT,
-				FrameLayout.LayoutParams.MATCH_PARENT
-			);
-
-			// Set SafeAreaView as sibling View of WebView
-			((ViewGroup) this.getBridge().getWebView().getParent()).addView(safeAreaView, safeAreaPreviewParams);
-
-			// Bring the WebView in front of the SafeAreaView
-			this.getBridge().getWebView().bringToFront();
-		});
-	}
-
-	@PluginMethod
-	public void refresh(PluginCall call) {
-		this.doNotify();
-		call.success();
-	}
-
-	@PluginMethod
-	public void getSafeAreaInsets(PluginCall call) {
-		JSObject ret = new JSObject();
-
-		ret.put(SafeAreaPlugin.KEY_INSET, this.safeAreaInsets.toJSON());
-
-		call.success(ret);
-	}
-
-	protected void getSafeArea(WindowInsets windowInsets) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-			this.getSafeAreaR(windowInsets);
-		} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			this.getSafeAreaQ(windowInsets);
-		} else {
-			this.getSafeAreaLollipop(windowInsets);
-		}
-
-		// Cutout
-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
-			this.getSafeAreaCutout(windowInsets);
-		}
-
-		float density = this.getBridge().getActivity().getResources().getDisplayMetrics().density;
-
-		this.applySafeAreaInsets(
-		  Math.round(this.safeAreaInsets.top() / density),
-		  Math.round(this.safeAreaInsets.bottom() / density),
-		  Math.round(this.safeAreaInsets.left() / density),
-		  Math.round(this.safeAreaInsets.right() / density)
-		);
-	}
-
-	// api level 30
-	// Get insets (Mandatory System Gestures: https://developer.android.com/reference/android/view/WindowInsets#getMandatorySystemGestureInsets())
-	@SuppressLint("NewApi")
-	protected void getSafeAreaR(WindowInsets windowInsets) {
-		Insets finalInsets = windowInsets.getInsets(WindowInsets.Type.mandatorySystemGestures());
-
-		this.applySafeAreaInsets(
-		  finalInsets.top,
-		  finalInsets.bottom,
-		  finalInsets.left,
-		  finalInsets.right
-		);
-	}
-
-	// api level 29
-	@SuppressLint("NewApi")
-	protected void getSafeAreaQ(WindowInsets windowInsets) {
-		Insets finalInsets = windowInsets.getMandatorySystemGestureInsets();
-
-		this.applySafeAreaInsets(
-		  finalInsets.top,
-		  finalInsets.bottom,
-		  finalInsets.left,
-		  finalInsets.right
-		);
-	}
-
-	// api level 21
-	protected void getSafeAreaLollipop(WindowInsets windowInsets) {
-		this.applySafeAreaInsets(
-		  windowInsets.getSystemWindowInsetTop(),
-		  windowInsets.getStableInsetBottom(),
-		  windowInsets.getStableInsetLeft(),
-		  windowInsets.getStableInsetRight()
-		);
-	}
-
-	// cutout (api level >= 28)
-	@SuppressLint("NewApi")
-	protected void getSafeAreaCutout(WindowInsets windowInsets) {
-		DisplayCutout cutout = windowInsets.getDisplayCutout();
-		if (cutout != null) {
-			this.applySafeAreaInsets(
-				Math.max(this.safeAreaInsets.top(), cutout.getSafeInsetTop()),
-				Math.max(this.safeAreaInsets.bottom(), cutout.getSafeInsetBottom()),
-				Math.max(this.safeAreaInsets.left(), cutout.getSafeInsetLeft()),
-				Math.max(this.safeAreaInsets.right(), cutout.getSafeInsetRight())
-			);
-		}
-	}
-
-	protected void doNotify() {
-		JSObject ret = new JSObject();
-
-		ret.put(SafeAreaPlugin.KEY_INSET, this.safeAreaInsets.toJSON());
-
-		this.notifyListeners(SafeAreaPlugin.EVENT_ON_INSETS_CHANGED, ret);
-	}
-
-	private void applySafeAreaInsets(int top, int bottom, int left, int right) {
-		View decorView = this.getBridge().getActivity().getWindow().getDecorView();
-		int uiVisibility = decorView.getSystemUiVisibility();
-
-		if ((uiVisibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) {
-		  this.safeAreaInsets.bottom(bottom);
-		} else {
-		  this.safeAreaInsets.bottom(0);
-		}
-
-		this.safeAreaInsets.top(top);
-		this.safeAreaInsets.right(left);
-		this.safeAreaInsets.left(right);
-	}
-}
+package com.getcapacitor.community.plugins.safearea;
+
+import android.annotation.SuppressLint;
+import android.graphics.Insets;
+import android.os.Build;
+import android.view.DisplayCutout;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
+
+import com.getcapacitor.JSObject;
+import com.getcapacitor.Plugin;
+import com.getcapacitor.PluginCall;
+import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
+
+@CapacitorPlugin(name = "SafeArea")
+public class SafeAreaPlugin extends Plugin {
+    private static final String KEY_INSET = "insets";
+	private static final String EVENT_ON_INSETS_CHANGED = "safeAreaPluginsInsetChange";
+	private SafeAreaInsets safeAreaInsets = new com.getcapacitor.community.plugins.safearea.SafeAreaInsets();
+	private SafeAreaView safeAreaView;
+
+	@Override
+	public void load() {
+		this.getBridge().getActivity().runOnUiThread(() -> {
+			safeAreaView = new SafeAreaView(this.getBridge().getActivity(), (WindowInsets insets) -> {
+				this.getSafeArea(insets);
+				this.doNotify();
+			});
+
+			FrameLayout.LayoutParams safeAreaPreviewParams = new FrameLayout.LayoutParams(
+				FrameLayout.LayoutParams.MATCH_PARENT,
+				FrameLayout.LayoutParams.MATCH_PARENT
+			);
+
+			// Set SafeAreaView as sibling View of WebView
+			((ViewGroup) this.getBridge().getWebView().getParent()).addView(safeAreaView, safeAreaPreviewParams);
+
+			// Bring the WebView in front of the SafeAreaView
+			this.getBridge().getWebView().bringToFront();
+		});
+	}
+
+	@PluginMethod
+	public void refresh(PluginCall call) {
+		this.doNotify();
+		call.success();
+	}
+
+	@PluginMethod
+	public void getSafeAreaInsets(PluginCall call) {
+		JSObject ret = new JSObject();
+
+		ret.put(SafeAreaPlugin.KEY_INSET, this.safeAreaInsets.toJSON());
+
+		call.success(ret);
+	}
+
+	protected void getSafeArea(WindowInsets windowInsets) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			this.getSafeAreaR(windowInsets);
+		} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+			this.getSafeAreaQ(windowInsets);
+		} else {
+			this.getSafeAreaLollipop(windowInsets);
+		}
+
+		// Cutout
+		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
+			this.getSafeAreaCutout(windowInsets);
+		}
+
+		float density = this.getBridge().getActivity().getResources().getDisplayMetrics().density;
+
+		this.applySafeAreaInsets(
+		  Math.round(this.safeAreaInsets.top() / density),
+		  Math.round(this.safeAreaInsets.bottom() / density),
+		  Math.round(this.safeAreaInsets.left() / density),
+		  Math.round(this.safeAreaInsets.right() / density)
+		);
+	}
+
+	// api level 30
+	// Get insets (Mandatory System Gestures: https://developer.android.com/reference/android/view/WindowInsets#getMandatorySystemGestureInsets())
+	@SuppressLint("NewApi")
+	protected void getSafeAreaR(WindowInsets windowInsets) {
+		Insets finalInsets = windowInsets.getInsets(WindowInsets.Type.mandatorySystemGestures());
+
+		this.applySafeAreaInsets(
+		  finalInsets.top,
+		  finalInsets.bottom,
+		  finalInsets.left,
+		  finalInsets.right
+		);
+	}
+
+	// api level 29
+	@SuppressLint("NewApi")
+	protected void getSafeAreaQ(WindowInsets windowInsets) {
+		Insets finalInsets = windowInsets.getMandatorySystemGestureInsets();
+
+		this.applySafeAreaInsets(
+		  finalInsets.top,
+		  finalInsets.bottom,
+		  finalInsets.left,
+		  finalInsets.right
+		);
+	}
+
+	// api level 21
+	protected void getSafeAreaLollipop(WindowInsets windowInsets) {
+		this.applySafeAreaInsets(
+		  windowInsets.getSystemWindowInsetTop(),
+		  windowInsets.getStableInsetBottom(),
+		  windowInsets.getStableInsetLeft(),
+		  windowInsets.getStableInsetRight()
+		);
+	}
+
+	// cutout (api level >= 28)
+	@SuppressLint("NewApi")
+	protected void getSafeAreaCutout(WindowInsets windowInsets) {
+		DisplayCutout cutout = windowInsets.getDisplayCutout();
+		if (cutout != null) {
+			this.applySafeAreaInsets(
+				Math.max(this.safeAreaInsets.top(), cutout.getSafeInsetTop()),
+				Math.max(this.safeAreaInsets.bottom(), cutout.getSafeInsetBottom()),
+				Math.max(this.safeAreaInsets.left(), cutout.getSafeInsetLeft()),
+				Math.max(this.safeAreaInsets.right(), cutout.getSafeInsetRight())
+			);
+		}
+	}
+
+	protected void doNotify() {
+		JSObject ret = new JSObject();
+
+		ret.put(SafeAreaPlugin.KEY_INSET, this.safeAreaInsets.toJSON());
+
+		this.notifyListeners(SafeAreaPlugin.EVENT_ON_INSETS_CHANGED, ret);
+	}
+
+	private void applySafeAreaInsets(int top, int bottom, int left, int right) {
+		View decorView = this.getBridge().getActivity().getWindow().getDecorView();
+		int uiVisibility = decorView.getSystemUiVisibility();
+
+		if ((uiVisibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) {
+		  this.safeAreaInsets.bottom(bottom);
+		} else {
+		  this.safeAreaInsets.bottom(0);
+		}
+
+		this.safeAreaInsets.top(top);
+		this.safeAreaInsets.right(left);
+		this.safeAreaInsets.left(right);
+	}
+}

package/android/src/main/java/com/getcapacitor/community/plugins/safearea/SafeAreaView.java

@@ -1,49 +1,49 @@
-package com.getcapacitor.community.plugins.safearea;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.WindowInsets;
-import java.util.function.Consumer;
-
-/**
- * SafeArea View
- * WindowInsets monitor
- */
-public class SafeAreaView extends View {
-    private Consumer<WindowInsets> callbackInsets;
-
-    public SafeAreaView(Context context) {
-        super(context);
-        init(null, 0, null);
-    }
-
-    public SafeAreaView(Context context, Consumer<WindowInsets> onApplyInsets) {
-        super(context);
-        init(null, 0, onApplyInsets);
-    }
-
-    public SafeAreaView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(attrs, 0, null);
-    }
-
-    public SafeAreaView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init(attrs, defStyle, null);
-    }
-
-    private void init(AttributeSet attrs, int defStyle, Consumer<WindowInsets> onApplyInsets) {
-        if (onApplyInsets == null) {
-            this.callbackInsets = (WindowInsets wInsts) -> {};
-        } else {
-            this.callbackInsets = onApplyInsets;
-        }
-    }
-
-    @Override
-    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-        this.callbackInsets.accept(insets);
-        return super.onApplyWindowInsets(insets);
-    }
+package com.getcapacitor.community.plugins.safearea;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.WindowInsets;
+import java.util.function.Consumer;
+
+/**
+ * SafeArea View
+ * WindowInsets monitor
+ */
+public class SafeAreaView extends View {
+    private Consumer<WindowInsets> callbackInsets;
+
+    public SafeAreaView(Context context) {
+        super(context);
+        init(null, 0, null);
+    }
+
+    public SafeAreaView(Context context, Consumer<WindowInsets> onApplyInsets) {
+        super(context);
+        init(null, 0, onApplyInsets);
+    }
+
+    public SafeAreaView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs, 0, null);
+    }
+
+    public SafeAreaView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(attrs, defStyle, null);
+    }
+
+    private void init(AttributeSet attrs, int defStyle, Consumer<WindowInsets> onApplyInsets) {
+        if (onApplyInsets == null) {
+            this.callbackInsets = (WindowInsets wInsts) -> {};
+        } else {
+            this.callbackInsets = onApplyInsets;
+        }
+    }
+
+    @Override
+    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+        this.callbackInsets.accept(insets);
+        return super.onApplyWindowInsets(insets);
+    }
 }

package/dist/docs.json

@@ -7,9 +7,9 @@
     "methods": [
       {
         "name": "refresh",
-        "signature": "() => any",
+        "signature": "() => Promise<void>",
         "parameters": [],
-        "returns": "any",
+        "returns": "Promise<void>",
         "tags": [],
         "docs": "",
         "complexTypes": [],
@@ -17,9 +17,9 @@
       },
       {
         "name": "getSafeAreaInsets",
-        "signature": "() => any",
+        "signature": "() => Promise<SafeAreaInsetsResult>",
         "parameters": [],
-        "returns": "any",
+        "returns": "Promise<SafeAreaInsetsResult>",
         "tags": [],
         "docs": "",
         "complexTypes": [
@@ -34,12 +34,12 @@
           {
             "name": "eventName",
             "docs": "",
-            "type": "\"safeAreaPluginsInsetChange\""
+            "type": "'safeAreaPluginsInsetChange'"
           },
           {
             "name": "listener",
             "docs": "",
-            "type": "(result: SafeAreaInsetsResult) => void"
+            "type": "SafeAreaInsetsChangedCallback"
           }
         ],
         "returns": "PluginListenerHandle",
@@ -49,7 +49,7 @@
           "PluginListenerHandle",
           "SafeAreaInsetsChangedCallback"
         ],
-        "slug": "addlistener"
+        "slug": "addlistenersafeareapluginsinsetchange"
       }
     ],
     "properties": []
@@ -122,10 +122,26 @@
           "tags": [],
           "docs": "",
           "complexTypes": [],
-          "type": "() => any"
+          "type": "() => Promise<void>"
         }
       ]
     }
   ],
-  "enums": []
+  "enums": [],
+  "typeAliases": [
+    {
+      "name": "SafeAreaInsetsChangedCallback",
+      "slug": "safeareainsetschangedcallback",
+      "docs": "",
+      "types": [
+        {
+          "text": "(result: SafeAreaInsetsResult): void",
+          "complexTypes": [
+            "SafeAreaInsetsResult"
+          ]
+        }
+      ]
+    }
+  ],
+  "pluginConfigs": []
 }