emi-indo-cordova-plugin-admob 1.5.9 → 1.6.1

package/README.md

@@ -1,4 +1,9 @@
 
+## New feature suggestion
+> [!TIP]
+> - Funding is needed to add a new feature of native ads that can be scrolled within html content elements.
+> - I will not settle how much funding is needed to add this feature.
+
 
 # emi-indo-cordova-plugin-admob
  Cordova Plugin Admob Android and IOS
@@ -11,11 +16,15 @@
 ### User Messaging Platform (UMP IOS: 2.6.0) [Release Notes:](https://developers.google.com/ad-manager/mobile-ads-sdk/ios/privacy/download)
 ### IAB Europe Transparency & Consent Framework (CPM: 2.2.0)
 
-
 ## New example 
 - https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/tree/main/example/www
 
 
+## Documentation Capacitor example
+-  [Documentation Capacitor example: ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/discussions/29)
+
+
+
 ## Minimum Cordova Engines
 - cordova-android version = 12.0.0
 - cordova-ios version = 7.0.0
@@ -333,7 +342,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 +445,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 +508,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 +637,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/capacitor-hook-admob-ids.js

@@ -0,0 +1,95 @@
+const fs = require('fs');
+const path = require('path');
+const plist = require('plist');
+
+const configPath = path.join(process.cwd(), 'capacitor.config.json');
+const androidPlatformPath = path.join(process.cwd(), 'android');
+const iosPlatformPath = path.join(process.cwd(), 'ios');
+const pluginPath = path.join(process.cwd(), 'node_modules', 'emi-indo-cordova-plugin-admob', 'plugin.xml');
+const infoPlistPath = path.join(process.cwd(), 'ios', 'App', 'App', 'Info.plist'); 
+
+
+function fileExists(filePath) {
+  return fs.existsSync(filePath);
+}
+
+
+function getAdMobConfig() {
+  if (!fileExists(configPath)) {
+    throw new Error('capacitor.config.json not found. Ensure this is a Capacitor project.');
+  }
+
+  const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  const admobConfig = config.plugins?.AdMob;
+
+  if (!admobConfig || !admobConfig.APP_ID_ANDROID || !admobConfig.APP_ID_IOS) {
+    throw new Error('AdMob configuration is missing in capacitor.config.json. Ensure APP_ID_ANDROID and APP_ID_IOS are defined.');
+  }
+
+  return {
+    APP_ID_ANDROID: admobConfig.APP_ID_ANDROID,
+    APP_ID_IOS: admobConfig.APP_ID_IOS,
+  };
+}
+
+
+function updatePluginXml(admobConfig) {
+  if (!fileExists(pluginPath)) {
+    console.error('plugin.xml not found. Ensure the plugin is installed.');
+    return;
+  }
+
+  let pluginContent = fs.readFileSync(pluginPath, 'utf8');
+
+  pluginContent = pluginContent
+    .replace(/<preference name="APP_ID_ANDROID" default=".*?" \/>/, `<preference name="APP_ID_ANDROID" default="${admobConfig.APP_ID_ANDROID}" />`)
+    .replace(/<preference name="APP_ID_IOS" default=".*?" \/>/, `<preference name="APP_ID_IOS" default="${admobConfig.APP_ID_IOS}" />`);
+
+  fs.writeFileSync(pluginPath, pluginContent, 'utf8');
+  console.log('AdMob IDs successfully updated in plugin.xml');
+}
+
+
+function updateInfoPlist(admobConfig) {
+  if (!fileExists(infoPlistPath)) {
+    console.error('Info.plist not found. Ensure you have built the iOS project.');
+    return;
+  }
+
+  const plistContent = fs.readFileSync(infoPlistPath, 'utf8');
+  const plistData = plist.parse(plistContent);
+
+
+  plistData.GADApplicationIdentifier = admobConfig.APP_ID_IOS;
+
+  const updatedPlistContent = plist.build(plistData);
+  fs.writeFileSync(infoPlistPath, updatedPlistContent, 'utf8');
+  console.log('AdMob IDs successfully updated in Info.plist');
+}
+
+
+try {
+
+  if (!fileExists(configPath)) {
+    throw new Error('capacitor.config.json not found. Skipping setup.');
+  }
+
+  if (!fileExists(androidPlatformPath) && !fileExists(iosPlatformPath)) {
+    throw new Error('Neither Android nor iOS platforms are found. Ensure platforms are added to your Capacitor project.');
+  }
+
+
+  const admobConfig = getAdMobConfig();
+
+
+  if (fileExists(androidPlatformPath)) {
+    updatePluginXml(admobConfig);
+  }
+
+
+  if (fileExists(iosPlatformPath)) {
+    updateInfoPlist(admobConfig);
+  }
+} catch (error) {
+  console.error(error.message);
+}

