react-native-daro 1.0.7 → 1.0.8

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:8.2.0"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -85,6 +85,7 @@ android {
 repositories {
   mavenCentral()
   google()
+  maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 }
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
@@ -93,7 +94,7 @@ dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
+  implementation "com.facebook.react:react-android:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "so.daro:daro-core:1.3.2"
+  implementation "so.daro:daro-core:1.3.8"
 }

package/android/src/main/java/com/darom/DaroMAdBannerViewManager.kt

@@ -31,25 +31,30 @@ class DaroMAdBannerViewManager : SimpleViewManager<DaroMAdBannerViewContainer>()
     val placement = initialProps?.getString("placement")
     val adUnitId = initialProps?.getString("adUnitId")
 
-    val key = "{$adUnitId}_${placement}"
+    val cacheKey = when {
+      adUnitId.isNullOrBlank() || placement.isNullOrBlank() -> ""
+      else -> "{$adUnitId}_${placement}${reactContext.hashCode()}"
+    }
 
-    if (key.isNotEmpty()) {
-      viewCache.keys.firstOrNull { it.contains(key) }?.let {
-        if (it != key + reactContext.hashCode()) {
-          viewCache.remove(it)
-        }
-      }
+    if (cacheKey.isNotBlank()) {
+      viewCache.keys
+        .filter { it.contains(cacheKey) && it != cacheKey }
+        .forEach { viewCache.remove(it)?.destroy() }
     }
 
-    return key.let {
-      viewCache[it + reactContext.hashCode()].let { view ->
-        view?.id = reactTag
+    return cacheKey.let {
+      viewCache[cacheKey].let { cachedView ->
+        cachedView?.id = reactTag
 
-        if(view?.parent == null) view
-        else null
+        if(cachedView?.parent == null) {
+          cachedView?.resumeAd()
+          cachedView
+        } else {
+          null
+        }
       }
     } ?: super.createViewInstance(reactTag, reactContext, initialProps, stateWrapper).also { view ->
-      if (key.isNotEmpty()) viewCache[key + reactContext.hashCode()] = view
+      if (cacheKey.isNotBlank()) viewCache[cacheKey] = view
     }
   }
 
@@ -72,7 +77,13 @@ class DaroMAdBannerViewManager : SimpleViewManager<DaroMAdBannerViewContainer>()
 
   override fun onDropViewInstance(view: DaroMAdBannerViewContainer) {
     super.onDropViewInstance(view)
-//    view.destroy()
+
+    val isCached = viewCache.values.contains(view)
+    if (isCached) {
+      view.pauseAd()
+    } else {
+      view.destroy()
+    }
   }
 
   @Deprecated("")
@@ -88,6 +99,11 @@ class DaroMAdBannerViewManager : SimpleViewManager<DaroMAdBannerViewContainer>()
     }
   }
 
+  @ReactProp(name = "isVisible")
+  fun setIsVisible(view: DaroMAdBannerViewContainer, isVisible: Boolean) {
+    view.setAdVisibility(isVisible)
+  }
+
   @ReactProp(name = "adUnitId")
   fun setAdUnitId(view: DaroMAdBannerViewContainer, adUnitId: String) {
     view.adUnitId = adUnitId
@@ -107,10 +123,10 @@ class DaroMAdBannerViewManager : SimpleViewManager<DaroMAdBannerViewContainer>()
   fun setPlacement(view: DaroMAdBannerViewContainer, placement: String) {
   }
 
+  @OptIn(ExperimentalStdlibApi::class)
   override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any> {
     return AdViewEvent.entries.associate {
       it.value to mutableMapOf("phasedRegistrationNames" to mutableMapOf("bubbled" to it.key))
     }.toMutableMap()
   }
 }
-

package/android/src/main/java/com/darom/DaroMModule.kt

