react-native-daro 1.0.12 → 1.0.15

package/android/src/main/java/com/{darom → daro/reactnative}/impl/DaroMLightPopupModuleImpl.kt

@@ -1,10 +1,10 @@
-package com.darom.impl
+package com.daro.reactnative.impl
 
 import android.app.Activity
 import androidx.core.graphics.toColorInt
-import com.darom.DaroMModule
-import com.darom.event.LightPopupEvent
-import com.darom.util.AdInfoUtil
+import com.daro.reactnative.DaroMModule
+import com.daro.reactnative.event.LightPopupEvent
+import com.daro.reactnative.util.AdInfoUtil
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
@@ -26,21 +26,22 @@ internal class DaroMLightPopupModuleImpl(
   private val currentActivity: Activity?
     get() = getCurrentActivity()
 
-  private val lightpopupAdMap: MutableMap<String, DaroLightPopupAd> = mutableMapOf()
-  private val optionMap: MutableMap<String, DaroLightPopupAdOptions> = mutableMapOf()
-  private val loaderMap: MutableMap<String, DaroLightPopupAdLoader> = mutableMapOf()
+  private val lightpopupAdMap: MutableMap<Int, DaroLightPopupAd> = mutableMapOf()
+  private val optionMap: MutableMap<Int, DaroLightPopupAdOptions> = mutableMapOf()
+  private val loaderMap: MutableMap<Int, DaroLightPopupAdLoader> = mutableMapOf()
 
-  override fun isLightPopupReady(adUnitId: String, promise: Promise) {
-    promise.resolve(retrieveAd(adUnitId) != null)
+  override fun isLightPopupReady(requestId: Int, adUnitId: String, promise: Promise) {
+    promise.resolve(retrieveAd(requestId) != null)
   }
 
-  override fun loadLightPopup(adUnitId: String) {
+  override fun loadLightPopup(requestId: Int, adUnitId: String) {
     context.runOnUiQueueThread {
-      retrieveLoader(adUnitId).load()
+      retrieveLoader(requestId, adUnitId).load()
     }
   }
 
   override fun setLightPopupAdConfiguration(
+    requestId: Int,
     adUnitId: String,
     parameterMap: ReadableMap,
   ) {
@@ -66,48 +67,48 @@ internal class DaroMLightPopupModuleImpl(
       )
     }
 
-    optionMap[adUnitId] = newOption
+    optionMap[requestId] = newOption
   }
 
-  override fun showLightPopup(adUnitId: String) {
+  override fun showLightPopup(requestId: Int, adUnitId: String) {
     currentActivity?.let {
       it.runOnUiThread {
-        retrieveAd(adUnitId)?.apply {
+        retrieveAd(requestId)?.apply {
           setListener(object : DaroLightPopupAdListener {
             override fun onDismiss(ad: DaroAdInfo) {
               sendNativeEvent(
                 event = LightPopupEvent.ON_LIGHTPOPUP_HIDDEN_EVENT,
-                params = AdInfoUtil.getAdInfo(adUnitId, ad),
+                params = AdInfoUtil.getAdInfo(requestId, adUnitId, ad),
               )
             }
 
             override fun onFailedToShow(ad: DaroAdInfo, error: DaroAdDisplayFailError) {
               sendNativeEvent(
                 event = LightPopupEvent.ON_LIGHTPOPUP_AD_FAILED_TO_DISPLAY_EVENT,
-                params = AdInfoUtil.getAdDisplayFailedInfo(adUnitId, ad, error),
+                params = AdInfoUtil.getAdDisplayFailedInfo(requestId, adUnitId, ad, error),
               )
             }
 
             override fun onShown(ad: DaroAdInfo) {
               sendNativeEvent(
                 event = LightPopupEvent.ON_LIGHTPOPUP_DISPLAYED_EVENT,
-                params = AdInfoUtil.getAdInfo(adUnitId, ad),
+                params = AdInfoUtil.getAdInfo(requestId, adUnitId, ad),
               )
 
-              lightpopupAdMap.remove(adUnitId)
+              lightpopupAdMap.remove(requestId)
             }
 
             override fun onAdClicked(responseInfo: DaroAdInfo) {
               sendNativeEvent(
                 event = LightPopupEvent.ON_LIGHTPOPUP_CLICKED_EVENT,
-                params = AdInfoUtil.getAdInfo(adUnitId, responseInfo),
+                params = AdInfoUtil.getAdInfo(requestId, adUnitId, responseInfo),
               )
             }
 
             override fun onAdImpression(responseInfo: DaroAdInfo) {
               sendNativeEvent(
                 event = LightPopupEvent.ON_LIGHTPOPUP_AD_IMPRESSION_RECORDED,
-                params = AdInfoUtil.getAdInfo(adUnitId, responseInfo),
+                params = AdInfoUtil.getAdInfo(requestId, adUnitId, responseInfo),
               )
             }
           })
@@ -118,32 +119,32 @@ internal class DaroMLightPopupModuleImpl(
     }
   }
 
-  private fun retrieveLoader(adUnitId: String): DaroLightPopupAdLoader {
-    return loaderMap[adUnitId] ?: DaroLightPopupAdLoader(
+  private fun retrieveLoader(requestId: Int, adUnitId: String): DaroLightPopupAdLoader {
+    return loaderMap[requestId] ?: DaroLightPopupAdLoader(
       context,
-      DaroLightPopupAdUnit(adUnitId, adUnitId, optionMap[adUnitId] ?: DaroLightPopupAdOptions())
+      DaroLightPopupAdUnit(adUnitId, adUnitId, optionMap[requestId] ?: DaroLightPopupAdOptions())
     ).also {
-      loaderMap[adUnitId] = it
+      loaderMap[requestId] = it
       it.setListener(object : DaroLightPopupAdLoaderListener {
         override fun onAdLoadSuccess(ad: DaroLightPopupAd, responseInfo: DaroAdInfo) {
-          lightpopupAdMap[adUnitId] = ad
+          lightpopupAdMap[requestId] = ad
           sendNativeEvent(
             event = LightPopupEvent.ON_LIGHTPOPUP_LOADED_EVENT,
-            params = AdInfoUtil.getAdInfo(adUnitId, responseInfo),
+            params = AdInfoUtil.getAdInfo(requestId, adUnitId, responseInfo),
           )
         }
 
         override fun onAdLoadFail(err: DaroAdLoadError) {
           sendNativeEvent(
             event = LightPopupEvent.ON_LIGHTPOPUP_LOAD_FAILED_EVENT,
-            params = AdInfoUtil.getAdLoadFailedInfo(adUnitId, err),
+            params = AdInfoUtil.getAdLoadFailedInfo(requestId, adUnitId, err),
           )
         }
       })
     }
   }
 
-  private fun retrieveAd(adUnitId: String): DaroLightPopupAd? {
-    return lightpopupAdMap[adUnitId]
+  private fun retrieveAd(requestId: Int): DaroLightPopupAd? {
+    return lightpopupAdMap[requestId]
   }
 }

package/android/src/main/java/com/{darom → daro/reactnative}/impl/DaroMRewardedAdModuleImpl.kt

@@ -1,9 +1,9 @@
-package com.darom.impl
+package com.daro.reactnative.impl
 
 import android.app.Activity
-import com.darom.DaroMModule
-import com.darom.event.RewardedEvent
-import com.darom.util.AdInfoUtil
+import com.daro.reactnative.DaroMModule
+import com.daro.reactnative.event.RewardedEvent
+import com.daro.reactnative.util.AdInfoUtil
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import droom.daro.core.adunit.DaroRewardedAdUnit
@@ -23,33 +23,39 @@ internal class DaroMRewardedAdModuleImpl(
   private val currentActivity: Activity?
     get() = getCurrentActivity()
 
-  private val rewardedAdMap: MutableMap<String, DaroRewardedAd> = mutableMapOf()
-  private val loaderMap: MutableMap<String, DaroRewardedAdLoader> = mutableMapOf()
+  private val rewardedAdMap: MutableMap<Int, DaroRewardedAd> = mutableMapOf()
+  private val loaderMap: MutableMap<Int, DaroRewardedAdLoader> = mutableMapOf()
 
-  override fun isRewardedAdReady(adUnitId: String, promise: Promise) {
-    promise.resolve(retrieveAd(adUnitId) != null)
+  override fun isRewardedAdReady(requestId: Int, adUnitId: String, promise: Promise) {
+    promise.resolve(retrieveAd(requestId) != null)
   }
 
-  override fun loadRewardedAd(adUnitId: String) {
-    retrieveLoader(adUnitId).load()
+  override fun loadRewardedAd(requestId: Int, adUnitId: String) {
+    retrieveLoader(requestId, adUnitId).load()
   }
 
-  override fun showRewardedAd(adUnitId: String, customData: String?) {
+  override fun showRewardedAd(requestId: Int, adUnitId: String, customData: String?) {
     currentActivity?.let { activity ->
-      retrieveAd(adUnitId)?.apply {
+      retrieveAd(requestId)?.apply {
         setListener(object : DaroRewardedAdListener {
           override fun onAdImpression(adInfo: DaroAdInfo) {
-            super.onAdImpression(adInfo)
+            sendNativeEvent(
+              event = RewardedEvent.ON_REWARDED_AD_IMPRESSION_RECORDED,
+              params = AdInfoUtil.getAdInfo(requestId, adUnitId, adInfo),
+            )
           }
 
           override fun onAdClicked(adInfo: DaroAdInfo) {
-            super.onAdClicked(adInfo)
+            sendNativeEvent(
+              event = RewardedEvent.ON_REWARDED_AD_CLICKED_EVENT,
+              params = AdInfoUtil.getAdInfo(requestId, adUnitId, adInfo),
+            )
           }
 
           override fun onDismiss(adInfo: DaroAdInfo) {
             sendNativeEvent(
               event = RewardedEvent.ON_REWARDED_AD_HIDDEN_EVENT,
-              params = AdInfoUtil.getAdInfo(adUnitId, adInfo),
+              params = AdInfoUtil.getAdInfo(requestId, adUnitId, adInfo),
             )
           }
 
@@ -59,7 +65,7 @@ internal class DaroMRewardedAdModuleImpl(
           ) {
             sendNativeEvent(
               event = RewardedEvent.ON_REWARDED_AD_RECEIVED_REWARD_EVENT,
-              params = AdInfoUtil.getRewardInfo(adUnitId, rewardItem),
+              params = AdInfoUtil.getRewardInfo(requestId, adUnitId, rewardItem),
             )
           }
 
@@ -69,17 +75,17 @@ internal class DaroMRewardedAdModuleImpl(
           ) {
             sendNativeEvent(
               event = RewardedEvent.ON_REWARDED_AD_FAILED_TO_DISPLAY_EVENT,
-              params = AdInfoUtil.getAdDisplayFailedInfo(adUnitId, adInfo, error),
+              params = AdInfoUtil.getAdDisplayFailedInfo(requestId, adUnitId, adInfo, error),
             )
           }
 
           override fun onShown(adInfo: DaroAdInfo) {
             sendNativeEvent(
               event = RewardedEvent.ON_REWARDED_AD_DISPLAYED_EVENT,
-              params = AdInfoUtil.getAdInfo(adUnitId, adInfo),
+              params = AdInfoUtil.getAdInfo(requestId, adUnitId, adInfo),
             )
 
-            rewardedAdMap.remove(adUnitId)
+            rewardedAdMap.remove(requestId)
           }
         })
 
@@ -91,18 +97,18 @@ internal class DaroMRewardedAdModuleImpl(
     }
   }
 
-  private fun retrieveLoader(adUnitId: String): DaroRewardedAdLoader {
-    return loaderMap[adUnitId] ?: DaroRewardedAdLoader(
+  private fun retrieveLoader(requestId: Int, adUnitId: String): DaroRewardedAdLoader {
+    return loaderMap[requestId] ?: DaroRewardedAdLoader(
       context,
       DaroRewardedAdUnit(adUnitId, adUnitId)
     ).also {
-      loaderMap[adUnitId] = it
+      loaderMap[requestId] = it
       it.setListener(
         object : DaroRewardedAdLoaderListener {
           override fun onAdLoadFail(err: DaroAdLoadError) {
             sendNativeEvent(
               event = RewardedEvent.ON_REWARDED_AD_LOAD_FAILED_EVENT,
-              params = AdInfoUtil.getAdLoadFailedInfo(adUnitId, err),
+              params = AdInfoUtil.getAdLoadFailedInfo(requestId, adUnitId, err),
             )
           }
 
@@ -110,11 +116,11 @@ internal class DaroMRewardedAdModuleImpl(
             ad: DaroRewardedAd,
             adInfo: DaroAdInfo,
           ) {
-            rewardedAdMap[adUnitId] = ad
+            rewardedAdMap[requestId] = ad
 
             sendNativeEvent(
               event = RewardedEvent.ON_REWARDED_AD_LOADED_EVENT,
-              params = AdInfoUtil.getAdInfo(adUnitId, adInfo),
+              params = AdInfoUtil.getAdInfo(requestId, adUnitId, adInfo),
             )
           }
         }
@@ -122,7 +128,7 @@ internal class DaroMRewardedAdModuleImpl(
     }
   }
 
-  private fun retrieveAd(adUnitId: String): DaroRewardedAd? {
-    return rewardedAdMap[adUnitId]
+  private fun retrieveAd(requestId: Int): DaroRewardedAd? {
+    return rewardedAdMap[requestId]
   }
 }

package/android/src/main/java/com/{darom → daro/reactnative}/util/AdInfoUtil.kt

@@ -1,4 +1,4 @@
-package com.darom.util
+package com.daro.reactnative.util
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
@@ -16,6 +16,12 @@ internal object AdInfoUtil {
     return adInfo
   }
 
+  fun getAdInfo(requestId: Int, adUnitId: String, ad: DaroAdInfo): WritableMap {
+    val adInfo = getAdInfo(adUnitId, ad)
+    adInfo.putInt("requestId", requestId)
+    return adInfo
+  }
+
   fun getAdLoadFailedInfo(adUnitId: String?, error: DaroAdLoadError?): WritableMap {
     val errInfo = Arguments.createMap()
     errInfo.putString("adUnitId", adUnitId)
@@ -31,6 +37,12 @@ internal object AdInfoUtil {
     return errInfo
   }
 
+  fun getAdLoadFailedInfo(requestId: Int, adUnitId: String?, error: DaroAdLoadError?): WritableMap {
+    val errInfo = getAdLoadFailedInfo(adUnitId, error)
+    errInfo.putInt("requestId", requestId)
+    return errInfo
+  }
+
   fun getAdDisplayFailedInfo(adUnitId: String, ad: DaroAdInfo, error: DaroAdDisplayFailError): WritableMap {
     val info = getAdInfo(adUnitId, ad)
 
@@ -39,6 +51,12 @@ internal object AdInfoUtil {
     return info
   }
 
+  fun getAdDisplayFailedInfo(requestId: Int, adUnitId: String, ad: DaroAdInfo, error: DaroAdDisplayFailError): WritableMap {
+    val info = getAdDisplayFailedInfo(adUnitId, ad, error)
+    info.putInt("requestId", requestId)
+    return info
+  }
+
   fun getRewardInfo(adUnitId: String, reward: DaroRewardedAd.DaroRewardedItem): WritableMap {
     val adInfo = Arguments.createMap()
 
@@ -48,4 +66,10 @@ internal object AdInfoUtil {
 
     return adInfo
   }
+
+  fun getRewardInfo(requestId: Int, adUnitId: String, reward: DaroRewardedAd.DaroRewardedItem): WritableMap {
+    val info = getRewardInfo(adUnitId, reward)
+    info.putInt("requestId", requestId)
+    return info
+  }
 }

package/android/src/main/java/com/{darom → daro/reactnative}/util/EventEmitterUtil.kt

@@ -1,7 +1,7 @@
-package com.darom.util
+package com.daro.reactnative.util
 
 import android.view.View
-import com.darom.event.DaroMEvent
+import com.daro.reactnative.event.DaroMEvent
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule