react-native-nami-sdk 1.0.1 → 1.2.1

package/android/build.gradle

@@ -20,9 +20,8 @@ def safeExtGet(prop, fallback) {
 apply plugin: 'com.android.library'
 apply plugin: 'maven'
 apply plugin: "kotlin-android"
-apply plugin: "kotlin-android-extensions"
 buildscript {
-    ext.kotlin_version = '1.4.30'
+    ext.kotlin_version = '1.4.31'
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
     // This avoids unnecessary downloads and potential conflicts when the library is included as a
     // module dependency in an application project.
@@ -33,7 +32,7 @@ buildscript {
             jcenter()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:4.1.2'
+            classpath 'com.android.tools.build:gradle:4.2.1'
             classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         }
     }
@@ -47,9 +46,16 @@ android {
         versionCode 1
         versionName "1.0"
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     lintOptions {
         abortOnError false
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 repositories {
     // ref: https://www.baeldung.com/maven-local-repository
@@ -65,12 +71,13 @@ repositories {
     google()
     jcenter()
 }
+
 dependencies {
     //noinspection GradleDynamicVersion
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    implementation "com.namiml:sdk-android:1.0.1"
+    implementation "com.namiml:sdk-android:1.2.1"
 
     implementation 'com.facebook.react:react-native:+'  // From node_modules
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Nov 15 19:24:03 EST 2020
+#Wed May 26 17:12:26 EDT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME

package/android/src/main/java/com/nami/reactlibrary/NamiPaywallManagerBridgeModule.kt

@@ -12,6 +12,7 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.namiml.paywall.NamiPaywallManager
+import com.namiml.paywall.PreparePaywallResult
 
 class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext), ActivityEventListener {
@@ -46,7 +47,7 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
         }
     }
 
-    fun emitBockedPaywallClosed() {
+    private fun emitBockedPaywallClosed() {
         val map = Arguments.createMap().apply {
             putBoolean("blockingPaywallClosed", true)
         }
@@ -99,9 +100,6 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun canRaisePaywall(successCallback: Callback) {
-//        BOOL canRaise = [[NamiPaywallManager shared] canRaisePaywall];
-//        completion(@[[NSNumber numberWithBool:canRaise]]);
-
         reactApplicationContext.runOnUiQueueThread {
             val canRaiseResult = NamiPaywallManager.canRaisePaywall()
             successCallback.invoke(canRaiseResult)
@@ -124,4 +122,80 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
     fun paywallImpression(developerPaywallID: String) {
         // TODO: Android SDK paywall impression call.
     }
+
+    @ReactMethod
+    fun preparePaywallForDisplay(backgroundImageRequired: Boolean, imageFetchTimeout: Double) {
+        val imageFetchTimeoutConvertedToLong: Long = imageFetchTimeout.toLong()
+        reactApplicationContext.runOnUiQueueThread {
+
+            NamiPaywallManager.preparePaywallForDisplay(
+                backgroundImageRequired,
+                imageFetchTimeoutConvertedToLong
+            ) { result ->
+                when (result) {
+                    is PreparePaywallResult.Success -> {
+                        emitPreparePaywallFinished(true, null, null)
+                    }
+                    is PreparePaywallResult.Failure -> {
+                        emitPreparePaywallFinished(false, null, result.error)
+                    }
+                }
+            }
+        }
+    }
+
+    @ReactMethod
+    fun preparePaywallForDisplayByDeveloperPaywallId(
+        developerPaywallID: String,
+        backgroundImageRequired: Boolean,
+        imageFetchTimeout: Double
+    ) {
+        val imageFetchTimeoutConvertedToLong: Long = imageFetchTimeout.toLong()
+        reactApplicationContext.runOnUiQueueThread {
+            NamiPaywallManager.preparePaywallForDisplay(
+                developerPaywallID,
+                backgroundImageRequired,
+                imageFetchTimeoutConvertedToLong
+            ) { result ->
+                when (result) {
+                    is PreparePaywallResult.Success -> {
+                        emitPreparePaywallFinished(true, developerPaywallID, null)
+                    }
+                    is PreparePaywallResult.Failure -> {
+                        emitPreparePaywallFinished(false, developerPaywallID, result.error)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun emitPreparePaywallFinished(
+        success: Boolean,
+        developerPaywallID: String?,
+        error: com.namiml.paywall.PreparePaywallError?
+    ) {
+        val prepareContentMap = Arguments.createMap()
+        prepareContentMap.putBoolean("success", success)
+
+        if (developerPaywallID != null) {
+            prepareContentMap.putString("developerPaywallID", developerPaywallID)
+        }
+
+        if (error != null) {
+            prepareContentMap.putInt("errorCode", error.ordinal)
+            prepareContentMap.putString("errorMessage", error.toString())
+        }
+
+        Log.i(
+            LOG_TAG,
+            "Emitting preparePaywallForDisplay finished with result " + success + "error: " + error.toString()
+        )
+        try {
+            reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("PreparePaywallFinished", prepareContentMap)
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Caught Exception: " + e.message)
+        }
+    }
 }

package/android/src/main/java/com/nami/reactlibrary/NamiUtil.kt

@@ -196,6 +196,8 @@ fun NamiSKU.toSkuDict(): WritableMap {
     productDict.putString("localizedDescription", skuDetails.description)
     productDict.putString("localizedPrice", skuDetails.price)
     productDict.putString("localizedMultipliedPrice", skuDetails.price)
+    productDict.putString("displayText", displayText)
+    productDict.putString("displaySubText", displaySubText)
     productDict.putString("price", skuDetails.getFormattedPrice().toString())
     productDict.putString("priceLanguage", Locale.getDefault().language)
     productDict.putString("priceCountry", Locale.getDefault().country)
@@ -208,9 +210,6 @@ fun NamiSKU.toSkuDict(): WritableMap {
         SubscriptionPeriod.HALF_YEAR -> {
             "half_year"
         }
-        SubscriptionPeriod.DAY -> {
-            "day"
-        }
         SubscriptionPeriod.WEEKLY -> {
             "week"
         }

package/ios/NamiBridgeUtil.m

@@ -28,6 +28,10 @@
         productDict[@"priceLanguage"] = productInt.priceLocale.languageCode;
         productDict[@"priceCountry"] = productInt.priceLocale.countryCode;
         productDict[@"priceCurrency"] = productInt.priceLocale.currencyCode;
+        
+        // Add smart text processed values for sku buttons to sku dictionary
+        productDict[@"displayText"] = [sku namiDisplayText];
+        productDict[@"displaySubText"] = [sku namiSubDisplayText];
 
         if (@available(iOS 12.0, *)) {
             if (productInt != nil && productInt.subscriptionGroupIdentifier != nil) {

package/ios/NamiEmitter.m

@@ -23,6 +23,8 @@ RCT_EXTERN_METHOD(allPurchasedProducts)
 RCT_EXTERN_METHOD(getPurchasedProducts: (RCTResponseSenderBlock)callback)
 @end
 
+static NamiEmitter *namiEmitter;
+
 @implementation NamiEmitter : RCTEventEmitter
 
 - (instancetype)init
@@ -54,9 +56,19 @@ RCT_EXTERN_METHOD(getPurchasedProducts: (RCTResponseSenderBlock)callback)
         }];
         
     }
+    namiEmitter = self;
     return self;
 }
 
+- (void)dealloc {
+    namiEmitter = nil;
+}
+
+
++ (NamiEmitter *) reactInstance {
+    return namiEmitter;
+}
+
 - (void) getPurchasedProducts : (RCTResponseSenderBlock) callback  {
     NSArray *allProducts = [self allPurchasedProducts];
     callback(allProducts);
@@ -77,7 +89,7 @@ RCT_EXTERN_METHOD(getPurchasedProducts: (RCTResponseSenderBlock)callback)
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"PurchasesChanged", @"SignInActivate", @"AppPaywallActivate", @"EntitlementsChanged", @"BlockingPaywallClosed" ];
+    return @[@"PurchasesChanged", @"SignInActivate", @"AppPaywallActivate", @"EntitlementsChanged", @"BlockingPaywallClosed", @"PreparePaywallFinished" ];
 }
 
 - (NSDictionary<NSString *, NSObject *> *)constantsToExport {
@@ -150,6 +162,30 @@ bool hasNamiEmitterListeners;
     }
 }
 
+- (void)sendEventPreparePaywallForDisplayFinishedWithResult:(BOOL)success developerPaywallID: (NSString * _Nullable) developerPaywallID error:(NSError * _Nullable) error {
+    if (hasNamiEmitterListeners) {
+        
+        NSMutableDictionary *sendDict = [NSMutableDictionary dictionaryWithDictionary: @{ @"success": @(success) }];
+        
+        if (developerPaywallID != nil) {
+            [sendDict addEntriesFromDictionary:@{
+                @"developerPaywallID": developerPaywallID
+            }];
+        }
+        
+        if (error != nil) {
+            [sendDict addEntriesFromDictionary:@{
+                @"errorCode": @(error.code),
+                @"errorMessage": [error localizedDescription]
+                }
+            ];
+        }
+        
+        NSLog(@"NamiBridge: Info: attempting to send result of preparePaywallForDisplay with result dictionary: %@", sendDict);
+        [self sendEventWithName:@"PreparePaywallFinished" body:sendDict];
+    }
+}
+
 - (void)sendEventPurchaseMadeWithPurchases:(NSArray<NamiPurchase *>*)purchases withState:(NamiPurchaseState)purchaseState error:(NSError *)error {
     if (hasNamiEmitterListeners) {
         
@@ -200,6 +236,14 @@ bool hasNamiEmitterListeners;
         NSMutableDictionary *paywallMeta = [NSMutableDictionary dictionaryWithDictionary:paywallMetadata.namiPaywallInfoDict];
         // This part is really meant to be internally facing, scrub from dictionary
 
+        NSMutableDictionary *marketingContentDictionary = [NSMutableDictionary dictionaryWithDictionary:paywallMeta[@"marketing_content"]];
+
+        // Populated SmartText formatted values in dictioanry to send
+        marketingContentDictionary[@"body"] = [paywallMetadata body];
+        marketingContentDictionary[@"title"] = [paywallMetadata title];
+        paywallMeta[@"marketing_content"] = marketingContentDictionary;
+        paywallMeta[@"purchase_terms"] = [paywallMetadata purchaseTerms];
+        
         // Strip out presention_position from all listed sku items
         NSArray *cleanedOrderdMetadata = [NamiBridgeUtil stripPresentationPositionFromOrderedMetadataForPaywallMetaDict:paywallMeta];
         [paywallMeta setObject:cleanedOrderdMetadata  forKey:@"formatted_skus"];

package/ios/NamiPaywallManagerBridge.m

@@ -15,7 +15,10 @@
 
 #import "React/RCTViewManager.h"
 
-
+@interface NamiEmitter : RCTEventEmitter
+- (void)sendEventPreparePaywallForDisplayFinishedWithResult:(BOOL)success developerPaywallID: (NSString * _Nullable) developerPaywallID error:(NSError * _Nullable) error;
++ (NamiEmitter *) reactInstance;
+@end
 
 @interface NamiPaywallManagerBridge : NSObject <RCTBridgeModule>
 @property (atomic) BOOL blockPaywallRaise;
@@ -58,6 +61,7 @@ RCT_EXPORT_METHOD(canRaisePaywall:(RCTResponseSenderBlock)completion)
     completion(@[[NSNumber numberWithBool:canRaise]]);
 }
 
+
 RCT_EXPORT_METHOD(presentNamiPaywall:(NSArray *)skuIDs metapaywallDefinition:(NSDictionary *)paywallDict)
 {
     NSString *paywallDeveloperID = paywallDict[@"developerPaywallID"];
@@ -104,6 +108,38 @@ RCT_EXPORT_METHOD(paywallImpression:(NSString *)developerPaywallID)
     [NamiPaywallManager paywallImpressionWithDeveloperID:developerPaywallID];
 }
 
+RCT_EXPORT_METHOD( preparePaywallForDisplay:(BOOL)backgroundImageRequired
+    imageFetchTimeout:(double)imageFetchTimeout )
+{
+    [NamiPaywallManager preparePaywallForDisplayWithBackgroundImageRequired:backgroundImageRequired imageFetchTimeout:imageFetchTimeout prepareHandler:^(BOOL success, NSError * _Nullable error) {
+        [[NamiEmitter reactInstance] sendEventPreparePaywallForDisplayFinishedWithResult:success developerPaywallID:nil error:error];
+    }];
+}
+
+RCT_EXPORT_METHOD(preparePaywallForDisplayByDeveloperPaywallId:(NSString *)developerPaywallID
+    backgroundImageRequired: (BOOL)backgroundImageRequired
+    imageFetchTimeout:(double)imageFetchTimeout )
+{
+    [NamiPaywallManager preparePaywallForDisplayWithDeveloperPaywallID:developerPaywallID backgroundImageRequired:backgroundImageRequired imageFetchTimeout:imageFetchTimeout prepareHandler:^(BOOL success, NSError * _Nullable error) {
+        [[NamiEmitter reactInstance] sendEventPreparePaywallForDisplayFinishedWithResult:success developerPaywallID:developerPaywallID error:error];
+    }];
+}
+
+
+RCT_EXPORT_METHOD(processSmartTextForProducts:(NSString *)smartText  skuIDs:(NSArray<NSString *> *)skuIDs completion:(RCTResponseSenderBlock)completion)
+{
+    [NamiPurchaseManager skusForSKUIDsWithSkuIDs:skuIDs productHandler:^(BOOL success, NSArray<NamiSKU *> * _Nullable skus, NSArray<NSString *> * _Nullable invalidSkuIDs, NSError * _Nullable error) {
+        if (skus != NULL) {
+            // Found some of the skus they were looking for, process text
+            NSString *processedText = [NamiPaywallManager processSmartTextWithText:smartText dataStores:skus];
+            completion(@[processedText]);
+        } else {
+            // No products found so cannot process smart text, just send back.
+            completion(@[smartText]);
+        }
+    }];
+}
+
 
 @end
 

package/ios/Podfile

@@ -5,7 +5,7 @@ source 'https://cdn.cocoapods.org/'
 
 target 'RNNami' do
   # Pods for RNNami
-  pod 'Nami', '2.5.2'
+  pod 'Nami', '2.7.1'
   pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
   pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
   pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "1.0.1",
+  "version": "1.2.1",
   "description": "React Native Module for Nami - The Smartest Way to Sell Subscriptions.",
   "main": "index.js",
   "scripts": {

package/react-native-nami-sdk.podspec

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m}"
   s.requires_arc = true
 
-  s.dependency 'Nami', '2.5.2'
+  s.dependency 'Nami', '2.7.1'
   s.dependency 'React'
 
 end