cordova-plugin-admob-nextgen 1.4.9 → 1.6.9

package/README.md

@@ -113,7 +113,7 @@ This plugin is regularly updated to support the latest standards.
 
 | Component | Platform | Version | Release Notes |
 | :--- | :--- | :--- | :--- |
-| **GMA Next-Gen SDK** | Android | **1.1.0** | [View Notes](https://developers.google.com/admob/android/next-gen/rel-notes) |
+| **GMA Next-Gen SDK** | Android | **1.1.1** | [View Notes](https://developers.google.com/admob/android/next-gen/rel-notes) |
 | **UMP SDK** | Android | **4.0.0** | [View Notes](https://developers.google.com/admob/android/privacy/release-notes) |
 | **Mobile Ads SDK** | iOS | **13.3.0** | [View Notes](https://developers.google.com/admob/ios/rel-notes) |
 | **UMP SDK** | iOS | **3.1.0** | [View Notes](https://developers.google.com/ad-manager/mobile-ads-sdk/ios/privacy/download) |

package/capacitor-hook-admob-ids.js

@@ -158,7 +158,7 @@ function run() {
             admob = {
                 APP_ID_ANDROID: appIdAndroid ? appIdAndroid[1] : "ca-app-pub-3940256099942544~3347511713",
                 APP_ID_IOS: appIdIos ? appIdIos[1] : "ca-app-pub-3940256099942544~1458002511",
-                NEXT_GEN_SDK_VERSION: sdk ? sdk[1] : "1.0.1",
+                NEXT_GEN_SDK_VERSION: sdk ? sdk[1] : "1.1.1",
                 UMP_VERSION: ump ? ump[1] : "4.0.0"
             };
         }
@@ -167,7 +167,7 @@ function run() {
         injectExclusionRules();
         if (admob?.NEXT_GEN_SDK_VERSION || admob?.UMP_VERSION) {
             updateGradleDependencies(
-                admob.NEXT_GEN_SDK_VERSION || "1.0.1",
+                admob.NEXT_GEN_SDK_VERSION || "1.1.1",
                 admob.UMP_VERSION || "4.0.0"
             );
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-admob-nextgen",
-  "version": "1.4.9",
+  "version": "1.6.9",
   "description": "Google Mobile Ads Next Gen SDK for Cordova. High performance and modular architecture. ",
   "cordova": {
     "id": "cordova-plugin-admob-nextgen",

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <plugin id="cordova-plugin-admob-nextgen" 
-        version="1.4.9" 
+        version="1.6.9" 
         xmlns="http://apache.org/cordova/ns/plugins/1.0" 
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -53,7 +53,7 @@
         
     </platform>
 
-    <preference name="NEXT_GEN_SDK_VERSION" default="1.1.0" />
+    <preference name="NEXT_GEN_SDK_VERSION" default="1.1.1" />
     <preference name="UMP_VERSION" default="4.0.0" />
     <!-- Sample AdMob app ID: ca-app-pub-3940256099942544~3347511713 -->
     <preference name="APP_ID_ANDROID" default="ca-app-pub-3940256099942544~3347511713" />

package/src/android/AdMobNextGen.java

@@ -96,7 +96,9 @@ public class AdMobNextGen extends CordovaPlugin {
         }
 
         if ("requestConsentInfo".equals(action)) {
-            consentExecutor.requestConsentInfo(args, callbackContext);
+            cordova.getThreadPool().execute(() -> {
+                consentExecutor.requestConsentInfo(args, callbackContext);
+            });
             return true;
         }
         if ("showPrivacyOptionsForm".equals(action)) {
@@ -113,7 +115,9 @@ public class AdMobNextGen extends CordovaPlugin {
         }
 
         if ("initialize".equals(action)) {
-            this.initializeSDK(args, callbackContext);
+            cordova.getThreadPool().execute(() -> {
+                this.initializeSDK(args, callbackContext);
+            });
             return true;
         }
 
@@ -313,7 +317,6 @@ public class AdMobNextGen extends CordovaPlugin {
         return;
     }
 
-    cordova.getThreadPool().execute(() -> {
         try {
             InitializationConfig.Builder initConfigBuilder = new InitializationConfig.Builder(appId);
 
@@ -345,7 +348,6 @@ public class AdMobNextGen extends CordovaPlugin {
         } catch (Exception e) {
             cordova.getActivity().runOnUiThread(() -> callbackContext.error(e.getMessage()));
         }
-    });
 }
 
     private String getAppIdFromManifest() {

package/src/android/ConsentExecutor.java

@@ -39,7 +39,6 @@ public class ConsentExecutor {
     }
 
     public void requestConsentInfo(JSONArray args, CallbackContext callbackContext) {
-        cordova.getThreadPool().execute(() -> {
             try {
                 JSONObject options = args.optJSONObject(0);
 
@@ -122,7 +121,6 @@ public class ConsentExecutor {
             } catch (Exception e) {
                 callbackContext.error("Exception: " + e.getMessage());
             }
-        });
     }
 
     public void getTCData(CallbackContext callbackContext) {

package/src/android/NativeExecutor.java

@@ -305,43 +305,59 @@ public class NativeExecutor {
 
         newNativeAdView.setLayoutParams(params);
 
+        newNativeAdView.setBackgroundColor(Color.WHITE);
+        newNativeAdView.setElevation(8f);
+
+        newNativeAdView.setPadding((int)(10*density), (int)(10*density), (int)(10*density), (int)(10*density));
+
         LinearLayout mainLayout = new LinearLayout(cordova.getActivity());
         mainLayout.setOrientation(LinearLayout.VERTICAL);
-        mainLayout.setBackgroundColor(Color.WHITE);
-        mainLayout.setElevation(8f);
-        mainLayout.setPadding((int)(10*density), (int)(10*density), (int)(10*density), (int)(10*density));
 
         LinearLayout headerLayout = new LinearLayout(cordova.getActivity());
         headerLayout.setOrientation(LinearLayout.HORIZONTAL);
         headerLayout.setGravity(Gravity.CENTER_VERTICAL);
 
+        headerLayout.setLayoutParams(new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
         ImageView iconView = new ImageView(cordova.getActivity());
         if (nativeAd.getIcon() != null) {
             iconView.setImageDrawable(nativeAd.getIcon().getDrawable());
-            headerLayout.addView(iconView, new LinearLayout.LayoutParams((int)(40*density), (int)(40*density)));
+
+            LinearLayout.LayoutParams iconParams = new LinearLayout.LayoutParams(
+                    (int)(40*density), (int)(40*density));
+            iconParams.setMargins(0, 0, (int)(8*density), 0); 
+            headerLayout.addView(iconView, iconParams);
         }
 
         LinearLayout textContainer = new LinearLayout(cordova.getActivity());
         textContainer.setOrientation(LinearLayout.VERTICAL);
-        textContainer.setPadding((int)(10*density), 0, 0, 0);
+
+        LinearLayout.LayoutParams textContainerParams = new LinearLayout.LayoutParams(
+                0, ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f);
 
         TextView headlineView = new TextView(cordova.getActivity());
         headlineView.setText(nativeAd.getHeadline());
         headlineView.setTypeface(null, Typeface.BOLD);
         headlineView.setTextColor(Color.BLACK);
         headlineView.setMaxLines(1);
-        headlineView.setEllipsize(TextUtils.TruncateAt.END);
+        headlineView.setEllipsize(TextUtils.TruncateAt.END); 
         textContainer.addView(headlineView);
 
         TextView adBadge = new TextView(cordova.getActivity());
         adBadge.setText("Ad");
         adBadge.setTextSize(10);
         adBadge.setTextColor(Color.WHITE);
-        adBadge.setBackgroundColor(0xFFFCC133);
+        adBadge.setBackgroundColor(0xFFFCC133); 
         adBadge.setPadding(5, 0, 5, 0);
-        textContainer.addView(adBadge, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 
-        headerLayout.addView(textContainer);
+        LinearLayout.LayoutParams badgeParams = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        badgeParams.topMargin = (int)(2*density); 
+        textContainer.addView(adBadge, badgeParams);
+
+        headerLayout.addView(textContainer, textContainerParams);
+
         mainLayout.addView(headerLayout);
 
         MediaView mediaView = new MediaView(cordova.getActivity());