react-native-daro 1.0.13 → 1.0.16

package/src/types/AdProps.ts

@@ -1,18 +1,17 @@
-import type { AdLoadFailedInfo } from "./AdInfo";
+import type { AdLoadFailedInfo } from './AdInfo';
 
-import type { AdInfo } from "./AdInfo";
+import type { AdInfo } from './AdInfo';
 
 export type AdProps = {
+  adUnitId: string;
 
-    adUnitId: string;
+  placement?: string | null;
 
-    placement?: string | null;
+  onAdLoaded?: (adInfo: AdInfo) => void;
 
-    onAdLoaded?: (adInfo: AdInfo) => void;
+  onAdLoadFailed?: (error: AdLoadFailedInfo) => void;
 
-    onAdLoadFailed?: (error: AdLoadFailedInfo) => void;
+  onAdClicked?: (adInfo: AdInfo) => void;
 
-    onAdClicked?: (adInfo: AdInfo) => void;
-
-    onAdImpressionRecorded?: (adInfo: AdInfo) => void;
+  onAdImpressionRecorded?: (adInfo: AdInfo) => void;
 };

package/src/types/DaroMMobileAds.ts

@@ -1,8 +1,5 @@
-
 export type DaroMMobileAds = {
-
-	isInitialized: () => Promise<boolean>;
-	initialize: (sdkKey: string) => Promise<void>;
-	setUserId: (userId: String) => Promise<void>;
-	
+  isInitialized: () => Promise<boolean>;
+  initialize: (sdkKey: string) => Promise<void>;
+  setUserId: (userId: String) => Promise<void>;
 };

package/src/types/NativeAdViewProps.ts

@@ -1,18 +1,25 @@
 import type { AdProps } from './AdProps';
 
+export type AdChoicesPosition =
+  | 'topLeft'
+  | 'topRight'
+  | 'bottomRight'
+  | 'bottomLeft';
+
 /**
  * A handler of {@link NativeAdView}.
  */
 export type NativeAdViewHandler = {
-	/**
-	 * Loads a native ad.
-	 */
-	loadAd(): void;
+  /**
+   * Loads a native ad.
+   */
+  loadAd(): void;
 };
 
 /**
  * Represents a {@link NativeAdView}.
  */
 export type NativeAdViewProps = AdProps & {
-	loadOnMount?: boolean;
+  loadOnMount?: boolean;
+  adChoicesPosition?: AdChoicesPosition;
 };

package/src/types/index.ts

@@ -2,4 +2,4 @@ export * from './AdInfo';
 export * from './NativeAdViewProps';
 export * from './AdBannerViewProps';
 export * from './AdEvent';
-export * from './AdProps';
+export * from './AdProps';

package/android/gradle.properties

@@ -1,5 +0,0 @@
-DaroM_kotlinVersion=2.0.21
-DaroM_minSdkVersion=23
-DaroM_targetSdkVersion=34
-DaroM_compileSdkVersion=35
-DaroM_ndkversion=21.4.7075529

package/android/src/main/AndroidManifestNew.xml

@@ -1,7 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-  <application>
-    <activity
-      android:name=".cheat.DummyActivity"
-      android:theme="@style/Theme.TransparentActivity" />
-  </application>
-</manifest>

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

