react-native-purchases 7.3.0 → 7.4.0-beta.1

package/RNPurchases.podspec

@@ -24,6 +24,6 @@ Pod::Spec.new do |spec|
   ]
 
   spec.dependency   "React-Core"
-  spec.dependency   "PurchasesHybridCommon", '7.3.0'
-  spec.swift_version    = '5.0'
+  spec.dependency   "PurchasesHybridCommon", '7.4.0-beta.1'
+  spec.swift_version    = '5.7'
 end

package/android/build.gradle

@@ -29,7 +29,7 @@ android {
         minSdkVersion getExtOrIntegerDefault('minSdkVersion')
         targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
         versionCode 1
-        versionName '7.3.0'
+        versionName '7.4.0-beta.1'
     }
 
     buildTypes {
@@ -121,6 +121,8 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
     //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-    implementation 'com.revenuecat.purchases:purchases-hybrid-common:7.3.0'
+    implementation 'com.revenuecat.purchases:purchases-hybrid-common:7.4.0-beta.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.compose.ui:ui-android:1.5.4'
+    implementation "androidx.appcompat:appcompat:1.6.1"
 }

package/android/src/main/java/com/revenuecat/purchases/react/Paywall.kt

@@ -0,0 +1,33 @@
+package com.revenuecat.purchases.react
+
+import android.app.PendingIntent.getActivity
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.ImageView
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.AbstractComposeView
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.uimanager.SimpleViewManager
+import com.revenuecat.purchases.ui.revenuecatui.ExperimentalPreviewRevenueCatUIPurchasesAPI
+import com.revenuecat.purchases.ui.revenuecatui.Paywall
+import com.revenuecat.purchases.ui.revenuecatui.PaywallOptions
+
+internal class Paywall @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+) : AbstractComposeView(context, attrs) {
+    @OptIn(ExperimentalPreviewRevenueCatUIPurchasesAPI::class)
+    @Composable
+    override fun Content() {
+        Paywall(
+            PaywallOptions.Builder(
+                dismissRequest = {}
+            )
+                .build()
+        )
+    }
+}

package/android/src/main/java/com/revenuecat/purchases/react/RNPaywallManager.java

@@ -0,0 +1,22 @@
+package com.revenuecat.purchases.react;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.uimanager.SimpleViewManager;
+import com.facebook.react.uimanager.ThemedReactContext;
+
+public class RNPaywallManager extends SimpleViewManager<Paywall> {
+    public static final String REACT_CLASS = "RNPaywall";
+
+    @NonNull
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @NonNull
+    @Override
+    protected Paywall createViewInstance(@NonNull ThemedReactContext themedReactContext) {
+        return new Paywall(themedReactContext);
+    }
+}

package/android/src/main/java/com/revenuecat/purchases/react/RNPaywallsModule.java

@@ -0,0 +1,58 @@
+package com.revenuecat.purchases.react;
+
+import static com.revenuecat.purchases.hybridcommon.PaywallHelpersKt.presentPaywallFromFragment;
+
+import android.app.Activity;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.OptIn;
+import androidx.fragment.app.FragmentActivity;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.revenuecat.purchases.ui.revenuecatui.ExperimentalPreviewRevenueCatUIPurchasesAPI;
+
+@OptIn(markerClass = ExperimentalPreviewRevenueCatUIPurchasesAPI.class)
+public class RNPaywallsModule extends ReactContextBaseJavaModule {
+    public RNPaywallsModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return "RNPaywalls";
+    }
+
+    @ReactMethod
+    public void presentPaywall() {
+        presentPaywall(null);
+    }
+
+    @ReactMethod
+    public void presentPaywallIfNeeded(final String requiredEntitlementIdentifier) {
+       presentPaywall(requiredEntitlementIdentifier);
+    }
+
+    private void presentPaywall(final @Nullable String requiredEntitlementIdentifier) {
+        final FragmentActivity fragment = getCurrentActivityFragment();
+        if (fragment == null) {
+            // TODO: log
+            return;
+        }
+
+        presentPaywallFromFragment(fragment, requiredEntitlementIdentifier);
+    }
+
+    private @Nullable FragmentActivity getCurrentActivityFragment() {
+        final Activity activity = getCurrentActivity();
+
+        if (activity instanceof FragmentActivity) {
+            return (FragmentActivity) activity;
+        } else {
+            return null;
+        }
+    }
+}

package/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesModule.java

@@ -45,7 +45,7 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
     private static final String CUSTOMER_INFO_UPDATED = "Purchases-CustomerInfoUpdated";
     private static final String LOG_HANDLER_EVENT = "Purchases-LogHandlerEvent";
     public static final String PLATFORM_NAME = "react-native";
-    public static final String PLUGIN_VERSION = "7.3.0";
+    public static final String PLUGIN_VERSION = "7.4.0-beta.1";
 
     private final ReactApplicationContext reactContext;
 

