cloudx-react-native 2.0.0-beta.1 → 2.2.3

package/android/src/{newarch/com/cloudxreactnative/CloudXReactNativePackage.kt → main/java/com/cloudxreactnative/CloudXPackage.kt}

@@ -1,37 +1,38 @@
 package com.cloudxreactnative
 
-import com.facebook.react.BaseReactPackage
+import com.facebook.react.TurboReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 
-class CloudXReactNativePackage : BaseReactPackage() {
-    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-        return when (name) {
-            CloudXReactNativeModuleImpl.MODULE_NAME -> CloudXReactNativeModule(reactContext)
-            else -> null
-        }
+class CloudXPackage : TurboReactPackage() {
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        return emptyList()
     }
 
     override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
         return ReactModuleInfoProvider {
+            val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
             mapOf(
-                CloudXReactNativeModuleImpl.MODULE_NAME to ReactModuleInfo(
-                    CloudXReactNativeModuleImpl.MODULE_NAME,
-                    CloudXReactNativeModule::class.java.name,
+                CloudXModuleImpl.MODULE_NAME to ReactModuleInfo(
+                    CloudXModuleImpl.MODULE_NAME,
+                    CloudXModuleImpl.MODULE_NAME,
                     false, // canOverrideExistingModule
                     false, // needsEagerInit
                     true,  // hasConstants
                     false, // isCxxModule
-                    true   // isTurboModule
+                    isTurboModule
                 )
             )
         }
     }
 
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return listOf(CloudXBannerViewManager())
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+        return when (name) {
+            CloudXModuleImpl.MODULE_NAME -> CloudXModule(reactContext)
+            else -> null
+        }
     }
 }

package/android/src/newarch/com/cloudxreactnative/{CloudXReactNativeModule.kt → CloudXModule.kt}

@@ -1,29 +1,21 @@
 package com.cloudxreactnative
 
