@hiloenergie/capacitor-plugin-safe-area 0.0.13 → 8.0.0

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  = '14.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.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
-}
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
-    }
-}
-
-apply plugin: 'com.android.library'
-
-android {
-    namespace "com.getcapacitor.community.plugins.safearea"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
-    defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
-        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_21
-        targetCompatibility JavaVersion.VERSION_21
-    }
-}
-
-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"
-}
+ext {
+    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
+}
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.13.0'
+    }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+    namespace = "com.getcapacitor.community.plugins.safearea"
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
+    defaultConfig {
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
+        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_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
+}
+
+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,2 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-</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,150 @@
-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.resolve();
-	}
-
-	@PluginMethod
-	public void getSafeAreaInsets(PluginCall call) {
-		JSObject ret = new JSObject();
-
-		ret.put(SafeAreaPlugin.KEY_INSET, this.safeAreaInsets.toJSON());
-
-		call.resolve(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.resolve();
+	}
+
+	@PluginMethod
+	public void getSafeAreaInsets(PluginCall call) {
+		JSObject ret = new JSObject();
+
+		ret.put(SafeAreaPlugin.KEY_INSET, this.safeAreaInsets.toJSON());
+
+		call.resolve(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) {
+		this.safeAreaInsets.bottom(bottom);
+		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/ios/Plugin/SafeAreaPlugin.h

@@ -1,10 +1,10 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for Plugin.
-FOUNDATION_EXPORT double PluginVersionNumber;
-
-//! Project version string for Plugin.
-FOUNDATION_EXPORT const unsigned char PluginVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Plugin/PublicHeader.h>
-
+#import <UIKit/UIKit.h>
+
+//! Project version number for Plugin.
+FOUNDATION_EXPORT double PluginVersionNumber;
+
+//! Project version string for Plugin.
+FOUNDATION_EXPORT const unsigned char PluginVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <Plugin/PublicHeader.h>
+

package/ios/Plugin/SafeAreaPlugin.m

@@ -1,9 +1,9 @@
-#import <Foundation/Foundation.h>
-#import <Capacitor/Capacitor.h>
-
-// Define the plugin using the CAP_PLUGIN Macro, and
-// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
-CAP_PLUGIN(SafeAreaPlugin, "SafeArea",
-    CAP_PLUGIN_METHOD(refresh, CAPPluginReturnPromise);
-    CAP_PLUGIN_METHOD(getSafeAreaInsets, CAPPluginReturnPromise);
-)
+#import <Foundation/Foundation.h>
+#import <Capacitor/Capacitor.h>
+
+// Define the plugin using the CAP_PLUGIN Macro, and
+// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
+CAP_PLUGIN(SafeAreaPlugin, "SafeArea",
+    CAP_PLUGIN_METHOD(refresh, CAPPluginReturnPromise);
+    CAP_PLUGIN_METHOD(getSafeAreaInsets, CAPPluginReturnPromise);
+)

package/ios/Plugin/SafeAreaPlugin.swift

@@ -1,93 +1,93 @@
-import Foundation
-import Capacitor
-
-func makeSafeArea(_ insets: UIEdgeInsets) -> [String :[String: Int]] {
-    return [
-        "insets": [
-            "top": Int(insets.top),
-            "bottom": Int(insets.bottom),
-            "right": Int(insets.right),
-            "left": Int(insets.left)
-        ]
-    ];
-}
-
-func getInsets(controller: UIViewController) -> UIEdgeInsets {
-    let keyWindow = UIApplication.shared.windows
-        .filter { window in window.rootViewController == controller }
-        .first
-    
-    if (keyWindow == nil) {
-        return UIEdgeInsets.zero
-    }
-    
-    return keyWindow!.safeAreaInsets
-}
-
-let EVENT_ON_INSETS_CHANGED = "safeAreaPluginsInsetChange"
-
-/**
- * Please read the Capacitor iOS Plugin Development Guide
- * here: https://capacitorjs.com/docs/plugins/ios
- */
-@objc(SafeAreaPlugin)
-public class SafeAreaPlugin: CAPPlugin {
-    public static let ViewSafeAreaInsetsDidChange = NSNotification.Name(rawValue: "SafeAreaPlugin.ViewSafeAreaInsetsDidChange");
-    
-    private var safeArea = makeSafeArea(UIEdgeInsets.zero)
-    
-    override public func load() {
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(self.onDidBecomeActive),
-            name: UIApplication.didBecomeActiveNotification,
-            object: nil
-        )
-        
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(self.onViewSafeAreaInsetsDidChange),
-            name: SafeAreaPlugin.ViewSafeAreaInsetsDidChange,
-            object: nil
-        )
-    }
-    
-    deinit {
-        NotificationCenter.default.removeObserver(self)
-    }
-    
-    @objc func refresh(_ call: CAPPluginCall) {
-        let insets = getInsets(controller: (self.bridge?.viewController)!)
-        self.changeSafeArea(insets);
-        call.resolve()
-    }
-
-    @objc func getSafeAreaInsets(_ call: CAPPluginCall) {
-        call.resolve(self.safeArea)
-    }
-    
-    @objc func onDidBecomeActive() {
-        let insets = getInsets(controller: (self.bridge?.viewController)!)
-        self.changeSafeArea(insets)
-    }
-    
-    @objc func onViewSafeAreaInsetsDidChange() {
-        let insets = getInsets(controller: (self.bridge?.viewController)!)
-        self.changeSafeArea(insets)
-    }
-    
-    func changeSafeArea(_ insets: UIEdgeInsets) {
-        self.safeArea = makeSafeArea(insets)
-        self.notifyListeners(EVENT_ON_INSETS_CHANGED, data: self.safeArea)
-    }
-}
-
-extension CAPBridgeViewController {
-    public override func viewSafeAreaInsetsDidChange() {
-        super.viewSafeAreaInsetsDidChange()
-        NotificationCenter.default.post(
-            name: SafeAreaPlugin.ViewSafeAreaInsetsDidChange,
-            object: nil
-        )
-    }
-}
+import Foundation
+import Capacitor
+
+func makeSafeArea(_ insets: UIEdgeInsets) -> [String :[String: Int]] {
+    return [
+        "insets": [
+            "top": Int(insets.top),
+            "bottom": Int(insets.bottom),
+            "right": Int(insets.right),
+            "left": Int(insets.left)
+        ]
+    ];
+}
+
+func getInsets(controller: UIViewController) -> UIEdgeInsets {
+    let keyWindow = UIApplication.shared.windows
+        .filter { window in window.rootViewController == controller }
+        .first
+    
+    if (keyWindow == nil) {
+        return UIEdgeInsets.zero
+    }
+    
+    return keyWindow!.safeAreaInsets
+}
+
+let EVENT_ON_INSETS_CHANGED = "safeAreaPluginsInsetChange"
+
+/**
+ * Please read the Capacitor iOS Plugin Development Guide
+ * here: https://capacitorjs.com/docs/plugins/ios
+ */
+@objc(SafeAreaPlugin)
+public class SafeAreaPlugin: CAPPlugin {
+    public static let ViewSafeAreaInsetsDidChange = NSNotification.Name(rawValue: "SafeAreaPlugin.ViewSafeAreaInsetsDidChange");
+    
+    private var safeArea = makeSafeArea(UIEdgeInsets.zero)
+    
+    override public func load() {
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(self.onDidBecomeActive),
+            name: UIApplication.didBecomeActiveNotification,
+            object: nil
+        )
+        
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(self.onViewSafeAreaInsetsDidChange),
+            name: SafeAreaPlugin.ViewSafeAreaInsetsDidChange,
+            object: nil
+        )
+    }
+    
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+    
+    @objc func refresh(_ call: CAPPluginCall) {
+        let insets = getInsets(controller: (self.bridge?.viewController)!)
+        self.changeSafeArea(insets);
+        call.resolve()
+    }
+
+    @objc func getSafeAreaInsets(_ call: CAPPluginCall) {
+        call.resolve(self.safeArea)
+    }
+    
+    @objc func onDidBecomeActive() {
+        let insets = getInsets(controller: (self.bridge?.viewController)!)
+        self.changeSafeArea(insets)
+    }
+    
+    @objc func onViewSafeAreaInsetsDidChange() {
+        let insets = getInsets(controller: (self.bridge?.viewController)!)
+        self.changeSafeArea(insets)
+    }
+    
+    func changeSafeArea(_ insets: UIEdgeInsets) {
+        self.safeArea = makeSafeArea(insets)
+        self.notifyListeners(EVENT_ON_INSETS_CHANGED, data: self.safeArea)
+    }
+}
+
+extension CAPBridgeViewController {
+    public override func viewSafeAreaInsetsDidChange() {
+        super.viewSafeAreaInsetsDidChange()
+        NotificationCenter.default.post(
+            name: SafeAreaPlugin.ViewSafeAreaInsetsDidChange,
+            object: nil
+        )
+    }
+}