@@ -1,136 +0,0 @@
-package com.darom
-
-import com.darom.event.AdViewEvent
-import com.darom.view.DaroMAdBannerViewContainer
-import com.darom.view.DaroMAdNativeViewContainer
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.uimanager.ReactStylesDiffMap
-import com.facebook.react.uimanager.StateWrapper
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewGroupManager
-import com.facebook.react.uimanager.annotations.ReactProp
-
-class DaroMAdNativeViewManager : ViewGroupManager<DaroMAdNativeViewContainer>() {
-
-  override fun getName(): String {
-    return "DaroMNativeAdView"
-  }
-
-  override fun createViewInstance(
-    reactTag: Int,
-    reactContext: ThemedReactContext,
-    initialProps: ReactStylesDiffMap?,
-    stateWrapper: StateWrapper?,
-  ): DaroMAdNativeViewContainer {
-    val placement = initialProps?.getString("placement")
-    val adUnitId = initialProps?.getString("adUnitId")
-
-    val key = "{$adUnitId}_${placement}"
-
-    if (key.isNotEmpty()) {
-      viewCache.keys.firstOrNull { it.contains(key) }?.let {
-        if (it != key + reactContext.hashCode()) {
-          viewCache.remove(it)
-        }
-      }
-    }
-
-    return key.let {
-      viewCache[it + reactContext.hashCode()].let { view ->
-        view?.id = reactTag
-
-        if(view?.parent == null) view.also {
-          it?.applyPrevSetting()
-        }
-
-        else null
-      }
-    } ?: super.createViewInstance(reactTag, reactContext, initialProps, stateWrapper).also {
-      if (key.isNotEmpty()) viewCache[key + reactContext.hashCode()] = it
-    }
-  }
-
-  override fun createViewInstance(context: ThemedReactContext): DaroMAdNativeViewContainer {
-    return DaroMAdNativeViewContainer(context)
-  }
-
-  companion object {
-    private const val COMMAND_LOAD_AD: Int = 1
-
-    private val viewCache: MutableMap<String, DaroMAdNativeViewContainer> = mutableMapOf()
-  }
-
-  override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any> {
-    return AdViewEvent.entries.associate {
-      it.value to mutableMapOf("phasedRegistrationNames" to mutableMapOf("bubbled" to it.key))
-    }.toMutableMap()
-  }
-
-  override fun getCommandsMap(): MutableMap<String, Int> {
-    return mutableMapOf(
-      "loadAd" to COMMAND_LOAD_AD,
-    )
-  }
-
-  @Deprecated("")
-  override fun receiveCommand(
-    root: DaroMAdNativeViewContainer,
-    commandId: Int,
-    args: ReadableArray?,
-  ) {
-    when (commandId) {
-      COMMAND_LOAD_AD -> {
-        root.loadAd()
-      }
-    }
-  }
-
-  @ReactProp(name = "adUnitId")
-  fun setAdUnitId(view: DaroMAdNativeViewContainer, adUnitId: String) {
-    view.adUnitId = adUnitId
-  }
-
-  @ReactProp(name = "loadOnMount")
-  fun setLoadOnMount(view: DaroMAdNativeViewContainer, loadOnMount: Boolean) {
-    view.loadOnMount = loadOnMount
-  }
-
-  @ReactProp(name = "titleView")
-  fun setTitleView(view: DaroMAdNativeViewContainer, value: Int) {
-    view.setTitleView(value)
-  }
-
-  @ReactProp(name = "bodyView")
-  fun setBodyView(view: DaroMAdNativeViewContainer, value: Int) {
-    view.setBodyView(value)
-  }
-
-  @ReactProp(name = "callToActionView")
-  fun setCallToActionView(view: DaroMAdNativeViewContainer, value: Int) {
-    view.setCallToActionView(value)
-  }
-
-  @ReactProp(name = "iconView")
-  fun setIconView(view: DaroMAdNativeViewContainer, value: Int) {
-    view.setIconView(value)
-  }
-
-  @ReactProp(name = "mediaView")
-  fun setMediaView(view: DaroMAdNativeViewContainer, value: Int) {
-    view.setMediaView(value)
-  }
-
-  @ReactProp(name = "placement")
-  fun setPlacement(view: DaroMAdBannerViewContainer, placement: String) {
-  }
-
-  override fun onAfterUpdateTransaction(view: DaroMAdNativeViewContainer) {
-    super.onAfterUpdateTransaction(view)
-    view.onSetProps()
-  }
-
-  override fun onDropViewInstance(view: DaroMAdNativeViewContainer) {
-    super.onDropViewInstance(view)
-//    view.destroy()
-  }
-}

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