-import com.facebook.fbreact.specs.NativeCloudXModuleSpec
+import com.facebook.fbreact.specs.NativeCloudXSpec
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 
-class CloudXReactNativeModule(reactContext: ReactApplicationContext) :
-    NativeCloudXModuleSpec(reactContext) {
+@ReactModule(name = CloudXModuleImpl.MODULE_NAME)
+class CloudXModule(reactContext: ReactApplicationContext) :
+    NativeCloudXSpec(reactContext) {
 
-    private val impl = CloudXReactNativeModuleImpl(reactContext)
+    private val impl = CloudXModuleImpl(reactContext)
 
-    override fun getName(): String = CloudXReactNativeModuleImpl.MODULE_NAME
+    override fun getName(): String = CloudXModuleImpl.MODULE_NAME
 
-    override fun getTypedExportedConstants(): MutableMap<String, Any> = impl.getConstants()
-
-    override fun onCatalystInstanceDestroy() {
-        super.onCatalystInstanceDestroy()
-        impl.onCatalystInstanceDestroy()
-    }
-
-    @ReactMethod override fun addListener(eventName: String) {}
-    @ReactMethod override fun removeListeners(count: Double) {}
-
-    @ReactMethod override fun initialize(pluginVersion: String, appKey: String, promise: Promise) = impl.initialize(pluginVersion, appKey, promise)
     @ReactMethod override fun isInitialized(promise: Promise) = impl.isInitialized(promise)
+    @ReactMethod override fun initialize(pluginVersion: String, appKey: String, promise: Promise) = impl.initialize(pluginVersion, appKey, promise)
     @ReactMethod override fun isTablet(promise: Promise) = impl.isTablet(promise)
     @ReactMethod override fun getVersion(promise: Promise) = impl.getVersion(promise)
 
@@ -37,29 +29,29 @@ class CloudXReactNativeModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod override fun createBanner(adUnitId: String, position: String) = impl.createBanner(adUnitId, position)
     @ReactMethod override fun createBannerWithOffsets(adUnitId: String, position: String, xOffset: Double, yOffset: Double) = impl.createBannerWithOffsets(adUnitId, position, xOffset, yOffset)
-    @ReactMethod override fun showBanner(adUnitId: String) = impl.showBanner(adUnitId)
-    @ReactMethod override fun hideBanner(adUnitId: String) = impl.hideBanner(adUnitId)
-    @ReactMethod override fun destroyBanner(adUnitId: String) = impl.destroyBanner(adUnitId)
+    @ReactMethod override fun setBannerBackgroundColor(adUnitId: String, hexColorString: String) = impl.setBannerBackgroundColor(adUnitId, hexColorString)
     @ReactMethod override fun setBannerPlacement(adUnitId: String, placement: String?) = impl.setBannerPlacement(adUnitId, placement)
     @ReactMethod override fun setBannerCustomData(adUnitId: String, customData: String?) = impl.setBannerCustomData(adUnitId, customData)
-    @ReactMethod override fun startBannerAutoRefresh(adUnitId: String) = impl.startBannerAutoRefresh(adUnitId)
-    @ReactMethod override fun stopBannerAutoRefresh(adUnitId: String) = impl.stopBannerAutoRefresh(adUnitId)
     @ReactMethod override fun updateBannerPosition(adUnitId: String, position: String) = impl.updateBannerPosition(adUnitId, position)
     @ReactMethod override fun updateBannerOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = impl.updateBannerOffsets(adUnitId, xOffset, yOffset)
-    @ReactMethod override fun setBannerBackgroundColor(adUnitId: String, hexColorString: String) = impl.setBannerBackgroundColor(adUnitId, hexColorString)
+    @ReactMethod override fun startBannerAutoRefresh(adUnitId: String) = impl.startBannerAutoRefresh(adUnitId)
+    @ReactMethod override fun stopBannerAutoRefresh(adUnitId: String) = impl.stopBannerAutoRefresh(adUnitId)
+    @ReactMethod override fun showBanner(adUnitId: String) = impl.showBanner(adUnitId)
+    @ReactMethod override fun hideBanner(adUnitId: String) = impl.hideBanner(adUnitId)
+    @ReactMethod override fun destroyBanner(adUnitId: String) = impl.destroyBanner(adUnitId)
 
-    @ReactMethod override fun createMRec(adUnitId: String, position: String) = impl.createMRec(adUnitId, position)
-    @ReactMethod override fun createMRecWithOffsets(adUnitId: String, position: String, xOffset: Double, yOffset: Double) = impl.createMRecWithOffsets(adUnitId, position, xOffset, yOffset)
-    @ReactMethod override fun showMRec(adUnitId: String) = impl.showMRec(adUnitId)
-    @ReactMethod override fun hideMRec(adUnitId: String) = impl.hideMRec(adUnitId)
-    @ReactMethod override fun destroyMRec(adUnitId: String) = impl.destroyMRec(adUnitId)
-    @ReactMethod override fun setMRecPlacement(adUnitId: String, placement: String?) = impl.setMRecPlacement(adUnitId, placement)
-    @ReactMethod override fun setMRecCustomData(adUnitId: String, customData: String?) = impl.setMRecCustomData(adUnitId, customData)
-    @ReactMethod override fun startMRecAutoRefresh(adUnitId: String) = impl.startMRecAutoRefresh(adUnitId)
-    @ReactMethod override fun stopMRecAutoRefresh(adUnitId: String) = impl.stopMRecAutoRefresh(adUnitId)
-    @ReactMethod override fun updateMRecPosition(adUnitId: String, position: String) = impl.updateMRecPosition(adUnitId, position)
-    @ReactMethod override fun updateMRecOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = impl.updateMRecOffsets(adUnitId, xOffset, yOffset)
-    @ReactMethod override fun setMRecBackgroundColor(adUnitId: String, hexColorString: String) = impl.setMRecBackgroundColor(adUnitId, hexColorString)
+    @ReactMethod override fun createMREC(adUnitId: String, position: String) = impl.createMREC(adUnitId, position)
+    @ReactMethod override fun createMRECWithOffsets(adUnitId: String, position: String, xOffset: Double, yOffset: Double) = impl.createMRECWithOffsets(adUnitId, position, xOffset, yOffset)
+    @ReactMethod override fun setMRECPlacement(adUnitId: String, placement: String?) = impl.setMRECPlacement(adUnitId, placement)
+    @ReactMethod override fun setMRECCustomData(adUnitId: String, customData: String?) = impl.setMRECCustomData(adUnitId, customData)
+    @ReactMethod override fun updateMRECPosition(adUnitId: String, position: String) = impl.updateMRECPosition(adUnitId, position)
+    @ReactMethod override fun updateMRECOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = impl.updateMRECOffsets(adUnitId, xOffset, yOffset)
+    @ReactMethod override fun startMRECAutoRefresh(adUnitId: String) = impl.startMRECAutoRefresh(adUnitId)
+    @ReactMethod override fun stopMRECAutoRefresh(adUnitId: String) = impl.stopMRECAutoRefresh(adUnitId)
+    @ReactMethod override fun showMREC(adUnitId: String) = impl.showMREC(adUnitId)
+    @ReactMethod override fun hideMREC(adUnitId: String) = impl.hideMREC(adUnitId)
+    @ReactMethod override fun destroyMREC(adUnitId: String) = impl.destroyMREC(adUnitId)
+    @ReactMethod override fun setMRECBackgroundColor(adUnitId: String, hexColorString: String) = impl.setMRECBackgroundColor(adUnitId, hexColorString)
 
     @ReactMethod override fun loadInterstitial(adUnitId: String) = impl.loadInterstitial(adUnitId)
     @ReactMethod override fun isInterstitialReady(adUnitId: String, promise: Promise) = impl.isInterstitialReady(adUnitId, promise)
@@ -70,4 +62,9 @@ class CloudXReactNativeModule(reactContext: ReactApplicationContext) :
     @ReactMethod override fun isRewardedReady(adUnitId: String, promise: Promise) = impl.isRewardedReady(adUnitId, promise)
     @ReactMethod override fun showRewarded(adUnitId: String, placement: String?, customData: String?) = impl.showRewarded(adUnitId, placement, customData)
     @ReactMethod override fun destroyRewarded(adUnitId: String) = impl.destroyRewarded(adUnitId)
+
+    @ReactMethod override fun addListener(eventName: String) {}
+    @ReactMethod override fun removeListeners(count: Double) {}
+
+    override fun getTypedExportedConstants(): MutableMap<String, Any> = impl.getConstants()
 }

package/android/src/oldarch/com/cloudxreactnative/{CloudXReactNativeModule.kt → CloudXModule.kt}

@@ -5,25 +5,15 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 
-class CloudXReactNativeModule(reactContext: ReactApplicationContext) :
+class CloudXModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
 
-    private val impl = CloudXReactNativeModuleImpl(reactContext)
+    private val impl = CloudXModuleImpl(reactContext)
 
-    override fun getName(): String = CloudXReactNativeModuleImpl.MODULE_NAME
+    override fun getName(): String = CloudXModuleImpl.MODULE_NAME
 
-    override fun getConstants(): MutableMap<String, Any> = impl.getConstants()
-
-    override fun onCatalystInstanceDestroy() {
-        super.onCatalystInstanceDestroy()
-        impl.onCatalystInstanceDestroy()
-    }
-
-    @ReactMethod fun addListener(eventName: String) {}
-    @ReactMethod fun removeListeners(count: Double) {}
-
-    @ReactMethod fun initialize(pluginVersion: String, appKey: String, promise: Promise) = impl.initialize(pluginVersion, appKey, promise)
     @ReactMethod fun isInitialized(promise: Promise) = impl.isInitialized(promise)
+    @ReactMethod fun initialize(pluginVersion: String, appKey: String, promise: Promise) = impl.initialize(pluginVersion, appKey, promise)
     @ReactMethod fun isTablet(promise: Promise) = impl.isTablet(promise)
     @ReactMethod fun getVersion(promise: Promise) = impl.getVersion(promise)
 
@@ -37,29 +27,29 @@ class CloudXReactNativeModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod fun createBanner(adUnitId: String, position: String) = impl.createBanner(adUnitId, position)
     @ReactMethod fun createBannerWithOffsets(adUnitId: String, position: String, xOffset: Double, yOffset: Double) = impl.createBannerWithOffsets(adUnitId, position, xOffset, yOffset)
-    @ReactMethod fun showBanner(adUnitId: String) = impl.showBanner(adUnitId)
-    @ReactMethod fun hideBanner(adUnitId: String) = impl.hideBanner(adUnitId)
-    @ReactMethod fun destroyBanner(adUnitId: String) = impl.destroyBanner(adUnitId)
+    @ReactMethod fun setBannerBackgroundColor(adUnitId: String, hexColorString: String) = impl.setBannerBackgroundColor(adUnitId, hexColorString)
     @ReactMethod fun setBannerPlacement(adUnitId: String, placement: String?) = impl.setBannerPlacement(adUnitId, placement)
     @ReactMethod fun setBannerCustomData(adUnitId: String, customData: String?) = impl.setBannerCustomData(adUnitId, customData)
-    @ReactMethod fun startBannerAutoRefresh(adUnitId: String) = impl.startBannerAutoRefresh(adUnitId)
-    @ReactMethod fun stopBannerAutoRefresh(adUnitId: String) = impl.stopBannerAutoRefresh(adUnitId)
     @ReactMethod fun updateBannerPosition(adUnitId: String, position: String) = impl.updateBannerPosition(adUnitId, position)
     @ReactMethod fun updateBannerOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = impl.updateBannerOffsets(adUnitId, xOffset, yOffset)
-    @ReactMethod fun setBannerBackgroundColor(adUnitId: String, hexColorString: String) = impl.setBannerBackgroundColor(adUnitId, hexColorString)
+    @ReactMethod fun startBannerAutoRefresh(adUnitId: String) = impl.startBannerAutoRefresh(adUnitId)
+    @ReactMethod fun stopBannerAutoRefresh(adUnitId: String) = impl.stopBannerAutoRefresh(adUnitId)
+    @ReactMethod fun showBanner(adUnitId: String) = impl.showBanner(adUnitId)
+    @ReactMethod fun hideBanner(adUnitId: String) = impl.hideBanner(adUnitId)
+    @ReactMethod fun destroyBanner(adUnitId: String) = impl.destroyBanner(adUnitId)
 
-    @ReactMethod fun createMRec(adUnitId: String, position: String) = impl.createMRec(adUnitId, position)
-    @ReactMethod fun createMRecWithOffsets(adUnitId: String, position: String, xOffset: Double, yOffset: Double) = impl.createMRecWithOffsets(adUnitId, position, xOffset, yOffset)
-    @ReactMethod fun showMRec(adUnitId: String) = impl.showMRec(adUnitId)
-    @ReactMethod fun hideMRec(adUnitId: String) = impl.hideMRec(adUnitId)
-    @ReactMethod fun destroyMRec(adUnitId: String) = impl.destroyMRec(adUnitId)
-    @ReactMethod fun setMRecPlacement(adUnitId: String, placement: String?) = impl.setMRecPlacement(adUnitId, placement)
-    @ReactMethod fun setMRecCustomData(adUnitId: String, customData: String?) = impl.setMRecCustomData(adUnitId, customData)
-    @ReactMethod fun startMRecAutoRefresh(adUnitId: String) = impl.startMRecAutoRefresh(adUnitId)
-    @ReactMethod fun stopMRecAutoRefresh(adUnitId: String) = impl.stopMRecAutoRefresh(adUnitId)
-    @ReactMethod fun updateMRecPosition(adUnitId: String, position: String) = impl.updateMRecPosition(adUnitId, position)
-    @ReactMethod fun updateMRecOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = impl.updateMRecOffsets(adUnitId, xOffset, yOffset)
-    @ReactMethod fun setMRecBackgroundColor(adUnitId: String, hexColorString: String) = impl.setMRecBackgroundColor(adUnitId, hexColorString)
+    @ReactMethod fun createMREC(adUnitId: String, position: String) = impl.createMREC(adUnitId, position)
+    @ReactMethod fun createMRECWithOffsets(adUnitId: String, position: String, xOffset: Double, yOffset: Double) = impl.createMRECWithOffsets(adUnitId, position, xOffset, yOffset)
+    @ReactMethod fun setMRECPlacement(adUnitId: String, placement: String?) = impl.setMRECPlacement(adUnitId, placement)
+    @ReactMethod fun setMRECCustomData(adUnitId: String, customData: String?) = impl.setMRECCustomData(adUnitId, customData)
+    @ReactMethod fun updateMRECPosition(adUnitId: String, position: String) = impl.updateMRECPosition(adUnitId, position)
+    @ReactMethod fun updateMRECOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = impl.updateMRECOffsets(adUnitId, xOffset, yOffset)
+    @ReactMethod fun startMRECAutoRefresh(adUnitId: String) = impl.startMRECAutoRefresh(adUnitId)
+    @ReactMethod fun stopMRECAutoRefresh(adUnitId: String) = impl.stopMRECAutoRefresh(adUnitId)
+    @ReactMethod fun showMREC(adUnitId: String) = impl.showMREC(adUnitId)
+    @ReactMethod fun hideMREC(adUnitId: String) = impl.hideMREC(adUnitId)
+    @ReactMethod fun destroyMREC(adUnitId: String) = impl.destroyMREC(adUnitId)
+    @ReactMethod fun setMRECBackgroundColor(adUnitId: String, hexColorString: String) = impl.setMRECBackgroundColor(adUnitId, hexColorString)
 
     @ReactMethod fun loadInterstitial(adUnitId: String) = impl.loadInterstitial(adUnitId)
     @ReactMethod fun isInterstitialReady(adUnitId: String, promise: Promise) = impl.isInterstitialReady(adUnitId, promise)
@@ -70,4 +60,9 @@ class CloudXReactNativeModule(reactContext: ReactApplicationContext) :
     @ReactMethod fun isRewardedReady(adUnitId: String, promise: Promise) = impl.isRewardedReady(adUnitId, promise)
     @ReactMethod fun showRewarded(adUnitId: String, placement: String?, customData: String?) = impl.showRewarded(adUnitId, placement, customData)
     @ReactMethod fun destroyRewarded(adUnitId: String) = impl.destroyRewarded(adUnitId)
+
+    @ReactMethod fun addListener(eventName: String) {}
+    @ReactMethod fun removeListeners(count: Double) {}
+
+    override fun getConstants(): MutableMap<String, Any> = impl.getConstants()
 }

