emi-indo-cordova-plugin-admob 1.8.9 → 1.9.9

package/example/www/js/bannerAd.js

@@ -13,7 +13,7 @@ function loadBanner() {
         if (!isPlatformIOS){
 
         cordova.plugins.emiAdmobPlugin.styleBannerAd({
-            isOverlapping: true, 
+            isOverlapping: true,
             overlappingHeight: 0, // default 0 (Automatic)
             padding: 0, // default 0
             margins: 0 // default 0 (Automatic)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "1.8.9",
+  "version": "1.9.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="1.8.9">
+  id="emi-indo-cordova-plugin-admob" version="1.9.9">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova/Quasar/Capacitor Plugin Admob Android IOS</description>
@@ -41,7 +41,6 @@
       <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     </config-file>
 
-
     <config-file target="AndroidManifest.xml" parent="/manifest/application">
       <activity
         android:launchMode="singleTask"

package/src/android/emiAdmobPlugin.kt

@@ -92,6 +92,8 @@ class emiAdmobPlugin : CordovaPlugin() {
     private var isOverlapping: Boolean = false
     private var overlappingHeight: Int = 0
 
+    var adType = ""
+
     var isBannerLoad: Boolean = false
     var isBannerShow: Boolean = false
 
@@ -1365,6 +1367,7 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
     private fun loadBannerAd(adUnitId: String, position: String, size: String) {
+        adType = size;
         try {
             if (bannerViewLayout == null) {
                 bannerViewLayout = FrameLayout(mActivity!!)
@@ -1551,6 +1554,12 @@ class emiAdmobPlugin : CordovaPlugin() {
             cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.impression');")
         }
 
+        private fun getAdHeightInDp(adSize: AdSize, context: Context): Int {
+            val heightInPixels = adSize.getHeightInPixels(context)
+            val density = context.resources.displayMetrics.density
+            return (heightInPixels / density).toInt()
+        }
+
 
         override fun onAdLoaded() {
             // Log.d(TAG, "onAdLoaded: Ad finished loading successfully.");
@@ -1565,9 +1574,38 @@ class emiAdmobPlugin : CordovaPlugin() {
                 bannerOverlapping()
             }
 
-            val bannerHeight= adSize.height;
 
-            val bannerLoadEventData = String.format(Locale.US, "{\"height\": %d}", bannerHeight)
+
+
+
+
+            val context = cordova.activity.applicationContext
+            //val adType="fluid";
+            // Get the AdSize object based on the type
+            var currentAdSize = when (adType) {
+                "banner" -> AdSize.BANNER
+                "large_banner" -> AdSize.LARGE_BANNER
+                "medium_rectangle" -> AdSize.MEDIUM_RECTANGLE
+                "full_banner" -> AdSize.FULL_BANNER
+                "leaderboard" -> AdSize.LEADERBOARD
+
+                //"fluid" -> AdSize.FLUID
+                //"in_line_adaptive" -> AdSize.getCurrentOrientationInlineAdaptiveBannerAdSize(context, adWidth)
+
+                else -> adSize // Default fallback to the adaptive ad size
+            }
+
+            // Calculate the height in dp
+            val bannerHeightDp = getAdHeightInDp(currentAdSize, context)
+
+            //bannerHeight=currentAdSize;
+
+
+            val bannerLoadEventData = String.format(Locale.US, "{\"height\": %d}", bannerHeightDp)
+
+
+
+
 
             cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.load', $bannerLoadEventData);")
 
@@ -1646,24 +1684,21 @@ 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
+                        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")
+                    // Log.d("BannerAdjustment", "Adjusted WebView height: $webViewHeight")
                 } catch (e: Exception) {
                     Log.e("AdmobPlugin", "Error adjusting WebView for banner: ${e.message}")
                 }
@@ -2321,4 +2356,4 @@ class emiAdmobPlugin : CordovaPlugin() {
         private const val LAST_ACCESS_SUFFIX = "_last_access"
         private const val EXPIRATION_TIME = 360L * 24 * 60 * 60 * 1000
     }
-}
+}