package/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesPackage.java

@@ -18,7 +18,10 @@ public class RNPurchasesPackage implements ReactPackage {
     @NonNull
     @Override
     public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(new RNPurchasesModule(reactContext));
+        return Arrays.<NativeModule>asList(
+            new RNPurchasesModule(reactContext),
+            new RNPaywallsModule(reactContext)
+        );
     }
 
     // Deprecated from RN 0.47
@@ -29,6 +32,8 @@ public class RNPurchasesPackage implements ReactPackage {
     @NonNull
     @Override
     public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-        return Collections.emptyList();
+        return Arrays.asList(
+            new RNPaywallManager()
+        );
     }
 }

package/dist/index.d.ts

@@ -4,3 +4,4 @@ export * from './errors';
 export * from './customerInfo';
 export * from './purchases';
 export * from './offerings';
+export * from './paywalls';

package/dist/index.js

@@ -23,3 +23,4 @@ __exportStar(require("./errors"), exports);
 __exportStar(require("./customerInfo"), exports);
 __exportStar(require("./purchases"), exports);
 __exportStar(require("./offerings"), exports);
+__exportStar(require("./paywalls"), exports);

package/dist/paywalls.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+export default class PaywallView extends React.Component {
+    render(): React.JSX.Element;
+}
+export declare function presentPaywall(): void;
+export declare function presentPaywallIfNeeded(requiredEntitlementIdentifier: String): void;

package/dist/paywalls.js

@@ -0,0 +1,60 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.presentPaywallIfNeeded = exports.presentPaywall = void 0;
+var react_native_1 = require("react-native");
+var react_native_2 = require("react-native");
+var react_1 = __importDefault(require("react"));
+var RNPaywall = (0, react_native_1.requireNativeComponent)('RNPaywall');
+var RNPaywalls = react_native_2.NativeModules.RNPaywalls;
+var PaywallView = /** @class */ (function (_super) {
+    __extends(PaywallView, _super);
+    function PaywallView() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    PaywallView.prototype.render = function () {
+        return (
+        // TODO: check iOS version to fail if < 15
+        react_1.default.createElement(RNPaywall, __assign({}, this.props)));
+    };
+    return PaywallView;
+}(react_1.default.Component));
+exports.default = PaywallView;
+function presentPaywall() {
+    // TODO: check iOS/Android version
+    RNPaywalls.presentPaywall();
+}
+exports.presentPaywall = presentPaywall;
+function presentPaywallIfNeeded(requiredEntitlementIdentifier) {
+    // TODO: check iOS/Android version
+    RNPaywalls.presentPaywallIfNeeded(requiredEntitlementIdentifier);
+}
+exports.presentPaywallIfNeeded = presentPaywallIfNeeded;

package/ios/RNPaywallManager.h

@@ -0,0 +1,17 @@
+//
+//  RNPaywallManager.h
+//  RNPurchases
+//
+//  Created by Nacho Soto on 11/1/23.
+//  Copyright © 2023 Facebook. All rights reserved.
+//
+
+#import <React/RCTViewManager.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNPaywallManager : RCTViewManager
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RNPaywallManager.m

@@ -0,0 +1,27 @@
+//
+//  RNPaywallManager.m
+//  RNPurchases
+//
+//  Created by Nacho Soto on 11/1/23.
+//  Copyright © 2023 Facebook. All rights reserved.
+//
+
+#import "RNPaywallManager.h"
+@import PurchasesHybridCommon;
+
+@implementation RNPaywallManager
+
+RCT_EXPORT_MODULE(RNPaywall)
+
+- (UIView *)view
+{
+    if (@available(iOS 15.0, *)) {
+        PaywallProxy *proxy = [[PaywallProxy alloc] init];
+        return proxy.vc.view;
+    } else {
+        // TODO: log something
+        return nil;
+    }
+}
+
+@end

package/ios/RNPaywalls.h

@@ -0,0 +1,13 @@
+//
+//  Created by RNPaywalls.
+//  Copyright © 2023 RevenueCat. All rights reserved.
+//
+
+#import <React/RCTEventEmitter.h>
+
+@import PurchasesHybridCommon;
+@import RevenueCat;
+
+@interface RNPaywalls : RCTEventEmitter <RCTBridgeModule>
+
+@end

package/ios/RNPaywalls.m

@@ -0,0 +1,29 @@
+
+//
+//  Created by RevenueCat.
+//  Copyright © 2023 RevenueCat. All rights reserved.
+//
+
+#import "RNPaywalls.h"
+
+@implementation RNPaywalls
+
+RCT_EXPORT_MODULE();
+
+RCT_EXPORT_METHOD(presentPaywall) {
+    if (@available(iOS 15.0, *)) {
+        [PaywallProxy presentPaywall];
+    } else {
+        // TODO: log
+    }
+}
+
+RCT_EXPORT_METHOD(presentPaywallIfNeeded:(NSString *)requiredEntitlementIdentifier) {
+    if (@available(iOS 15.0, *)) {
+        [PaywallProxy presentPaywallIfNeededWithRequiredEntitlementIdentifier:requiredEntitlementIdentifier];
+    } else {
+        // TODO: log
+    }
+}
+
+@end

