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

package/README.md

@@ -1,12 +1,16 @@
 
 
 ### emi-indo-cordova-plugin-admob
- Cordova Plugin Admob Android and IOS
- ## Support
+ Cordova/Quasar/Capacitor Plugin Admob Android and IOS
+ ## Support Request Ad Builder
  - AdMob
  - AdManager
  - AdSense New [example ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/adSense.js)
 
+ ## Support framework
+ - Quasar: https://github.com/quasarframework/quasar/discussions/17706
+ - Capacitor: https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/discussions/29
+
 > [!NOTE]  
 > - To maintain this plugin in the long run, 
 > - for (regular maintenance),
@@ -44,6 +48,7 @@ https://github.com/EMI-INDO/emi-indo-cordova-plugin-fanalytics
 
 
 ## IOS Ad Support IOS 18 *
+- Fix error build IOS: https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/discussions/42
 - Mobile Ads SDK (IOS: 11.12.0)
 - emi-indo-cordova-plugin-admob@1.6.3 or higher requires cocoapods 1.16.2 or higher
 > [!WARNING]

package/example/capacitor.config.json

@@ -6,7 +6,8 @@
   "plugins": {
     "AdMob": {
       "APP_ID_ANDROID": "ca-app-pub-3940256099942544~3347511713", 
-      "APP_ID_IOS": "ca-app-pub-3940256099942544~1458002511"
+      "APP_ID_IOS": "ca-app-pub-3940256099942544~1458002511",
+      "USE_LITE_ADS": "lite"
     }
   }
 }

package/example/package.json

