Merge pull request #63 from apphud/feature/2.1.0

ren6 · web-flow · commit 7d2bc5281d53 · 2024-06-04T15:06:01.000+03:00
add paywallShown and paywallClosed methods
diff --git a/android/src/main/java/com/reactnativeapphudsdk/ApphudDataTransformer.kt b/android/src/main/java/com/reactnativeapphudsdk/ApphudDataTransformer.kt
@@ -52,7 +52,6 @@ class ApphudDataTransformer {
 
     fun getApphudPaywallMap(paywall: ApphudPaywall): WritableNativeMap {
       val result: WritableNativeMap = WritableNativeMap()
-      Apphud.enableDebugLogs()
       result.putString("identifier", paywall.identifier)
       result.putBoolean("isDefault", paywall.default)
       result.putString("experimentName", paywall.experimentName)
diff --git a/android/src/main/java/com/reactnativeapphudsdk/ApphudSdkModule.kt b/android/src/main/java/com/reactnativeapphudsdk/ApphudSdkModule.kt
@@ -22,7 +22,7 @@ class ApphudSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
 
   init {
     HeadersInterceptor.X_SDK = "reactnative"
-    HeadersInterceptor.X_SDK_VERSION = "2.0.0"
+    HeadersInterceptor.X_SDK_VERSION = "2.1.0"
     listener = ApphudListenerHandler(reactContext)
     listener?.let { Apphud.setListener(it) }
   }
@@ -73,6 +73,22 @@ class ApphudSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     }
   }
 