package/example/capacitor.config.json

@@ -0,0 +1,12 @@
+{
+  "appId": "io.cordova.hellocordova",
+  "appName": "HelloCordova",
+  "webDir": "www",
+  "bundledWebRuntime": false,
+  "plugins": {
+    "AdMob": {
+      "APP_ID_ANDROID": "ca-app-pub-3940256099942544~3347511713",
+      "APP_ID_IOS": "ca-app-pub-3940256099942544~1458002511"
+    }
+  }
+}

package/example/config.xml

@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='utf-8'?>
+<widget id="io.cordova.hellocordova" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <name>HelloCordova</name>
+    <description>Sample Apache Cordova App</description>
+    <author email="dev@cordova.apache.org" href="https://cordova.apache.org">
+        Apache Cordova Team
+    </author>
+    <content src="index.html" />
+    <allow-intent href="http://*/*" />
+    <allow-intent href="https://*/*" />
+</widget>

package/example/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "io.cordova.hellocordova",
+  "displayName": "HelloCordova",
+  "version": "1.0.0",
+  "description": "A sample Apache Cordova application that responds to the deviceready event.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "update-admob": "node node_modules/emi-indo-cordova-plugin-admob/capacitor-hook-admob-ids.js"
+  },
+  "keywords": [
+    "ecosystem:cordova"
+  ],
+  "author": "Apache Cordova Team",
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "emi-indo-cordova-plugin-admob": "^1.6.1"
+  },
+  "cordova": {
+    "plugins": {
+      "emi-indo-cordova-plugin-admob": {}
+    }
+  },
+  "dependencies": {
+    "@capacitor/android": "^6.2.0",
+    "@capacitor/ios": "^6.2.0",
+    "@capacitor/cli": "^6.2.0",
+    "@capacitor/core": "^6.2.0"
+  }
+}

package/example/www/js/bannerAd.js