@@ -1,203 +0,0 @@
-package com.darom
-
-import android.app.Application
-import android.content.Context
-import com.darom.constants.InternalDaroMBannerSize
-import com.darom.event.DaroMEvent
-import com.darom.event.InterstitialEvent
-import com.darom.event.LightPopupEvent
-import com.darom.event.RewardedEvent
-import com.darom.impl.DaroMBannerViewModuleImpl
-import com.darom.impl.DaroMInterstitialModuleImpl
-import com.darom.impl.DaroMLightPopupModuleImpl
-import com.darom.impl.DaroMRewardedAdModuleImpl
-import com.darom.util.EventEmitterUtil
-import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableMap
-import droom.daro.SDKConfig
-import droom.daro.a.Daro
-
-class DaroMModule(reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(reactContext) {
-
-  companion object {
-    const val NAME = "DaroMModule"
-  }
-
-  override fun getName(): String {
-    return NAME
-  }
-
-  private val context: Context = reactApplicationContext
-
-  private var isInitialized: Boolean = false
-
-  @ReactMethod
-  fun initializeSdk() {
-    Daro.init(
-      application = context.applicationContext as Application,
-      sdkConfig = SDKConfig.Builder()
-        .setDebugMode(false)
-        .build()
-    )
-
-    isInitialized = true
-  }
-
-  @ReactMethod
-  fun isInitialized(promise: Promise) {
-    promise.resolve(isInitialized)
-  }
-
-  @ReactMethod
-  fun showMediationDebugger() {
-    Daro.openDebugger(context)
-  }
-
-  @ReactMethod
-  fun setUserId(userId: String) {
-    Daro.setUserId(context, userId)
-  }
-
-  override fun getConstants(): MutableMap<String, Any>? {
-    val constants = mutableMapOf<String, Any>()
-    constants.putAll(daroMInterstitialModule.getComponents())
-    constants.putAll(daroMRewardedModule.getComponents())
-    constants.putAll(daroMLightPopupModule.getComponents())
-    constants.putAll(daroMBannerModule.getComponents())
-
-    return constants
-  }
-
-  internal abstract class DaroMComponentModule(protected val context: ReactContext) {
-    abstract fun getComponents(): MutableMap<String, Any>
-
-    fun sendNativeEvent(event: DaroMEvent, params: WritableMap?) {
-      EventEmitterUtil.sendReactNativeEvent(
-        reactContext = context,
-        event = event,
-        params = params,
-      )
-    }
-  }
-
-  @OptIn(ExperimentalStdlibApi::class)
-  internal abstract class DaroMInterstitialModule(context: ReactContext) :
-    DaroMComponentModule(context) {
-    abstract fun isInterstitialReady(adUnitId: String, promise: Promise)
-    abstract fun loadInterstitial(adUnitId: String)
-    abstract fun showInterstitial(adUnitId: String)
-
-    override fun getComponents(): MutableMap<String, Any> {
-      return InterstitialEvent.entries.associate { it.value to it.value }.toMutableMap()
-    }
-  }
-
-  private val daroMInterstitialModule: DaroMInterstitialModule =
-    DaroMInterstitialModuleImpl(
-      context = reactContext,
-      getCurrentActivity = { getCurrentActivity() }
-    )
-
-  @ReactMethod
-  fun isInterstitialReady(adUnitId: String, promise: Promise) {
-    daroMInterstitialModule.isInterstitialReady(adUnitId, promise)
-  }
-
-  @ReactMethod
-  fun loadInterstitial(adUnitId: String) {
-    daroMInterstitialModule.loadInterstitial(adUnitId)
-  }
-
-  @ReactMethod
-  fun showInterstitial(adUnitId: String) {
-    daroMInterstitialModule.showInterstitial(adUnitId)
-  }
-
-  @OptIn(ExperimentalStdlibApi::class)
-  internal abstract class DaroMRewardedModule(context: ReactContext) :
-    DaroMComponentModule(context) {
-    abstract fun isRewardedAdReady(adUnitId: String, promise: Promise)
-    abstract fun loadRewardedAd(adUnitId: String)
-    abstract fun showRewardedAd(adUnitId: String, customData: String?)
-
-    override fun getComponents(): MutableMap<String, Any> {
-      return RewardedEvent.entries.associate { it.value to it.value }.toMutableMap()
-    }
-  }
-
-  private val daroMRewardedModule: DaroMRewardedModule =
-    DaroMRewardedAdModuleImpl(
-      context = reactContext,
-      getCurrentActivity = { getCurrentActivity() }
-    )
-
-  @ReactMethod
-  fun isRewardedAdReady(adUnitId: String, promise: Promise) {
-    daroMRewardedModule.isRewardedAdReady(adUnitId, promise)
-  }
-
-  @ReactMethod
-  fun loadRewardedAd(adUnitId: String) {
-    daroMRewardedModule.loadRewardedAd(adUnitId)
-  }
-
-  @ReactMethod
-  fun showRewardedAd(adUnitId: String, customData: String?) {
-    daroMRewardedModule.showRewardedAd(adUnitId, customData)
-  }
-
-  @OptIn(ExperimentalStdlibApi::class)
-  internal abstract class DaroMLightPopupModule(context: ReactContext) :
-    DaroMComponentModule(context) {
-    abstract fun isLightPopupReady(adUnitId: String, promise: Promise)
-    abstract fun loadLightPopup(adUnitId: String)
-    abstract fun showLightPopup(adUnitId: String)
-
-    abstract fun setLightPopupAdConfiguration(adUnitId: String, parameterMap: ReadableMap)
-
-    override fun getComponents(): MutableMap<String, Any> {
-      return LightPopupEvent.entries.associate { it.value to it.value }.toMutableMap()
-    }
-  }
-
-  private val daroMLightPopupModule: DaroMLightPopupModule = DaroMLightPopupModuleImpl(
-    context = reactContext,
-    getCurrentActivity = { getCurrentActivity() }
-  )
-
-  @ReactMethod
-  fun isLightPopupReady(adUnitId: String, promise: Promise) {
-    daroMLightPopupModule.isLightPopupReady(adUnitId, promise)
-  }
-
-  @ReactMethod
-  fun loadLightPopup(adUnitId: String) {
-    daroMLightPopupModule.loadLightPopup(adUnitId)
-  }
-
-  @ReactMethod
-  fun showLightPopup(adUnitId: String) {
-    daroMLightPopupModule.showLightPopup(adUnitId)
-  }
-
-  @ReactMethod
-  fun setLightPopupAdConfiguration(adUnitId: String, configurationMap: ReadableMap) {
-    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()
-    }
-  }
-
-  private val daroMBannerModule: DaroMBannerModule =
-    DaroMBannerViewModuleImpl(context = reactContext)
-}

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