+  @ReactMethod
+  fun paywallShown(identifier: String) {
+      val paywall = Apphud.paywalls().firstOrNull { it.identifier == identifier }
+      paywall?.let {
+          Apphud.paywallShown(it)
+      }
+  }
+
+  @ReactMethod
+  fun paywallClosed(identifier: String) {
+      val paywall = Apphud.paywalls().firstOrNull { it.identifier == identifier }
+      paywall?.let {
+          Apphud.paywallClosed(it)
+      }
+  }
+
   @ReactMethod
   fun purchase(args: ReadableMap, promise: Promise) {
     val productId = args.getString("productId")
@@ -96,7 +112,7 @@ class ApphudSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
 
     val isSub = product?.productDetails?.productType?.lowercase() == "subs"
     val offerToken = args.getString("offerToken")
-    val isConsumable = args.getBoolean("isConsumable")
+    val isConsumable = if (args.hasKey("isConsumable")) args.getBoolean("isConsumable") else false
 
     if (product == null) {
       promise.reject("Error", "Product not found")
@@ -270,6 +286,7 @@ class ApphudSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     Apphud.collectDeviceIdentifiers()
   }
 
+
   @ReactMethod
   fun enableDebugLogs() {
     Apphud.enableDebugLogs()
diff --git a/example/ios/.xcode.env b/example/ios/.xcode.env
@@ -0,0 +1 @@
+export NODE_BINARY=/opt/homebrew/opt/node@20/bin/node
diff --git a/example/ios/ApphudSdkExample.xcodeproj/project.pbxproj b/example/ios/ApphudSdkExample.xcodeproj/project.pbxproj
@@ -399,7 +399,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
+			shellScript = "export NODE_BINARY=/opt/homebrew/opt/node@20/bin/node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
 		2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -580,4 +580,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 47a16e2930bdcf8baadcf3fe4873c7f378dc927c
 
-COCOAPODS: 1.14.2
+COCOAPODS: 1.15.2
diff --git a/example/src/screens/ActionsScreen.tsx b/example/src/screens/ActionsScreen.tsx
@@ -44,17 +44,13 @@ export default function ActionsScreen({ navigation }: Props) {
   const [paywalls, setPaywalls] = React.useState<Array<ApphudPaywall>>();
 
   const callAll = () => {
-    // ApphudSdk.enableDebugLogs();
+    ApphudSdk.enableDebugLogs();
 
     // ApphudSdk.setAdvertisingIdentifier('42ed88fd-b446-4eb1-81ae-83e3025c04cf')
     
     // ApphudSdk.userId().then((userId) => console.log(`Apphud: userId: ${userId}`));
-    // ApphudSdk.hasActiveSubscription().then((hasActiveSubscription) => 
-    //   console.log(`Apphud: hasActiveSubscription: ${hasActiveSubscription}`)
-    //   );
-    // ApphudSdk.hasPremiumAccess().then((hasPremiumAccess) => 
-    //   console.log(`Apphud: hasPremiumAccess: ${hasPremiumAccess}`)
-    // );
+    ApphudSdk.hasActiveSubscription().then((active) => console.log('START Has Active Subscription: = ' + active));
+    
     
     // ApphudSdk.setUserProperty({key: 'some_string_key2', value: 'some_string_valueee', setOnce: true})
     // ApphudSdk.setUserProperty({key: 'some_float_key3', value: 1.45, setOnce: true})
diff --git a/example/src/screens/LoginScreen.tsx b/example/src/screens/LoginScreen.tsx
@@ -20,6 +20,9 @@ export default function LoginScreen({ navigation }: Props) {
 
   const onStartHandler = () => {
     ApphudSdk.start({ apiKey, userId, deviceId, observerMode: false })
+
+    // ApphudSdk.hasActiveSubscription().then((active) => console.log('START Has Active Subscription: = ' + hasActive));
+    
     navigation.navigate('Actions')
   }
 
diff --git a/example/src/screens/PaywallScreen.tsx b/example/src/screens/PaywallScreen.tsx
@@ -53,6 +53,7 @@ export default function PaywallScreen({ route, navigation}: { route: any, naviga
       for (const paywall of paywalls) {
         if (paywall.identifier === route.params.paywallId) {
           setCurrentPaywall(paywall);
+          await ApphudSdk.paywallShown(paywall.identifier);
           const productsPropsList: ProductProps[] = preparedProducts(paywall.products);
           setProductsProps(productsPropsList);
           return paywall;
diff --git a/ios/.xcode.env b/ios/.xcode.env
@@ -0,0 +1 @@
+export NODE_BINARY=/opt/homebrew/opt/node@20/bin/node
diff --git a/ios/ApphudSdk.m b/ios/ApphudSdk.m
@@ -46,6 +46,8 @@ @interface RCT_EXTERN_MODULE(ApphudSdk, NSObject)
 
 RCT_EXTERN_METHOD(collectDeviceIdentifiers)
 RCT_EXTERN_METHOD(setAdvertisingIdentifier:(NSString*)idfa)
+RCT_EXTERN_METHOD(paywallShown:(NSString*)identifier)
+RCT_EXTERN_METHOD(paywallClosed:(NSString*)identifier)
 RCT_EXTERN_METHOD(optOutOfTracking)
 RCT_EXTERN_METHOD(enableDebugLogs)
 RCT_EXTERN_METHOD(logout:(RCTPromiseResolveBlock)resolve)
diff --git a/ios/ApphudSdk.swift b/ios/ApphudSdk.swift
@@ -6,7 +6,7 @@ class ApphudSdk: NSObject {
     
     override init() {
         ApphudHttpClient.shared.sdkType = "reactnative";
-        ApphudHttpClient.shared.sdkVersion = "2.0.0";
+        ApphudHttpClient.shared.sdkVersion = "2.1.0";
     }
 
     @objc(start:)
@@ -15,6 +15,9 @@ class ApphudSdk: NSObject {
         let userID = options["userId"] as? String;
         let observerMode = options["observerMode"] as? Bool ?? true;
         DispatchQueue.main.async {
+            #if DEBUG
+            ApphudUtils.enableAllLogs()
+            #endif
             Apphud.start(apiKey: apiKey, userID: userID, observerMode: observerMode);
         }
     }
@@ -130,6 +133,25 @@ class ApphudSdk: NSObject {
         }
     }
 
+    @objc(paywallShown:)
+    func paywallShown(identifier: String) {
+        print("Paywall Shown: \(identifier)")
+        Task {
+            if let paywall = await Apphud.paywalls().first(where: { $0.identifier == identifier }) {
+                Apphud.paywallShown(paywall)
+            }
+        }
+    }
+
+     @objc(paywallClosed:)
+    func paywallClosed(identifier: String) {
+        Task {
+            if let paywall = await Apphud.paywalls().first(where: { $0.identifier == identifier }) {
+                Apphud.paywallClosed(paywall)
+            }
+        }
+    }
+
     @objc(subscription:withRejecter:)
     func subscription(resolve: RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
         guard let subscription = Apphud.subscription() else {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apphud/react-native-apphud-sdk",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Apphud SDK for react native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
diff --git a/src/ApphudSdkType.ts b/src/ApphudSdkType.ts
@@ -34,7 +34,19 @@ export type ApphudSdkType = {
    * Method returns immediately if paywalls are cached or already loaded.
    * @returns paywalls configured in Apphud Dashboard > Product Hub > Paywalls.
    */
-  paywalls(): Promise<Array<ApphudPaywall>>;
+    paywalls(): Promise<Array<ApphudPaywall>>;
+
+  /**
+   * Available on iOS and Android
+   * Logs a "Paywall Shown" (Paywall View) event which is required for A/B Testing Analytics.
+   */
+  paywallShown(identifier: string): void;
+
+  /**
+   * Available on iOS and Android
+   * Logs a "Paywall Closed" event. Optional.
+   */
+  paywallClosed(identifier: string): void;
 
   /**
    * Available on iOS and Android.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export NODE_BINARY=/opt/homebrew/opt/node@20/bin/node`
Original file line number	Diff line number	Diff line change
`@@ -580,4 +580,4 @@ SPEC CHECKSUMS:`
`580`	`580`
`581`	`581`	`PODFILE CHECKSUM: 47a16e2930bdcf8baadcf3fe4873c7f378dc927c`
`582`	`582`
`583`		`-COCOAPODS: 1.14.2`
	`583`	`+COCOAPODS: 1.15.2`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ export default function LoginScreen({ navigation }: Props) {`
`20`	`20`
`21`	`21`	`const onStartHandler = () => {`
`22`	`22`	`ApphudSdk.start({ apiKey, userId, deviceId, observerMode: false })`
	`23`	`+`
	`24`	`+ // ApphudSdk.hasActiveSubscription().then((active) => console.log('START Has Active Subscription: = ' + hasActive));`
	`25`	`+`
`23`	`26`	`navigation.navigate('Actions')`
`24`	`27`	`}`
`25`	`28`