emi-indo-cordova-plugin-admob 2.0.8 → 2.1.9

package/README.md

@@ -1,4 +1,4 @@
-### emi-indo-cordova-plugin-admob@2.0.8
+### emi-indo-cordova-plugin-admob@2.1.9
 
 
 ## Features/method
@@ -156,7 +156,7 @@ config.xml
 ### Check all release notes: https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/releases/
 
 
-### Mobile Ads SDK (Android: 24.1.0) [Release Notes:](https://developers.google.com/admob/android/rel-notes)
+### Mobile Ads SDK (Android: 24.2.0) [Release Notes:](https://developers.google.com/admob/android/rel-notes)
 ### User Messaging Platform (UMP Android: 3.2.0) [Release Notes:](https://developers.google.com/admob/android/privacy/release-notes)
 
 ### Mobile Ads SDK (IOS: 12.2.0) [Release Notes:](https://developers.google.com/admob/ios/rel-notes)

package/example/www/js/bannerAd.js

@@ -18,7 +18,7 @@ function loadBanner() {
         }
 
         
-        
+        // default: Android | IOS
         cordova.plugins.emiAdmobPlugin.loadBannerAd({
             adUnitId: Banner_ID, //Banner_ID,
             position: "bottom-center", //  bottom-center | top-center
@@ -30,6 +30,25 @@ function loadBanner() {
         });
 
 
+
+
+
+        // NOTE: Do not use loadBannerAd and loadBannerCapacitor together.
+
+        /*
+        // Only Android
+        cordova.plugins.emiAdmobPlugin.loadBannerCapacitor({
+            adUnitId: Banner_ID, //Banner_ID,
+            position: "bottom-center", //  bottom-center | top-center
+            size: "banner",
+            collapsible: "", // position: top | bottom (disable, empty string)
+            autoShow: true, // default false
+            isOverlapping: false // The height of the body is reduced by the height of the banner.
+         // isOverlapping: true // The body height is not reduced, the banner overlaps on top of the body
+        });
+        */
+
+
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "2.0.8",
+  "version": "2.1.9",
   "description": "Cordova/Quasar/Capacitor Plugin Admob Android IOS",
   "cordova": {
     "id": "emi-indo-cordova-plugin-admob",

package/plugin.xml

@@ -1,6 +1,6 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
-  id="emi-indo-cordova-plugin-admob" version="2.0.8">
+  id="emi-indo-cordova-plugin-admob" version="2.1.9">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova/Quasar/Capacitor Plugin Admob Android IOS</description>
@@ -59,7 +59,7 @@
     <!-- Sample AdMob app ID: ca-app-pub-3940256099942544~3347511713 -->
 
     <preference name="APP_ID_ANDROID" default="ca-app-pub-3940256099942544~3347511713" />
-    <preference name="PLAY_SERVICES_VERSION" default="24.1.0" />
+    <preference name="PLAY_SERVICES_VERSION" default="24.2.0" />
 
     <framework src="com.google.android.gms:play-services-ads:$PLAY_SERVICES_VERSION" />
 
@@ -76,8 +76,6 @@
             <activity android:resizeableActivity="$MULTI_WINDOW" />
     </edit-config>
 
-
-
     <config-file parent="/*" target="AndroidManifest.xml" />
     <source-file src="src/android/emiAdmobPlugin.kt" target-dir="app/src/main/kotlin/emi/indo/cordova/plugin/admob" />
 

package/src/android/emiAdmobPlugin.kt

@@ -152,7 +152,8 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
     private var isFullScreen: Boolean = false
-   // private var bannerOverlapping: Boolean = false
+    private var loadBannerCapacitor: Boolean = false
+    private var loadBannerCordova: Boolean = false
 
     override fun pluginInitialize() {
         super.pluginInitialize()
@@ -1030,7 +1031,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                     val collapsible = options.optString("collapsible")
                     val size = options.optString("size")
                     val autoShow = options.optBoolean("autoShow")
-                    val isOverlapping = options.optBoolean("isOverlapping", false)
+                    val isOverlapping = options.optBoolean("isOverlapping")
                     val paddingPx = options.optInt("padding")
                     this.bannerAdUnitId = adUnitId
                     this.isPosition = position
@@ -1039,6 +1040,34 @@ class emiAdmobPlugin : CordovaPlugin() {
                     this.collapsiblePos = collapsible
                     this.isOverlapping = isOverlapping
                     this.paddingInPx = paddingPx
+                    this.loadBannerCordova = true
+
+                    try {
+                        loadBannerAd(adUnitId, position, size)
+                    } catch (e: Exception) {
+                        callbackContext.error("loadBannerAd Error: " + e.message)
+                    }
+                }
+            }
+            return true
+
+        } else if (action == "loadBannerCapacitor") {
+            if (mActivity != null) {
+                val options = args.getJSONObject(0)
+                mActivity?.runOnUiThread {
+                    val adUnitId = options.optString("adUnitId")
+                    val position = options.optString("position")
+                    val collapsible = options.optString("collapsible")
+                    val size = options.optString("size")
+                    val autoShow = options.optBoolean("autoShow")
+                    val isOverlapping = options.optBoolean("isOverlapping")
+                    this.bannerAdUnitId = adUnitId
+                    this.isPosition = position
+                    this.isSize = size
+                    this.bannerAutoShow = autoShow
+                    this.collapsiblePos = collapsible
+                    this.isOverlapping = isOverlapping
+                    this.loadBannerCapacitor = true
 
                     try {
                         loadBannerAd(adUnitId, position, size)
@@ -1059,10 +1088,20 @@ class emiAdmobPlugin : CordovaPlugin() {
                             bannerView?.visibility = View.VISIBLE
                             bannerView?.resume()
 
-                            if (isPosition == "top-center") {
-                                setBannerAdTop()
-                            } else {
-                                setBannerAdBottom()
+                            if(loadBannerCordova) {
+                                if (isPosition == "top-center") {
+                                    setBannerAdTop()
+                                } else {
+                                    setBannerAdBottom()
+                                }
+                            }
+
+                            if (loadBannerCapacitor) {
+                                if (isPosition == "top-center") {
+                                    setBannerAdTopCapacitor()
+                                } else {
+                                    setBannerAdBottomCapacitor()
+                                }
                             }
 
                             bannerViewLayout?.requestFocus()
@@ -1418,19 +1457,15 @@ class emiAdmobPlugin : CordovaPlugin() {
 
             cWebView?.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.failed.load', ${errorData});")
 
-            bannerOverlappingToZero()
 
             if (bannerViewLayout != null && bannerView != null) {
-                bannerViewLayout?.removeView(bannerView)
-                bannerView?.destroy()
-                bannerView = null
-                bannerViewLayout = null
                 isBannerLoad = false
-                isBannerShow = false
                 isBannerPause = 2
                 lock = true
             }
 
+
+
         }
 
         override fun onAdImpression() {
@@ -1454,10 +1489,20 @@ class emiAdmobPlugin : CordovaPlugin() {
                 bannerViewHeight = heightInPx ?: 0
             }
 
-            if (isPosition == "top-center") {
-                setBannerAdTop()
-            } else {
-                setBannerAdBottom()
+            if(loadBannerCordova) {
+                if (isPosition == "top-center") {
+                    setBannerAdTop()
+                } else {
+                    setBannerAdBottom()
+                }
+            }
+
+            if (loadBannerCapacitor) {
+                if (isPosition == "top-center") {
+                    setBannerAdTopCapacitor()
+                } else {
+                    setBannerAdBottomCapacitor()
+                }
             }
 
             if (bannerAutoShow) {
@@ -1592,6 +1637,8 @@ class emiAdmobPlugin : CordovaPlugin() {
     }
 
 
+    
+
     private fun setBannerAdTop() {
         mActivity?.let { activity ->
             bannerView?.post {
@@ -1641,6 +1688,174 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
 
+
+
+
+    private fun setBannerAdBottomCapacitor() {
+        if (bannerView != null && mActivity != null && cWebView != null) {
+            mActivity?.runOnUiThread {
+                bannerView?.post {
+                    try {
+                        val measuredBannerHeight = if (bannerView!!.height > 0)
+                            bannerView!!.height //167
+
+                        //adSize.height
+                        else
+                            adSize.getHeightInPixels(mActivity!!)
+
+                        //61
+
+                        val screenHeightInPx = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {    //2186
+
+
+                            val windowMetrics = mActivity!!.windowManager.currentWindowMetrics  //WindowMetrics:{bounds=Rect(0, 0 - 1080, 2400), windowInsets=null, density=2.75}
+                            val insets = windowMetrics.windowInsets.getInsets(WindowInsets.Type.systemBars())   //Insets{left=0, top=84, right=0, bottom=130}
+                            val height = windowMetrics.bounds.height() - insets.top - insets.bottom  //2186    2400 - 84 - 130
+                            height
+                        } else {
+                            val displayMetrics = DisplayMetrics()
+                            @Suppress("DEPRECATION")
+                            mActivity!!.windowManager.defaultDisplay.getMetrics(displayMetrics)
+                            displayMetrics.heightPixels
+                        }
+
+                        val webViewHeight = screenHeightInPx// - measuredBannerHeight //2186 - 167
+
+                        if (!isFullScreen) {
+                            var navBarHeight = 0
+
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                                val windowMetrics = mActivity!!.windowManager.currentWindowMetrics
+                                val insets = windowMetrics.windowInsets.getInsets(WindowInsets.Type.navigationBars())
+                                navBarHeight = insets.bottom
+                            } else {
+                                val decorView = mActivity!!.window.decorView
+                                @Suppress("DEPRECATION")
+                                val isNavBarVisible = (decorView.systemUiVisibility and View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0
+                                if (isNavBarVisible) {
+                                    navBarHeight = getNavigationBarHeight(mActivity!!)
+                                }
+                            }
+
+                            if (navBarHeight > 0) {
+                                bannerViewLayout?.let { container ->
+                                    container.post {
+                                        val params = container.layoutParams
+                                        if (params is ViewGroup.MarginLayoutParams) {
+                                            params.bottomMargin = navBarHeight
+                                            container.layoutParams = params
+                                            container.requestLayout()
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+
+
+                        if (!isOverlapping) {
+                            val layoutParams = cWebView!!.view.layoutParams
+
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                                val windowMetrics = mActivity!!.windowManager.currentWindowMetrics
+                                val insets = windowMetrics.windowInsets.getInsets(WindowInsets.Type.systemBars())
+                                val usableHeight = windowMetrics.bounds.height()
+
+                                layoutParams.height = if (isFullScreen) {
+                                    // In fullscreen, do NOT subtract nav bar height
+                                    usableHeight - adSize.getHeightInPixels(mActivity!!)
+                                } else {
+                                    usableHeight - getNavigationBarHeight(mActivity!!) - adSize.getHeightInPixels(mActivity!!)
+                                }
+                            } else {
+
+                                layoutParams.height = if (isFullScreen) {
+                                    webViewHeight - adSize.getHeightInPixels(mActivity!!) + getNavigationBarHeight(mActivity!!)
+                                } else {
+                                    webViewHeight  - adSize.getHeightInPixels(mActivity!!)  //- getNavigationBarHeight(mActivity!!)
+                                }
+                            }
+
+                            cWebView!!.view.layoutParams = layoutParams
+                        }
+
+                        val bannerParams = bannerView?.layoutParams as? FrameLayout.LayoutParams
+                        bannerParams?.bottomMargin = 0
+                        bannerParams?.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL     //81
+                        bannerView?.layoutParams = bannerParams
+
+                        bannerViewLayout?.setPadding(0, 0, 0, 0)
+
+
+                    } catch (e: Exception) {
+                        PUBLIC_CALLBACKS?.error("Error bannerOverlapping: ${e.message}")
+                    }
+                }
+            }
+        }
+    }
+
+
+
+    private fun setBannerAdTopCapacitor() {
+        mActivity?.let { activity ->
+            bannerView?.post {
+                val bannerHeightPx = bannerViewHeight
+                val statusBarHeight = getStatusBarHeight(activity)
+
+                if (isPosition.equals("top-center", ignoreCase = true)) {
+                    val bannerLp = bannerView?.layoutParams as? FrameLayout.LayoutParams
+                    bannerLp?.let { lp ->
+                        if (isOverlapping) {
+                            if (isFullScreen) {
+                                lp.topMargin = 0
+                                bannerView?.layoutParams = lp
+                            } else {
+                                lp.topMargin = 0 // bannerHeightPx // + statusBarHeight
+                                bannerView?.layoutParams = lp
+                            }
+                        } else {
+                            if (isFullScreen) {
+                                lp.topMargin = 0
+                                bannerView?.layoutParams = lp
+                            } else {
+                                lp.topMargin = statusBarHeight
+                                bannerView?.layoutParams = lp
+                            }
+                        }
+
+                    }
+                }
+
+                cWebView?.let { webView ->
+                    val webLp = webView.view.layoutParams as FrameLayout.LayoutParams
+                    if (isPosition.equals("top-center", ignoreCase = true)) {
+
+                        if (isOverlapping) {
+                            if (isFullScreen) {
+                                webLp.topMargin = 0 //+ statusBarHeight
+                            } else {
+                                webLp.topMargin = 0 //bannerHeightPx // + statusBarHeight
+                            }
+                        } else {
+                            if (isFullScreen) {
+                                webLp.topMargin = bannerHeightPx
+                            } else {
+                                webLp.topMargin = bannerHeightPx
+                            }
+                        }
+                    }
+
+                    webView.view.layoutParams = webLp
+                    webView.view.requestLayout()
+                }
+            }}
+    }
+
+
+
+
+
     private val bannerPaidAdListener = OnPaidEventListener { adValue ->
             val valueMicros = adValue.valueMicros.takeIf { it > 0 } ?: 0L
             val currencyCode = adValue.currencyCode.ifBlank { "UNKNOWN" }

package/www/emiAdmobPlugin.js

@@ -16,16 +16,19 @@ exports.showAppOpenAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'showAppOpenAd', []);
 };
 exports.styleBannerAd = function (options, success, error) {
-    exec(success, error, 'emiAdmobPlugin', 'styleBannerAd', [options]); 
+    exec(success, error, 'emiAdmobPlugin', 'styleBannerAd', [options]);
 };
 exports.loadBannerAd = function (options, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'loadBannerAd', [options]);
 };
+exports.loadBannerCapacitor = function (options, success, error) {
+    exec(success, error, 'emiAdmobPlugin', 'loadBannerCapacitor', [options]);
+};
 exports.showBannerAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'showBannerAd', []);
 };
 exports.hideBannerAd = function (success, error) {
-        exec(success, error, 'emiAdmobPlugin', 'hideBannerAd', []);
+    exec(success, error, 'emiAdmobPlugin', 'hideBannerAd', []);
 };
 exports.removeBannerAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'removeBannerAd', []);
@@ -70,13 +73,13 @@ exports.globalSettings = function (options, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'globalSettings', [options]);
 };
 exports.forceDisplayPrivacyForm = function (success, error) {
-        exec(success, error, 'emiAdmobPlugin', 'forceDisplayPrivacyForm', []); // only IOS
+    exec(success, error, 'emiAdmobPlugin', 'forceDisplayPrivacyForm', []); 
 };
 
 exports.metaData = function (options, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'metaData', [options]);
 };
-    
+
 // ( only Android )
 // only isUsingAdManagerRequest: true
 // AdManagerAdRequest.Builder