codeplay-common 4.1.7 → 4.1.9

package/README.md

@@ -11,6 +11,11 @@ Make it to ionic project
 Donate to get full code including many common functions
 https://ko-fi.com/codeplay
 
+Version 4.1.9
+  Added AdMob nextgen validation/default support for "overlappingHeight", "bannerTypeAndroidLandscape", and "bannerTypeiOSLandscape".
+
+Version 4.1.8
+  "consentDebug: false" is added
 
 Version 4.1.7
   admob configuration automatically added.
@@ -81,4 +86,4 @@ Version: 4.0.1
 Version : 4.0.0 (Previous version 3.2.19)
     1) In here we are completly remove the admob-emi and use "capacitor-admob-nextgen"
     2) Removed "modify-plugin-xml.js"
-    3) 
+    3) 

package/files/buildCodeplay/codeplayBeforeBuild-6.2.js

@@ -2739,43 +2739,47 @@ const ADMOB_NEXTGEN_DEFAULTS = {
   VERSION: "1.6",
   ios: { nativeid: "" },
   android: { nativeid: "" },
-  config: {
-    bannerStartupDelayMs: "",
-    interstitialStartupDelayMs: "",
-    appOpenLoadOnColdStart: "",
-    appOpenStartupDelayMs: "",
-    useAndroidPreloadAds: true,
-    useAndroidBannerPreloadAds: false,
-    preloadBufferSize: 1,
-    isKidsApp: false,
-    isTesting: false,
-    consentDebug: false,
-    isConsoleLogEnabled: false,
-    bannerEnabled: true,
-    interstitialEnabled: true,
-    appOpenEnabled: true,
-    rewardVideoEnabled: false,
-    rewardInterstitialEnabled: false,
-    collapsibleEnabled: "",
-    isLandScape: "",
-    isOverlappingEnable: "",
-    bannerTypeAndroid: "",
-    bannerTypeiOS: "",
-    bannerTopSpaceColor: "",
-    interstitialLoadScreenTextColor: "",
-    interstitialLoadScreenBackgroundColor: "",
-    beforeBannerSpace: "",
-    whenShow: "",
-    minimumClick: "",
-    interstitialTimeOut: "",
-    interstitialFirstTimeOut: "",
-    appOpenAdsTimeOut: "",
-    maxRetryCount: "",
-    retrySecondsAr: "",
-    appOpenPerSession: "",
-    interstitialPerSession: "",
-    appOpenFirstTimeOut: ""
-  },
+  config: {
+    bannerStartupDelayMs: "",
+    interstitialStartupDelayMs: "",
+    appOpenLoadOnColdStart: "",
+    appOpenStartupDelayMs: "",
+    useAndroidPreloadAds: true,
+    useAndroidBannerPreloadAds: false,
+    preloadBufferSize: 1,
+    consentDebug: false,
+    isKidsApp: false,
+    isTesting: false,
+    consentDebug: false,
+    isConsoleLogEnabled: false,
+    bannerEnabled: true,
+    interstitialEnabled: true,
+    appOpenEnabled: true,
+    rewardVideoEnabled: false,
+    rewardInterstitialEnabled: false,
+    collapsibleEnabled: "",
+    isLandScape: "",
+    isOverlappingEnable: "",
+    overlappingHeight: "",
+    bannerTypeAndroid: "",
+    bannerTypeAndroidLandscape: "",
+    bannerTypeiOS: "",
+    bannerTypeiOSLandscape: "",
+    bannerTopSpaceColor: "",
+    interstitialLoadScreenTextColor: "",
+    interstitialLoadScreenBackgroundColor: "",
+    beforeBannerSpace: "",
+    whenShow: "",
+    minimumClick: "",
+    interstitialTimeOut: "",
+    interstitialFirstTimeOut: "",
+    appOpenAdsTimeOut: "",
+    maxRetryCount: "",
+    retrySecondsAr: "",
+    appOpenPerSession: "",
+    interstitialPerSession: "",
+    appOpenFirstTimeOut: ""
+  },
   testid: {
     nativeid: "",
     nativeid_android: "ca-app-pub-3940256099942544/2247696110",
@@ -2855,22 +2859,21 @@ const mergeObjects = (template, source) => {
   return output;
 };
 
-const hasObjectKeys = (value) => {
-  return value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length > 0;
-};
-
-const ensureAdmobNextgenConfigDefaults = (config) => {
-  const normalizedConfig = { ...config };
-  const runtimeConfig = hasObjectKeys(config?.config) ? config.config : {};
-
-  normalizedConfig.config = mergeObjects(ADMOB_NEXTGEN_DEFAULTS.config, runtimeConfig);
-  delete normalizedConfig.config.overlappingHeight;
-
-  return normalizedConfig;
-};
-
-const buildNextgenAdmobConfigFromOldConfig = (templateConfig, existingNextgenConfig, oldConfig) => {
-  const mergedConfig = mergeObjects(templateConfig, mergeObjects(existingNextgenConfig, oldConfig));
+const hasObjectKeys = (value) => {
+  return value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length > 0;
+};
+
+const ensureAdmobNextgenConfigDefaults = (config) => {
+  const normalizedConfig = { ...config };
+  const runtimeConfig = hasObjectKeys(config?.config) ? config.config : {};
+
+  normalizedConfig.config = mergeObjects(ADMOB_NEXTGEN_DEFAULTS.config, runtimeConfig);
+
+  return normalizedConfig;
+};
+
+const buildNextgenAdmobConfigFromOldConfig = (templateConfig, existingNextgenConfig, oldConfig) => {
+  const mergedConfig = mergeObjects(templateConfig, mergeObjects(existingNextgenConfig, oldConfig));
 
   if (hasObjectKeys(oldConfig)) {
     if (hasObjectKeys(oldConfig.ios)) {
@@ -2894,12 +2897,12 @@ const buildNextgenAdmobConfigFromOldConfig = (templateConfig, existingNextgenCon
       const existingRuntimeConfig = existingNextgenConfig.config || {};
       mergedConfig.config = mergeObjects(templateRuntimeConfig, mergeObjects(existingRuntimeConfig, oldConfig.config));
     }
-  }
-
-  mergedConfig.VERSION = templateConfig.VERSION || ADMOB_NEXTGEN_DEFAULTS.VERSION;
-
-  return ensureAdmobNextgenConfigDefaults(mergedConfig);
-};
+  }
+
+  mergedConfig.VERSION = templateConfig.VERSION || ADMOB_NEXTGEN_DEFAULTS.VERSION;
+
+  return ensureAdmobNextgenConfigDefaults(mergedConfig);
+};
 
 const syncAdmobNextgenPackage = () => {
   if (!fs.existsSync(packageJsonPath)) {
@@ -2995,16 +2998,16 @@ const ensureAdmobNextgenFiles = async () => {
     }
   }
 
-  let templateConfig = ADMOB_NEXTGEN_DEFAULTS;
-
-  if (await downloadOptionalCodeplayFile(ADMOB_NEXTGEN_CONFIG, tempTemplatePath)) {
-    const downloadedTemplateConfig = JSON.parse(fs.readFileSync(tempTemplatePath, "utf8"));
-    templateConfig = mergeObjects(ADMOB_NEXTGEN_DEFAULTS, downloadedTemplateConfig);
-    templateConfig.VERSION = downloadedTemplateConfig.VERSION || ADMOB_NEXTGEN_DEFAULTS.VERSION;
-    fs.unlinkSync(tempTemplatePath);
-  } else if (fs.existsSync(nextgenConfigPath)) {
-    templateConfig = mergeObjects(ADMOB_NEXTGEN_DEFAULTS, JSON.parse(fs.readFileSync(nextgenConfigPath, "utf8")));
-  }
+  let templateConfig = ADMOB_NEXTGEN_DEFAULTS;
+
+  if (await downloadOptionalCodeplayFile(ADMOB_NEXTGEN_CONFIG, tempTemplatePath)) {
+    const downloadedTemplateConfig = JSON.parse(fs.readFileSync(tempTemplatePath, "utf8"));
+    templateConfig = mergeObjects(ADMOB_NEXTGEN_DEFAULTS, downloadedTemplateConfig);
+    templateConfig.VERSION = downloadedTemplateConfig.VERSION || ADMOB_NEXTGEN_DEFAULTS.VERSION;
+    fs.unlinkSync(tempTemplatePath);
+  } else if (fs.existsSync(nextgenConfigPath)) {
+    templateConfig = mergeObjects(ADMOB_NEXTGEN_DEFAULTS, JSON.parse(fs.readFileSync(nextgenConfigPath, "utf8")));
+  }
 
   const oldConfig = fs.existsSync(oldConfigPath)
     ? JSON.parse(fs.readFileSync(oldConfigPath, "utf8"))
@@ -3623,8 +3626,11 @@ const REQUIRED_CONFIG_KEYS = [
   "collapsibleEnabled",
   "isLandScape",
   "isOverlappingEnable",
+  "overlappingHeight",
   "bannerTypeAndroid",
+  "bannerTypeAndroidLandscape",
   "bannerTypeiOS",
+  "bannerTypeiOSLandscape",
   "bannerTopSpaceColor",
   "interstitialLoadScreenTextColor",
   "interstitialLoadScreenBackgroundColor",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "4.1.7",
+  "version": "4.1.9",
   "description": "Common build scripts and files",
   "scripts": {
 	"postinstall": "node scripts/sync-files.js",