@falconeta/capacitor-android-full-view 7.0.0 → 8.0.1

package/FalconetaCapacitorAndroidFullView.podspec

@@ -10,8 +10,8 @@ Pod::Spec.new do |s|
   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.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
+  s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'
 end

package/Package.swift

@@ -0,0 +1,28 @@
+// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+    name: "AndroidFullView",
+    platforms: [.iOS(.v15)],
+    products: [
+        .library(
+            name: "AndroidFullView",
+            targets: ["AndroidFullViewPlugin"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0")
+    ],
+    targets: [
+        .target(
+            name: "AndroidFullViewPlugin",
+            dependencies: [
+                .product(name: "Capacitor", package: "capacitor-swift-pm"),
+                .product(name: "Cordova", package: "capacitor-swift-pm")
+            ],
+            path: "ios/Sources/AndroidFullViewPlugin"),
+        .testTarget(
+            name: "AndroidFullViewPluginTests",
+            dependencies: ["AndroidFullViewPlugin"],
+            path: "ios/Tests/AndroidFullViewPluginTests")
+    ]
+)

package/android/build.gradle

@@ -1,8 +1,8 @@
 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'
+    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 {
@@ -11,18 +11,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
+        classpath 'com.android.tools.build:gradle:8.13.0'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    namespace "com.falconeta.plugin.android.fullview"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
+    namespace = "com.falconeta.plugin.android.fullview"
+    compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
+        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"
@@ -34,7 +34,7 @@ android {
         }
     }
     lintOptions {
-        abortOnError false
+        abortOnError = false
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_21

package/android/src/main/java/com/falconeta/plugin/android/fullview/AndroidFullView.java

@@ -33,7 +33,7 @@ public class AndroidFullView {
         return titleBarHeight / metrics.density;
     }
 
-    public float getBottom() {
+    public int getBottom() {
         DisplayMetrics metrics = this.activity.getResources().getDisplayMetrics();
         int resourceId = this.activity.getResources().getIdentifier("navigation_bar_height", "dimen", "android");
         float navigationBarHeight = 0;
@@ -41,7 +41,6 @@ public class AndroidFullView {
         if (resourceId > 0) {
             navigationBarHeight = this.activity.getResources().getDimensionPixelSize(resourceId);
         }
-
-        return navigationBarHeight / metrics.density;
+        return (int) (navigationBarHeight / metrics.density);
     }
 }

package/android/src/main/java/com/falconeta/plugin/android/fullview/AndroidFullViewPlugin.java

@@ -28,7 +28,7 @@ public class AndroidFullViewPlugin extends Plugin {
 
     @PluginMethod
     public void bottom(PluginCall call) {
-        float navigationBarHeight = implementation.getBottom();
+        int navigationBarHeight = implementation.getBottom();
         JSObject ret = new JSObject();
 
         ret.put("value", navigationBarHeight);

package/dist/plugin.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst AndroidFullView = registerPlugin('AndroidFullView', {\n    web: () => import('./web').then(m => new m.AndroidFullViewWeb()),\n});\nexport * from './definitions';\nexport { AndroidFullView };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class AndroidFullViewWeb extends WebPlugin {\n    async top() {\n        return { value: 0 };\n    }\n    async bottom() {\n        return { value: 0 };\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;;AACK,MAAC,eAAe,GAAGA,mBAAc,CAAC,iBAAiB,EAAE;AAC1D,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,kBAAkB,EAAE,CAAC;AACpE,CAAC;;ACFM,MAAM,kBAAkB,SAASC,cAAS,CAAC;AAClD,IAAI,MAAM,GAAG,GAAG;AAChB,QAAQ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE;AAC3B;AACA,IAAI,MAAM,MAAM,GAAG;AACnB,QAAQ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE;AAC3B;AACA;;;;;;;;;"}
+{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst AndroidFullView = registerPlugin('AndroidFullView', {\n    web: () => import('./web').then(m => new m.AndroidFullViewWeb()),\n});\nexport * from './definitions';\nexport { AndroidFullView };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class AndroidFullViewWeb extends WebPlugin {\n    async top() {\n        return { value: 0 };\n    }\n    async bottom() {\n        return { value: 0 };\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;;AACK,MAAC,eAAe,GAAGA,mBAAc,CAAC,iBAAiB,EAAE;AAC1D,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,kBAAkB,EAAE,CAAC;AACpE,CAAC;;ACFM,MAAM,kBAAkB,SAASC,cAAS,CAAC;AAClD,IAAI,MAAM,GAAG,GAAG;AAChB,QAAQ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE;AAC3B,IAAI;AACJ,IAAI,MAAM,MAAM,GAAG;AACnB,QAAQ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE;AAC3B,IAAI;AACJ;;;;;;;;;"}

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst AndroidFullView = registerPlugin('AndroidFullView', {\n    web: () => import('./web').then(m => new m.AndroidFullViewWeb()),\n});\nexport * from './definitions';\nexport { AndroidFullView };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class AndroidFullViewWeb extends WebPlugin {\n    async top() {\n        return { value: 0 };\n    }\n    async bottom() {\n        return { value: 0 };\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;AACK,UAAC,eAAe,GAAGA,mBAAc,CAAC,iBAAiB,EAAE;IAC1D,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,kBAAkB,EAAE,CAAC;IACpE,CAAC;;ICFM,MAAM,kBAAkB,SAASC,cAAS,CAAC;IAClD,IAAI,MAAM,GAAG,GAAG;IAChB,QAAQ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE;IAC3B;IACA,IAAI,MAAM,MAAM,GAAG;IACnB,QAAQ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE;IAC3B;IACA;;;;;;;;;;;;;;;"}
+{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst AndroidFullView = registerPlugin('AndroidFullView', {\n    web: () => import('./web').then(m => new m.AndroidFullViewWeb()),\n});\nexport * from './definitions';\nexport { AndroidFullView };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class AndroidFullViewWeb extends WebPlugin {\n    async top() {\n        return { value: 0 };\n    }\n    async bottom() {\n        return { value: 0 };\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;AACK,UAAC,eAAe,GAAGA,mBAAc,CAAC,iBAAiB,EAAE;IAC1D,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,kBAAkB,EAAE,CAAC;IACpE,CAAC;;ICFM,MAAM,kBAAkB,SAASC,cAAS,CAAC;IAClD,IAAI,MAAM,GAAG,GAAG;IAChB,QAAQ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE;IAC3B,IAAI;IACJ,IAAI,MAAM,MAAM,GAAG;IACnB,QAAQ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE;IAC3B,IAAI;IACJ;;;;;;;;;;;;;;;"}

package/ios/{Plugin → Sources/AndroidFullViewPlugin}/AndroidFullViewPlugin.swift

@@ -6,7 +6,12 @@ import Capacitor
  * here: https://capacitorjs.com/docs/plugins/ios
  */
 @objc(AndroidFullView)
-public class AndroidFullViewPlugin: CAPPlugin {
+public class AndroidFullViewPlugin: CAPPlugin, CAPBridgedPlugin {
+    public let identifier = "AndroidFullViewPlugin"
+    public let jsName = "AndroidFullView"
+    public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "top", returnType: CAPPluginReturnPromise)
+    ]
     private let implementation = AndroidFullView()
 
     @objc func top(_ call: CAPPluginCall) {

package/ios/Tests/AndroidFullViewPluginTests/AndroidFullViewTests.swift

@@ -0,0 +1,23 @@
+import XCTest
+@testable import Plugin
+
+class AndroidFullViewTests: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+    func testTop() {
+
+        let implementation = AndroidFullView()
+        let value = 0
+        let result = implementation.top()
+
+        XCTAssertEqual(value, result)
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@falconeta/capacitor-android-full-view",
-  "version": "7.0.0",
+  "version": "8.0.1",
   "description": "Capacitor plugin for retrieving proper top offset, bottom offset and set full screen ONLY for android",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -10,7 +10,9 @@
     "android/src/main/",
     "android/build.gradle",
     "dist/",
-    "ios/Plugin/",
+    "ios/Sources",
+    "ios/Tests",
+    "Package.swift",
     "FalconetaCapacitorAndroidFullView.podspec"
   ],
   "author": "Owls Department",
@@ -44,23 +46,23 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^7.0.0",
-    "@capacitor/core": "^7.0.0",
-    "@capacitor/docgen": "^0.3.0",
-    "@capacitor/ios": "^7.0.0",
+    "@capacitor/android": "^8.0.0",
+    "@capacitor/core": "^8.0.0",
+    "@capacitor/docgen": "^0.3.1",
+    "@capacitor/ios": "^8.0.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",
+    "eslint": "^8.57.1",
+    "prettier": "^3.6.2",
+    "prettier-plugin-java": "^2.7.7",
+    "rimraf": "^6.1.0",
+    "rollup": "^4.53.2",
     "swiftlint": "^2.0.0",
-    "typescript": "~4.1.5"
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@capacitor/core": ">=7.0.0"
+    "@capacitor/core": ">=8.0.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",

package/ios/Plugin/AndroidFullViewPlugin.h

@@ -1,10 +0,0 @@
-#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/AndroidFullViewPlugin.m

@@ -1,8 +0,0 @@
-#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(AndroidFullView, "AndroidFullView",
-           CAP_PLUGIN_METHOD(echo, CAPPluginReturnPromise);
-)

package/ios/Plugin/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>