@@ -14,7 +14,7 @@
   "author": "Apache Cordova Team",
   "license": "Apache-2.0",
   "devDependencies": {
-    "emi-indo-cordova-plugin-admob": "^1.6.4"
+    "emi-indo-cordova-plugin-admob": "^1.8.9"
   },
   "cordova": {
     "plugins": {

package/example/www/js/bannerAd.js

@@ -1,4 +1,4 @@
-// ccordova.plugins.emiAdmobPlugin.styleBannerAd({isOverlapping: true, overlappingHeight: 5, padding: 0, margins: 0 });  // ( only android)
+// ccordova.plugins.emiAdmobPlugin.styleBannerAd({isOverlapping: true, overlappingHeight: 0, padding: 0, margins: 0 });  // ( only android)
 //cordova.plugins.emiAdmobPlugin.loadBannerAd({config});
 //cordova.plugins.emiAdmobPlugin.showBannerAd(); // default
 //cordova.plugins.emiAdmobPlugin.hideBannerAd(); // default
@@ -13,10 +13,10 @@ function loadBanner() {
         if (!isPlatformIOS){
 
         cordova.plugins.emiAdmobPlugin.styleBannerAd({
-            isOverlapping: true, 
-            overlappingHeight: 5, 
-            padding: 0, 
-            margins: 0 
+            isOverlapping: true,
+            overlappingHeight: 0, // default 0 (Automatic)
+            padding: 0, // default 0
+            margins: 0 // default 0 (Automatic)
         });
         
     }
@@ -24,7 +24,7 @@ function loadBanner() {
 
         cordova.plugins.emiAdmobPlugin.loadBannerAd({
             adUnitId: Banner_ID, //Banner_ID,
-            position: "bottom-center",
+            position: "bottom-center", // "Recommended: bottom-center"
             size: "banner", // autoResize: true (only responsive_adaptive)
             collapsible: "bottom", // position: top | bottom (disable, empty string)
             autoResize: true, // default false
@@ -114,9 +114,33 @@ on.banner.hide
 
 // EVENT For example
 
+
+// (Optional)
+// This is only triggered when cordova.plugins.emiAdmobPlugin.styleBannerAd
+document.addEventListener('on.style.banner.ad', (data) => {
+    console.log("on.style.banner.ad: " + JSON.stringify(data));
+/*
+    const navBarHeight = data.navBarHeight;
+    const screenHeight = data.screenHeight;
+    const usableHeight = data.usableHeight;
+    const isOverlapping = data.isOverlapping;
+    const overlappingHeight = data.overlappingHeight;
+    const paddingInPx = data.paddingInPx;
+    const marginsInPx = data.marginsInPx;
+*/
+
+   // You can load banner ads here, or manipulate variables, even rearrange cordova.plugins.emiAdmobPlugin.styleBannerAd to your liking.
+
+
+});
+
+
+
+
+
 document.addEventListener('on.banner.load', (arg) => {
     let bannerAdHeight=arg.height;
-    console.log("on banner load");
+    console.log("on banner load", bannerAdHeight);
 });
 
 

package/example/www/js/deviceready.js

@@ -83,7 +83,7 @@ document.addEventListener("deviceready", function () {
     } 
 
 
-   // deactivate Google's consent
+   // (Optional) deactivate Google's consent
     /*
      cordova.plugins.emiAdmobPlugin.metaData({
 

package/example/www/js/optionalFirebaseAnalytics.js

@@ -75,7 +75,7 @@ document.addEventListener('on.interstitial.loaded', () => {
 
     if (typeof cordova !== 'undefined') {
 
-        cordova.plugins.EmiFirebaseAnalyticsPlugin.logEvent({ name: "interstitial_Ad", params: adEventData.on_interstitial_loaded });
+        cordova.plugins.EmiFirebaseAnalyticsPlugin.logEvent({ name: "on_interstitial_loaded", params: adEventData.on_interstitial_loaded });
 
     }
   
@@ -92,7 +92,7 @@ document.addEventListener('on.interstitial.dismissed', () => {
     
     if (typeof cordova !== 'undefined') {
 
-        cordova.plugins.EmiFirebaseAnalyticsPlugin.logEvent({ name: "interstitial_Ad", params: adEventData.on_interstitial_dismissed });
+        cordova.plugins.EmiFirebaseAnalyticsPlugin.logEvent({ name: "on_interstitial_dismissed", params: adEventData.on_interstitial_dismissed });
 
     }
 
@@ -118,7 +118,7 @@ document.addEventListener('on.interstitial.failed.load', (error) => {
     
 if (typeof cordova !== 'undefined') {
 
-    cordova.plugins.EmiFirebaseAnalyticsPlugin.logEvent({ name: "interstitial_Ad", params: adEventData.on_interstitial_failed_load });
+    cordova.plugins.EmiFirebaseAnalyticsPlugin.logEvent({ name: "on_interstitial_failed_load", params: adEventData.on_interstitial_failed_load });
 
 }
 
@@ -133,7 +133,7 @@ document.addEventListener('on.interstitial.failed.show', (error) => {
    
     if (typeof cordova !== 'undefined') {
 
-        cordova.plugins.EmiFirebaseAnalyticsPlugin.logEvent({ name: "interstitial_Ad", params: adEventData.on_interstitial_failed_show });
+        cordova.plugins.EmiFirebaseAnalyticsPlugin.logEvent({ name: "on_interstitial_failed_show", params: adEventData.on_interstitial_failed_show });
     
     }
 
@@ -167,7 +167,7 @@ document.addEventListener('on.interstitial.revenue', (data) => {
   
         cordova.plugins.EmiFirebaseAnalyticsPlugin.setAdMobRevenuePaid({ data: adRevenuePaid });
 
-        cordova.plugins.EmiFirebaseAnalyticsPlugin.logEvent({ name: "interstitial_Ad", params: adEventData.on_interstitial_revenue });
+        cordova.plugins.EmiFirebaseAnalyticsPlugin.logEvent({ name: "on_interstitial_revenue", params: adEventData.on_interstitial_revenue });
   
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "1.7.9",
-  "description": "Cordova Plugin Admob Android IOS Support Capacitor",
+  "version": "1.9.9",
+  "description": "Cordova/Quasar/Capacitor Plugin Admob Android IOS",
   "cordova": {
     "id": "emi-indo-cordova-plugin-admob",
     "platforms": [
@@ -27,7 +27,9 @@
     "capacitor-ios",
     "adsense",
     "webview",
-    "admanager"
+    "admanager",
+    "quasar-framework",
+    "quasar"
   ],
   "author": "EMI INDO",
   "email": "cordova.c3addon@gmail.com",

package/plugin.xml

@@ -1,9 +1,9 @@
 <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.7.9">
+  id="emi-indo-cordova-plugin-admob" version="1.9.9">
 
   <name>emiAdmobPlugin</name>
-  <description>Cordova Plugin Admob Android IOS</description>
+  <description>Cordova/Quasar/Capacitor Plugin Admob Android IOS</description>
   <author>EMI INDO</author>
   <license>ISC</license>
 
@@ -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"
@@ -93,7 +92,7 @@
 
     <config-file parent="/*" target="config.xml">
     <!--minimum deployment-target: 12.2  -->
-		<preference name="deployment-target" value="12.2" />
+		<preference name="deployment-target" value="12.3" />
 		<preference name="SwiftVersion" value="5.10" />
 	</config-file>
 

package/src/android/emiAdmobPlugin.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.Configuration
+import android.graphics.Point
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
@@ -91,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
 
@@ -1197,18 +1200,59 @@ 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")
+                    val screenHeight: Int
+                    val usableHeight: Int
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                        val windowMetrics = cordova.activity.windowManager.currentWindowMetrics
+                        val insets = windowMetrics.windowInsets.getInsetsIgnoringVisibility(WindowInsets.Type.navigationBars())
+                        screenHeight = windowMetrics.bounds.height()
+                        usableHeight = screenHeight - insets.bottom
+                    } else {
+                        val display = cordova.activity.windowManager.defaultDisplay
+                        val size = Point()
+                        val realSize = Point()
+                        display.getSize(size)
+                        display.getRealSize(realSize)
+
+                        usableHeight = size.y
+                        screenHeight = realSize.y
+                    }
+
+                    val navBarHeight = maxOf(0, screenHeight - usableHeight)
+
+                    val isOverlapping = options.optBoolean("isOverlapping", false)
+                    val overlappingHeight = options.optInt("overlappingHeight", navBarHeight)
+                    val paddingPx = options.optInt("padding", 0)
+                    val marginsPx = options.optInt("margins", navBarHeight)
+
+                    val result = JSONObject()
                     try {
+                        // Make sure to only set variables if they have the correct values
                         this.isOverlapping = isOverlapping
-                        this.overlappingHeight = overlappingHeight
+                        this.overlappingHeight = if (overlappingHeight > 0) overlappingHeight else navBarHeight
                         this.paddingInPx = paddingPx
-                        this.marginsInPx = marginsPx
+                        this.marginsInPx = if (marginsPx > 0) marginsPx else navBarHeight
+
+                        // Add more useful data to the result
+                        result.put("navBarHeight", navBarHeight)
+                        result.put("screenHeight", screenHeight)
+                        result.put("usableHeight", usableHeight)
+                        result.put("isOverlapping", isOverlapping)
+                        result.put("overlappingHeight", this.overlappingHeight)
+                        result.put("paddingInPx", paddingPx)
+                        result.put("marginsInPx", this.marginsInPx)
+
+                        cWebView?.let {
+                            it.loadUrl("javascript:cordova.fireDocumentEvent('on.style.banner.ad', ${result});")
+                        } ?: run {
+                            callbackContext.error("Error: cWebView is null.")
+                        }
+
                     } catch (e: Exception) {
-                        callbackContext.error(e.toString())
+                        callbackContext.error("Error in styleBannerAd: ${e.message}")
                     }
+
                 }
             }
             return true
@@ -1323,6 +1367,7 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
     private fun loadBannerAd(adUnitId: String, position: String, size: String) {
+        adType = size;
         try {
             if (bannerViewLayout == null) {
                 bannerViewLayout = FrameLayout(mActivity!!)
@@ -1509,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.");
@@ -1523,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);")
 
@@ -1604,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}")
                 }
@@ -2006,7 +2083,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                     }
                     return sb.toString().uppercase(Locale.getDefault())
                 } catch (ex: NoSuchAlgorithmException) {
-                     ex.printStackTrace();
+                    ex.printStackTrace();
                     return null
                 }
             }
@@ -2279,4 +2356,4 @@ class emiAdmobPlugin : CordovaPlugin() {
         private const val LAST_ACCESS_SUFFIX = "_last_access"
         private const val EXPIRATION_TIME = 360L * 24 * 60 * 60 * 1000
     }
-}
+}