@@ -20,7 +20,7 @@ function loadBanner() {
         cordova.plugins.emiAdmobPlugin.loadBannerAd({
             adUnitId: Banner_ID, //Banner_ID,
             position: "bottom-center",
-            size: "responsive_adaptive", // autoResize: true (only responsive_adaptive)
+            size: "banner", // autoResize: true (only responsive_adaptive)
             collapsible: "bottom", // position: top | bottom (disable, empty string)
             autoResize: true, // default false
             autoShow: true, // default false

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "1.5.9",
-  "description": "Cordova Plugin Admob Android IOS",
+  "version": "1.6.1",
+  "description": "Cordova Plugin Admob Android IOS Support Capacitor",
   "cordova": {
     "id": "emi-indo-cordova-plugin-admob",
     "platforms": [
@@ -20,7 +20,11 @@
     "admob-plus-cordova",
     "cordova-admob-pro",
     "cordova-admob-ios",
-    "cordova-admob-android"
+    "cordova-admob-android",
+    "capacitor",
+    "capacitor-admob",
+    "capacitor-android",
+    "capacitor-ios"
   ],
   "author": "EMI INDO",
   "email": "cordova.c3addon@gmail.com",

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.9">
+  id="emi-indo-cordova-plugin-admob" version="1.6.1">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova Plugin Admob Android IOS</description>

package/src/android/emiAdmobPlugin.kt

@@ -161,6 +161,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                 if(mActivity != null) {
                     mActivity!!.runOnUiThread {
                         try {
+                            bannerOverlappingToZero()
                             if (bannerViewLayout != null && bannerView != null) {
                                 val parentView = bannerViewLayout!!.parent as ViewGroup
                                 parentView.removeView(bannerViewLayout)
@@ -169,22 +170,17 @@ class emiAdmobPlugin : CordovaPlugin() {
                                     FrameLayout.LayoutParams.MATCH_PARENT,
                                     FrameLayout.LayoutParams.WRAP_CONTENT
                                 )
-                                val rootView =
-                                    mActivity!!.window.decorView.findViewById<View>(View.generateViewId())
-                                if (rootView is ViewGroup) {
-                                    rootView.addView(bannerViewLayout, params)
-                                } else {
-                                    mActivity!!.addContentView(bannerViewLayout, params)
-                                }
-                                bannerView = AdView(mContext!!)
+                                val decorView = mActivity!!.window.decorView as ViewGroup
+                                decorView.addView(bannerViewLayout, params)
+                                bannerView = AdView(mActivity!!)
                                 setBannerPosition(this.isPosition)
                                 setBannerSiz(this.isSize)
                                 bannerView!!.adUnitId = bannerAdUnitId!!
                                 bannerView!!.adListener = bannerAdListener
                                 bannerView!!.loadAd(buildAdRequest())
-                                adjustWebViewForBanner(this.isPosition)
                                 bannerViewLayout!!.addView(bannerView)
                                 bannerViewLayout!!.bringToFront()
+                                bannerOverlappingToZero()
                             }
                         } catch (e: Exception) {
                             PUBLIC_CALLBACKS!!.error("Error adjusting banner size: " + e.message)
@@ -195,9 +191,15 @@ class emiAdmobPlugin : CordovaPlugin() {
 
             when (orientation) {
                 Configuration.ORIENTATION_PORTRAIT -> {
+                    if (isOverlapping) {
+                        bannerOverlapping()
+                    }
                     cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.orientation.portrait');")
                 }
                 Configuration.ORIENTATION_LANDSCAPE -> {
+                    if (isOverlapping) {
+                        bannerOverlapping()
+                    }
                     cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.orientation.landscape');")
                 }
                 Configuration.ORIENTATION_UNDEFINED -> {
@@ -1071,6 +1073,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                         try {
                             bannerView!!.visibility = View.VISIBLE
                             bannerView!!.resume()
+                           // bannerOverlappingToZero()
 
                             if (isOverlapping) {
                                  bannerOverlapping()
@@ -1362,6 +1365,8 @@ class emiAdmobPlugin : CordovaPlugin() {
                 put("cause", adError.cause?.toString() ?: "null")
             }
 
+            bannerOverlappingToZero()
+
             if (bannerViewLayout != null && bannerView != null) {
                 bannerViewLayout!!.removeView(bannerView)
                 bannerView!!.destroy()
@@ -1439,7 +1444,6 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
 
-
     private fun bannerOverlappingToZero() {
         if (bannerView != null && mActivity != null && cWebView != null) {
             mActivity!!.runOnUiThread {
@@ -1485,7 +1489,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                         val screenHeightInPx = displayMetrics.heightPixels
 
                         // Adjust the WebView height to account for the banner ad
-                        val webViewHeight = screenHeightInPx - (adSize.height+overlappingHeight)
+                        val webViewHeight = screenHeightInPx - (adSize.height + overlappingHeight)
                         val layoutParams = cWebView!!.view.layoutParams
                         layoutParams.height = webViewHeight
                         cWebView!!.view.layoutParams = layoutParams

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "xml.downloadExternalResources.enabled": true
-}