@@ -1,21 +0,0 @@
-package com.darom
-
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
-
-
-class DaroMPackage : ReactPackage {
-
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-    return listOf(DaroMModule(reactContext))
-  }
-
-  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return listOf(
-      DaroMAdBannerViewManager(),
-      DaroMAdNativeViewManager(),
-    )
-  }
-}

package/android/src/main/java/com/darom/util/EventEmitterUtil.kt

@@ -1,24 +0,0 @@
-package com.darom.util
-
-import android.view.View
-import com.darom.event.DaroMEvent
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.facebook.react.uimanager.events.RCTEventEmitter
-
-internal object EventEmitterUtil {
-  // React Native Bridge
-  fun sendReactNativeEvent(reactContext: ReactContext, event: DaroMEvent, params: WritableMap?) {
-    reactContext
-      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      .emit(event.value, params)
-  }
-
-  fun View.sendNativeViewEvent(reactContext: ReactContext, event: DaroMEvent, params: WritableMap?) {
-    reactContext
-      .getJSModule(RCTEventEmitter::class.java)
-      .receiveEvent(id, event.value, params)
-  }
-}
-

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

@@ -1,163 +0,0 @@
-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
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.views.view.ReactViewGroup
-import droom.daro.core.adunit.DaroBannerAdUnit
-import droom.daro.core.model.DaroAdInfo
-import droom.daro.core.model.DaroAdLoadError
-import droom.daro.core.model.DaroBannerSize
-import droom.daro.core.model.DaroViewAd
-import droom.daro.view.DaroAdViewListener
-import droom.daro.view.DaroBannerAdView
-
-@SuppressLint("ViewConstructor")
-class DaroMAdBannerViewContainer(val context: ReactContext) : ReactViewGroup(context),
-  DaroAdViewListener {
-
-  private var adView: DaroBannerAdView? = null
-
-  internal var adUnitId: String = ""
-
-  internal var adSize: DaroBannerSize? = null
-
-  internal var loadOnMount: Boolean = true
-
-  private var isVisible: Boolean = true
-  private var isAdPaused: Boolean = false
-
-  fun loadAd() {
-    (adView ?: buildAdView())?.apply {
-      adView = this
-
-      if (this.parent == null) {
-        this@DaroMAdBannerViewContainer.addView(this)
-      }
-
-      loadAd()
-    }
-  }
-
-  private fun buildAdView(): DaroBannerAdView? {
-    if (adUnitId.isEmpty() || adSize == null) {
-      return null
-    }
-
-    return DaroBannerAdView(
-      context,
-      DaroBannerAdUnit(
-        key = adUnitId,
-        placement = adUnitId,
-        bannerSize = adSize!!,
-      )
-    ).also { view ->
-      view.setListener(this)
-    }
-  }
-
-  fun destroy() {
-    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,
-      event = AdViewEvent.ON_AD_CLICKED,
-      params = AdInfoUtil.getAdInfo(adUnitId, adInfo)
-    )
-  }
-
-  override fun onAdImpression(adInfo: DaroAdInfo) {
-    sendNativeViewEvent(
-      reactContext = context,
-      event = AdViewEvent.ON_AD_IMPRESSION,
-      params = AdInfoUtil.getAdInfo(adUnitId, adInfo),
-    )
-  }
-
-  override fun onAdLoadFail(err: DaroAdLoadError) {
-    sendNativeViewEvent(
-      reactContext = context,
-      event = AdViewEvent.ON_AD_FAILED_TO_LOAD,
-      params = AdInfoUtil.getAdLoadFailedInfo(adUnitId, err),
-    )
-  }
-
-  override fun onAdLoadSuccess(
-    ad: DaroViewAd,
-    adInfo: DaroAdInfo,
-  ) {
-    sendNativeViewEvent(
-      reactContext = context,
-      event = AdViewEvent.ON_AD_LOADED,
-      params = AdInfoUtil.getAdInfo(adUnitId, adInfo),
-    )
-
-    adView?.children?.first()?.let {
-      it.measure(
-        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-      )
-
-      it.layout(0, 0, width, height)
-      it.requestLayout()
-      adView!!.requestLayout()
-    }
-  }
-
-  override fun requestLayout() {
-    super.requestLayout()
-
-    // https://stackoverflow.com/a/39838774/5477988
-    // This is required to ensure ad refreshes render correctly in RN Android due to known issue
-    // where `getWidth()` and `getHeight()` return 0 on attach
-    try {
-      adView?.measure(
-        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-      )
-
-      adView?.layout(0, 0, width, height)
-    } catch (_: Exception) {
-      // Ignore
-    }
-  }
-
-  fun onSetProps() {
-    if (loadOnMount) {
-      loadAd()
-    }
-  }
-}