package/package.json

@@ -1,75 +1,75 @@
-{
-  "name": "@hiloenergie/capacitor-plugin-safe-area",
-  "version": "0.0.13",
-  "description": "A plugin to expose the safe area insets from the native iOS/Android device to your web project.",
-  "author": "Kevin Pacheco",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://dev.azure.com/HQCdevops/HQC/_git/capacitor-community-safe-area"
-  },
-  "bugs": {
-    "url": "https://dev.azure.com/HQCdevops/HQC/_git/capacitor-community-safe-area"
-  },
-  "main": "dist/plugin.cjs.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/esm/index.d.ts",
-  "unpkg": "dist/plugin.js",
-  "files": [
-    "android/src/main/",
-    "android/build.gradle",
-    "dist/",
-    "ios/Plugin/",
-    "HiloenergieCapacitorPluginSafeArea.podspec"
-  ],
-  "keywords": [
-    "capacitor",
-    "plugin",
-    "native"
-  ],
-  "scripts": {
-    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin && cd ..",
-    "verify:android": "cd android && ./gradlew clean build test && cd ..",
-    "verify:web": "npm run build",
-    "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- autocorrect --format",
-    "eslint": "eslint . --ext ts",
-    "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
-    "swiftlint": "node-swiftlint",
-    "docgen": "docgen --api SafeAreaPlugin --output-readme README.md --output-json dist/docs.json",
-    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
-    "clean": "rimraf ./dist",
-    "watch": "tsc --watch",
-    "prepublishOnly": "npm run build"
-  },
-  "devDependencies": {
-    "@capacitor/android": "^7.4.2",
-    "@capacitor/core": "^7.4.2",
-    "@capacitor/docgen": "^0.3.0",
-    "@capacitor/ios": "^7.4.2",
-    "@ionic/eslint-config": "^0.4.0",
-    "@ionic/prettier-config": "^4.0.0",
-    "@ionic/swiftlint-config": "^2.0.0",
-    "eslint": "^8.57.0",
-    "prettier": "^3.4.2",
-    "prettier-plugin-java": "^2.6.6",
-    "rimraf": "^6.0.1",
-    "rollup": "^4.30.1",
-    "swiftlint": "^2.0.0",
-    "typescript": "~5.0.2"
-  },
-  "peerDependencies": {
-    "@capacitor/core": ">=7.0.0"
-  },
-  "prettier": "@ionic/prettier-config",
-  "swiftlint": "@ionic/swiftlint-config",
-  "capacitor": {
-    "ios": {
-      "src": "ios"
-    },
-    "android": {
-      "src": "android"
-    }
-  }
-}
+{
+  "name": "@hiloenergie/capacitor-plugin-safe-area",
+  "version": "8.0.0",
+  "description": "A plugin to expose the safe area insets from the native iOS/Android device to your web project.",
+  "author": "Kevin Pacheco",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://dev.azure.com/HQCdevops/HQC/_git/capacitor-community-safe-area"
+  },
+  "bugs": {
+    "url": "https://dev.azure.com/HQCdevops/HQC/_git/capacitor-community-safe-area"
+  },
+  "main": "dist/plugin.cjs.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
+  "unpkg": "dist/plugin.js",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "HiloenergieCapacitorPluginSafeArea.podspec"
+  ],
+  "keywords": [
+    "capacitor",
+    "plugin",
+    "native"
+  ],
+  "scripts": {
+    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
+    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin && cd ..",
+    "verify:android": "cd android && ./gradlew clean build test && cd ..",
+    "verify:web": "npm run build",
+    "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
+    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- autocorrect --format",
+    "eslint": "eslint . --ext ts",
+    "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
+    "swiftlint": "node-swiftlint",
+    "docgen": "docgen --api SafeAreaPlugin --output-readme README.md --output-json dist/docs.json",
+    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
+    "clean": "rimraf ./dist",
+    "watch": "tsc --watch",
+    "prepublishOnly": "npm run build"
+  },
+  "devDependencies": {
+    "@capacitor/android": "^8.1.0",
+    "@capacitor/core": "^8.1.0",
+    "@capacitor/docgen": "^0.3.0",
+    "@capacitor/ios": "^8.1.0",
+    "@ionic/eslint-config": "^0.4.0",
+    "@ionic/prettier-config": "^4.0.0",
+    "@ionic/swiftlint-config": "^2.0.0",
+    "eslint": "^8.57.0",
+    "prettier": "^3.4.2",
+    "prettier-plugin-java": "^2.6.6",
+    "rimraf": "^6.0.1",
+    "rollup": "^4.30.1",
+    "swiftlint": "^2.0.0",
+    "typescript": "~5.0.2"
+  },
+  "peerDependencies": {
+    "@capacitor/core": ">=8.0.0"
+  },
+  "prettier": "@ionic/prettier-config",
+  "swiftlint": "@ionic/swiftlint-config",
+  "capacitor": {
+    "ios": {
+      "src": "ios"
+    },
+    "android": {
+      "src": "android"
+    }
+  }
+}