react-native-daro 1.0.4 → 1.0.6

package/android/build.gradle

@@ -95,5 +95,5 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "so.daro:daro-core:1.2.17"
+  implementation "so.daro:daro-core:1.3.2"
 }

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

@@ -76,7 +76,10 @@ class DaroMAdNativeViewContainer(val context: ReactContext) : ReactViewGroup(con
       DaroNativeAdUnit(
         key = adUnitId,
         placement = adUnitId,
-        adBinder = DaroNativeAdBinder
+      )
+    ).also { view ->
+      view.setAdBinder(
+        DaroNativeAdBinder
           .Builder(adViewContainer)
           .let { if (titleViewId != null) it.setTitleViewId(titleViewId!!) else it }
           .let { if (bodyViewId != null) it.setBodyTextViewId(bodyViewId!!) else it }
@@ -85,7 +88,7 @@ class DaroMAdNativeViewContainer(val context: ReactContext) : ReactViewGroup(con
           .let { if (callToActionViewId != null) it.setCallToActionViewId(callToActionViewId!!) else it }
           .build()
       )
-    ).also { view ->
+
       view.setListener(this)
       view.setOnHierarchyChangeListener(
         object : OnHierarchyChangeListener {

package/ios/DaroMModule+LightPopup.swift

@@ -38,11 +38,12 @@ extension DaroMModule {
       reject("LIGHTPOPUP_NOT_LOADED", "LightPopup ad not loaded", nil)
       return
     }
-    DispatchQueue.main.async {
+    executeOnMainThread { [weak self] in
       guard let viewController = UIApplication.shared.windows.first?.rootViewController else {
         reject("VIEW_CONTROLLER_NOT_FOUND", "Root view controller not found", nil)
         return
       }
+      self?.applyStoredConfiguration(to: loadedAd, for: adUnitId)
       loadedAd.show(viewController: viewController)
       resolve(Void())
     }
@@ -60,32 +61,38 @@ extension DaroMModule {
         resolve(Void())
         return
       }
-      executeOnMainThread {
-        let lightPopupConfig = DaroLightPopupConfiguration()
+      executeOnMainThread { [weak self] in
+          self?.applyStoredConfiguration(to: loadedAd, for: adUnitId)
+      }
+      resolve(Void())
+    }
 
-        func setColorIfValid(_ key: String, setter: (UIColor) -> Void) {
-          if let colorString = configuration[key] as? String {
-            setter(UIColor(hex: colorString))
-          }
-        }
+    func applyStoredConfiguration(to ad: DaroLightPopupAd, for unitId: String) {
+        if let configuration = lightPopupConfigurations[unitId] {
+            let lightPopupConfig = DaroLightPopupConfiguration()
 
-        setColorIfValid("backgroundColor") { lightPopupConfig.backgroundColor = $0 }
-        setColorIfValid("cardViewBackgroundColor") { lightPopupConfig.cardViewBackgroundColor = $0 }
-        setColorIfValid("adMarkLabelTextColor") { lightPopupConfig.adMarkLabelTextColor = $0 }
-        setColorIfValid("adMarkLabelBackgroundColor") { lightPopupConfig.adMarkLabelBackgroundColor = $0 }
-        setColorIfValid("closeButtonTextColor") { lightPopupConfig.closeButtonTextColor = $0 }
-        setColorIfValid("titleTextColor") { lightPopupConfig.titleTextColor = $0 }
-        setColorIfValid("bodyTextColor") { lightPopupConfig.bodyTextColor = $0 }
-        setColorIfValid("ctaButtonTextColor") { lightPopupConfig.ctaButtonTextColor = $0 }
-        setColorIfValid("ctaButtonBackgroundColor") { lightPopupConfig.ctaButtonBackgroundColor = $0 }
-
-        if let closeButtonText = configuration["closeButtonText"] as? String {
-          lightPopupConfig.closeButtonText = closeButtonText
-        }
+            func setColorIfValid(_ key: String, setter: (UIColor) -> Void) {
+              if let colorString = configuration[key] as? String {
+                setter(UIColor(hex: colorString))
+              }
+            }
 
-        loadedAd.configuration = lightPopupConfig
-      }
-      resolve(Void())
+            setColorIfValid("backgroundColor") { lightPopupConfig.backgroundColor = $0 }
+            setColorIfValid("cardViewBackgroundColor") { lightPopupConfig.cardViewBackgroundColor = $0 }
+            setColorIfValid("adMarkLabelTextColor") { lightPopupConfig.adMarkLabelTextColor = $0 }
+            setColorIfValid("adMarkLabelBackgroundColor") { lightPopupConfig.adMarkLabelBackgroundColor = $0 }
+            setColorIfValid("closeButtonTextColor") { lightPopupConfig.closeButtonTextColor = $0 }
+            setColorIfValid("titleTextColor") { lightPopupConfig.titleTextColor = $0 }
+            setColorIfValid("bodyTextColor") { lightPopupConfig.bodyTextColor = $0 }
+            setColorIfValid("ctaButtonTextColor") { lightPopupConfig.ctaButtonTextColor = $0 }
+            setColorIfValid("ctaButtonBackgroundColor") { lightPopupConfig.ctaButtonBackgroundColor = $0 }
+
+            if let closeButtonText = configuration["closeButtonText"] as? String {
+              lightPopupConfig.closeButtonText = closeButtonText
+            }
+
+            ad.configuration = lightPopupConfig
+        }
     }
 
   func retrieveLightPopupLoader(for unitId: String) -> DaroLightPopupAdLoader {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-daro",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "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.0.30-beta"
+  s.dependency "DaroAds", "1.1.37"
 
   # 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.