emi-indo-cordova-plugin-admob 1.5.6 → 1.5.8

package/README.md

@@ -333,7 +333,7 @@ document.addEventListener('on.appOpenAd.loaded', () => {
 </pre>
 </details>
 
-- [FULL AppOpenAd basic:](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/Example/www/js/appOpenAd.js) 
+- [FULL AppOpenAd basic:](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/appOpenAd.js) 
 
 
 
@@ -436,7 +436,7 @@ console.log("Collapsible Status: " + event.collapsible);
 </pre>
 </details>
 
- [FULL Banner basic:](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/Example/www/js/bannerAd.js) 
+ [FULL Banner basic:](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/bannerAd.js) 
 
 
 ## Interstitial ADS
@@ -499,7 +499,7 @@ document.addEventListener('on.interstitial.dismissed', () => {
 </details>
 
 
-[FULL Interstitial basic: ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/Example/www/js/interstitialAd.js) 
+[FULL Interstitial basic: ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/interstitialAd.js) 
 
 
 
@@ -628,7 +628,7 @@ document.addEventListener('on.rewarded.dismissed', () => {
 </pre>
 </details>
 
-[FULL Rewarded basic: ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/Example/www/js/rewardedAd.js) 
+[FULL Rewarded basic: ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/rewardedAd.js) 
 
 
 

package/example/www/js/bannerAd.js

@@ -1,4 +1,4 @@
-// cordova.plugins.emiAdmobPlugin.styleBannerAd({ padding: 50, margins: 50 });  // (Optional only android)
+// ccordova.plugins.emiAdmobPlugin.styleBannerAd({isOverlapping: true, overlappingHeight: 5, padding: 0, margins: 0 });  // ( only android)
 //cordova.plugins.emiAdmobPlugin.loadBannerAd({config});
 //cordova.plugins.emiAdmobPlugin.showBannerAd(); // default
 //cordova.plugins.emiAdmobPlugin.hideBannerAd(); // default
@@ -10,6 +10,13 @@ function loadBanner() {
 
     if (typeof cordova !== 'undefined') {
 
+        cordova.plugins.emiAdmobPlugin.styleBannerAd({
+            isOverlapping: true, 
+            overlappingHeight: 5, 
+            padding: 0, 
+            margins: 0 
+        });
+
         cordova.plugins.emiAdmobPlugin.loadBannerAd({
             adUnitId: Banner_ID, //Banner_ID,
             position: "bottom-center",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "description": "Cordova 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="1.5.6">
+  id="emi-indo-cordova-plugin-admob" version="1.5.8">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova Plugin Admob Android IOS</description>

package/src/android/emiAdmobPlugin.kt

@@ -86,12 +86,17 @@ class emiAdmobPlugin : CordovaPlugin() {
 
     private var consentInformation: ConsentInformation? = null
 
+    private var isOverlapping: Boolean = false
+    private var overlappingHeight: Int = 0
+
     var isBannerLoad: Boolean = false
     var isBannerShow: Boolean = false
 
     var isBannerShows: Boolean = true
     private var bannerAutoShow = false
     private var isAutoResize: Boolean = false
+
+
     var appOpenAutoShow: Boolean = false
     var intAutoShow: Boolean = false
     var rewardedAutoShow: Boolean = false
@@ -1077,13 +1082,15 @@ class emiAdmobPlugin : CordovaPlugin() {
             val options = args.getJSONObject(0)
             if(mActivity != null) {
                 mActivity!!.runOnUiThread {
+                    val isOverlapping = options.optBoolean("isOverlapping")
+                    val overlappingHeight = options.optInt("overlappingHeight")
                     val paddingPx = options.optInt("padding")
                     val marginsPx = options.optInt("margins")
-                    // final boolean autoResize = options.optBoolean("autoResize");
                     try {
+                        this.isOverlapping = isOverlapping
+                        this.overlappingHeight = overlappingHeight
                         this.paddingInPx = paddingPx
                         this.marginsInPx = marginsPx
-                        // this.isAutoResize = autoResize;
                     } catch (e: Exception) {
                         callbackContext.error(e.toString())
                     }
@@ -1179,20 +1186,20 @@ class emiAdmobPlugin : CordovaPlugin() {
     private fun loadBannerAd(adUnitId: String, position: String, size: String) {
         try {
             if (bannerViewLayout == null) {
-                bannerViewLayout = FrameLayout(mContext!!)
+                bannerViewLayout = FrameLayout(mActivity!!)
                 val params = FrameLayout.LayoutParams(
                     FrameLayout.LayoutParams.MATCH_PARENT,
                     FrameLayout.LayoutParams.MATCH_PARENT
                 )
                 val decorView = mActivity!!.window.decorView as ViewGroup
                 decorView.addView(bannerViewLayout, params)
-                bannerView = AdView(mContext!!)
+                bannerView = AdView(mActivity!!)
                 setBannerPosition(position)
                 setBannerSiz(size)
                 bannerView!!.adUnitId = adUnitId
                 bannerView!!.adListener = bannerAdListener
                 bannerView!!.loadAd(buildAdRequest())
-                adjustWebViewForBanner(position)
+                // adjustWebViewForBanner(position)
             } else {
                 Log.d(TAG, "Banner view layout already exists.")
             }
@@ -1369,6 +1376,11 @@ class emiAdmobPlugin : CordovaPlugin() {
             if (bannerAutoShow) {
                 isBannerAutoShow()
             }
+
+            if (isOverlapping) {
+                bannerOverlapping()
+            }
+
             cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.load');")
 
             val eventData = String.format(
@@ -1412,6 +1424,32 @@ class emiAdmobPlugin : CordovaPlugin() {
     }
 
 
+    // fix https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/issues/26
+    private fun bannerOverlapping() {
+        if (bannerView != null && mActivity != null && cWebView != null) {
+            mActivity!!.runOnUiThread {
+                try {
+                    val bannerHeightInPx = bannerView!!.height
+                    val displayMetrics = DisplayMetrics()
+                    mActivity!!.windowManager.defaultDisplay.getMetrics(displayMetrics)
+                    val screenHeightInPx = displayMetrics.heightPixels
+
+                    // Adjust the WebView height to account for the banner ad
+                    val webViewHeight = screenHeightInPx - (adSize.height+overlappingHeight)
+                    val layoutParams = cWebView!!.view.layoutParams
+                    layoutParams.height = webViewHeight
+                    cWebView!!.view.layoutParams = layoutParams
+
+                    // Log for debugging
+                    Log.d("BannerAdjustment", "Adjusted WebView height: $webViewHeight")
+                } catch (e: Exception) {
+                    Log.e("AdmobPlugin", "Error adjusting WebView for banner: ${e.message}")
+                }
+            }
+        }
+    }
+
+
     private val bannerPaidAdListener = OnPaidEventListener { adValue ->
         val valueMicros = adValue.valueMicros
         val currencyCode = adValue.currencyCode
@@ -1437,19 +1475,19 @@ class emiAdmobPlugin : CordovaPlugin() {
             "responsive_adaptive" -> bannerView!!.setAdSize(adSize)
             "anchored_adaptive" -> bannerView!!.setAdSize(
                 AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize(
-                    mContext!!, adWidth
+                    mActivity!!, adWidth
                 )
             )
 
             "full_width_adaptive" -> bannerView!!.setAdSize(
                 AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize(
-                    mContext!!, adWidth
+                    mActivity!!, adWidth
                 )
             )
 
             "in_line_adaptive" -> bannerView!!.setAdSize(
                 AdSize.getCurrentOrientationInlineAdaptiveBannerAdSize(
-                    mContext!!, adWidth
+                    mActivity!!, adWidth
                 )
             )
 
@@ -1484,7 +1522,7 @@ class emiAdmobPlugin : CordovaPlugin() {
             val adWidthPixels =
                 if (bannerViewLayout != null && bannerViewLayout!!.width > 0) bannerViewLayout!!.width else outMetrics.widthPixels
             val adWidth = (adWidthPixels / density).toInt()
-            return AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize(mContext!!, adWidth)
+            return AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize(mActivity!!, adWidth)
         }