package/cloudx-react-native.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
 
   s.requires_arc = true
 
-  s.dependency "CloudXCore", "~> 2.1.0-beta"
+  s.dependency "CloudXCore", "~> 2.2.3"
 
   s.source_files = "ios/**/*.{h,mm}"
 

package/ios/CloudX.h

@@ -0,0 +1,47 @@
+//
+//  CloudX.h
+//  cloudx-react-native
+//
+
+#import <Foundation/Foundation.h>
+#import <React/RCTEventEmitter.h>
+#import <CloudXCore/CloudXCore.h>
+
+#define DEVICE_SPECIFIC_ADVIEW_AD_FORMAT CLXBannerTypeW320H50
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <CloudXSpec/CloudXSpec.h>
+@interface CloudX : RCTEventEmitter<NativeCloudXSpec, CLXInterstitialDelegate, CLXRewardedDelegate, CLXBannerDelegate, CLXAdRevenueDelegate>
+#else
+#import <React/RCTBridgeModule.h>
+@interface CloudX : RCTEventEmitter<RCTBridgeModule, CLXInterstitialDelegate, CLXRewardedDelegate, CLXBannerDelegate, CLXAdRevenueDelegate>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@property (nonatomic, strong, readonly, class) CloudX *shared;
+
+- (void)log:(NSString *)format, ...;
+
+/**
+ * Builds the standard ad-info event payload from a @c CLXAd object.
+ * Shared by native delegate callbacks so the JS layer always receives
+ * a consistent event shape.
+ */
+- (NSDictionary<NSString *, id> *)adInfoForAd:(CLXAd *)ad;
+
+/**
+ * Builds the load-failure event payload from an ad unit ID and an optional @c CLXError.
+ * Falls back to @c CLXErrorCodeInternalError when the SDK provides no error object.
+ */
+- (NSDictionary<NSString *, id> *)adLoadFailedInfoForAd:(NSString *)adUnitIdentifier withError:(nullable CLXError *)error;
+
+/**
+ * Builds the display-failure payload by merging standard ad info with the error code
+ * and message, giving JS a single object with the full context.
+ */
+- (NSDictionary<NSString *, id> *)adDisplayFailedInfoForAd:(CLXAd *)ad withError:(CLXError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END