package/ios/RNPurchases.m

@@ -470,7 +470,7 @@ readyForPromotedProduct:(RCStoreProduct *)product
 }
 
 - (NSString *)platformFlavorVersion {
-    return @"7.3.0";
+    return @"7.4.0-beta.1";
 }
 
 @end

package/ios/RNPurchases.xcodeproj/project.pbxproj

@@ -10,6 +10,8 @@
 		3552B97D252CF5900098008A /* PurchasesPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3552B97C252CF5900098008A /* PurchasesPlugin.swift */; };
 		35BFF4DC247DDAD3008B64DA /* PurchasesHybridCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35BFF4DB247DDAD3008B64DA /* PurchasesHybridCommon.framework */; };
 		35D0736B20AD0F740012EB8C /* Purchases.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35D0736A20AD0F740012EB8C /* Purchases.framework */; };
+		4F72072A2AF30E7E0017395F /* RNPaywallManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F7207292AF30E7E0017395F /* RNPaywallManager.m */; };
+		4F7D88D52AF9666800855875 /* RNPaywalls.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F7D88D32AF9666800855875 /* RNPaywalls.m */; };
 		B3E7B58A1CC2AC0600A0062D /* RNPurchases.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNPurchases.m */; };
 /* End PBXBuildFile section */
 
@@ -31,6 +33,10 @@
 		3552B97C252CF5900098008A /* PurchasesPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchasesPlugin.swift; sourceTree = "<group>"; };
 		35BFF4DB247DDAD3008B64DA /* PurchasesHybridCommon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = PurchasesHybridCommon.framework; sourceTree = "<group>"; };
 		35D0736A20AD0F740012EB8C /* Purchases.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Purchases.framework; sourceTree = SOURCE_ROOT; };
+		4F7207282AF30E7E0017395F /* RNPaywallManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNPaywallManager.h; sourceTree = "<group>"; };
+		4F7207292AF30E7E0017395F /* RNPaywallManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNPaywallManager.m; sourceTree = "<group>"; };
+		4F7D88D32AF9666800855875 /* RNPaywalls.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNPaywalls.m; sourceTree = "<group>"; };
+		4F7D88D42AF9666800855875 /* RNPaywalls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNPaywalls.h; sourceTree = "<group>"; };
 		B3E7B5881CC2AC0600A0062D /* RNPurchases.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNPurchases.h; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* RNPurchases.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNPurchases.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -71,6 +77,10 @@
 				35BFF4DB247DDAD3008B64DA /* PurchasesHybridCommon.framework */,
 				B3E7B5881CC2AC0600A0062D /* RNPurchases.h */,
 				B3E7B5891CC2AC0600A0062D /* RNPurchases.m */,
+				4F7207282AF30E7E0017395F /* RNPaywallManager.h */,
+				4F7207292AF30E7E0017395F /* RNPaywallManager.m */,
+				4F7D88D42AF9666800855875 /* RNPaywalls.h */,
+				4F7D88D32AF9666800855875 /* RNPaywalls.m */,
 				134814211AA4EA7D00B7C361 /* Products */,
 				35493AC8202D4BCD004DFA39 /* Frameworks */,
 				3552B97B252CF5900098008A /* RNPurchases-Bridging-Header.h */,
@@ -136,8 +146,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4F7D88D52AF9666800855875 /* RNPaywalls.m in Sources */,
 				B3E7B58A1CC2AC0600A0062D /* RNPurchases.m in Sources */,
 				3552B97D252CF5900098008A /* PurchasesPlugin.swift in Sources */,
+				4F72072A2AF30E7E0017395F /* RNPaywallManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-purchases",
   "title": "React Native Purchases",
-  "version": "7.3.0",
+  "version": "7.4.0-beta.1",
   "description": "React Native in-app purchases and subscriptions made easy. Supports iOS and Android. ",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -95,6 +95,6 @@
     ]
   },
   "dependencies": {
-    "@revenuecat/purchases-typescript-internal": "7.3.0"
+    "@revenuecat/purchases-typescript-internal": "7.3.1"
   }
 }

package/scripts/docs/index.html

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<meta http-equiv="refresh" content="0; url=https://revenuecat.github.io/react-native-purchases-docs/7.3.0/" />
+	<meta http-equiv="refresh" content="0; url=https://revenuecat.github.io/react-native-purchases-docs/7.4.0-beta.1/" />
 </head>
 <body>
 </body>