@@ -20,6 +20,7 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import droom.daro.Daro
+import droom.daro.Daro.SDKConfig
 
 class DaroMModule(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext) {
@@ -39,7 +40,10 @@ class DaroMModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun initializeSdk() {
     Daro.init(
-      application = (context.applicationContext as Application),
+      application = context.applicationContext as Application,
+      sdkConfig = SDKConfig.Builder()
+        .setDebugMode(false)
+        .build()
     )
 
     isInitialized = true
@@ -82,6 +86,7 @@ class DaroMModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  @OptIn(ExperimentalStdlibApi::class)
   internal abstract class DaroMInterstitialModule(context: ReactContext) :
     DaroMComponentModule(context) {
     abstract fun isInterstitialReady(adUnitId: String, promise: Promise)
@@ -96,7 +101,7 @@ class DaroMModule(reactContext: ReactApplicationContext) :
   private val daroMInterstitialModule: DaroMInterstitialModule =
     DaroMInterstitialModuleImpl(
       context = reactContext,
-      getCurrentActivity = { currentActivity }
+      getCurrentActivity = { getCurrentActivity() }
     )
 
   @ReactMethod
@@ -114,6 +119,7 @@ class DaroMModule(reactContext: ReactApplicationContext) :
     daroMInterstitialModule.showInterstitial(adUnitId)
   }
 
+  @OptIn(ExperimentalStdlibApi::class)
   internal abstract class DaroMRewardedModule(context: ReactContext) :
     DaroMComponentModule(context) {
     abstract fun isRewardedAdReady(adUnitId: String, promise: Promise)
@@ -128,7 +134,7 @@ class DaroMModule(reactContext: ReactApplicationContext) :
   private val daroMRewardedModule: DaroMRewardedModule =
     DaroMRewardedAdModuleImpl(
       context = reactContext,
-      getCurrentActivity = { currentActivity }
+      getCurrentActivity = { getCurrentActivity() }
     )
 
   @ReactMethod
@@ -146,6 +152,7 @@ class DaroMModule(reactContext: ReactApplicationContext) :
     daroMRewardedModule.showRewardedAd(adUnitId, customData)
   }
 
+  @OptIn(ExperimentalStdlibApi::class)
   internal abstract class DaroMLightPopupModule(context: ReactContext) :
     DaroMComponentModule(context) {
     abstract fun isLightPopupReady(adUnitId: String, promise: Promise)
@@ -158,9 +165,10 @@ class DaroMModule(reactContext: ReactApplicationContext) :
       return LightPopupEvent.entries.associate { it.value to it.value }.toMutableMap()
     }
   }
+
   private val daroMLightPopupModule: DaroMLightPopupModule = DaroMLightPopupModuleImpl(
     context = reactContext,
-    getCurrentActivity = { currentActivity }
+    getCurrentActivity = { getCurrentActivity() }
   )
 
   @ReactMethod
@@ -183,6 +191,7 @@ class DaroMModule(reactContext: ReactApplicationContext) :
     daroMLightPopupModule.setLightPopupAdConfiguration(adUnitId, configurationMap)
   }
 
+  @OptIn(ExperimentalStdlibApi::class)
   internal abstract class DaroMBannerModule(context: ReactContext) : DaroMComponentModule(context) {
     override fun getComponents(): MutableMap<String, Any> {
       return InternalDaroMBannerSize.entries.associate { it.key to it.name }.toMutableMap()

package/android/src/main/java/com/darom/view/DaroMAdBannerViewContainer.kt

@@ -1,7 +1,9 @@
 package com.darom.view
 
 import android.annotation.SuppressLint
+import android.view.View
 import androidx.core.view.children
+import androidx.core.view.isVisible
 import com.darom.event.AdViewEvent
 import com.darom.util.AdInfoUtil
 import com.darom.util.EventEmitterUtil.sendNativeViewEvent
@@ -27,6 +29,9 @@ class DaroMAdBannerViewContainer(val context: ReactContext) : ReactViewGroup(con
 
   internal var loadOnMount: Boolean = true
 
+  private var isVisible: Boolean = true
+  private var isAdPaused: Boolean = false
+
   fun loadAd() {
     (adView ?: buildAdView())?.apply {
       adView = this
@@ -60,6 +65,32 @@ class DaroMAdBannerViewContainer(val context: ReactContext) : ReactViewGroup(con
     adView?.destroy()
   }
 
+  fun setAdVisibility(visible: Boolean) {
+    isVisible = visible
+    this.isVisible = visible
+    adView?.isVisible = visible
+
+    if (visible) {
+      resumeAd()
+    } else {
+      pauseAd()
+    }
+  }
+
+  fun pauseAd() {
+    if (!isAdPaused) {
+      isAdPaused = true
+      adView?.pause()
+    }
+  }
+
+  fun resumeAd() {
+    if (isAdPaused) {
+      isAdPaused = false
+      adView?.resume()
+    }
+  }
+
   override fun onAdClicked(adInfo: DaroAdInfo) {
     sendNativeViewEvent(
       reactContext = context,

package/ios/Daro+Extensions.swift

@@ -143,6 +143,18 @@ extension UIButton {
     if let colorHex = style["color"] as? String {
       setTitleColor(UIColor(hex: colorHex), for: .normal)
     }
+    if let textAlign = style["textAlign"] as? String {
+      switch textAlign {
+      case "center":
+        self.contentHorizontalAlignment = .center
+      case "right":
+        self.contentHorizontalAlignment = .right
+      case "left":
+        self.contentHorizontalAlignment = .left
+      default:
+        self.contentHorizontalAlignment = .center
+      }
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-daro",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Daro React Native Module for Android and iOS",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",

package/react-native-daro-m.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
-  s.dependency "DaroAds", "1.1.37-beta"
+  s.dependency "DaroAds", "1.1.45"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.