apps-sdk 1.0.29 → 1.0.31

package/index.js

@@ -1,4 +1,4 @@
-import {NotificationsPush, Networking, Storage, Session, Utils, PayWall} from "./src/libraries";
+import {NotificationsPush, Networking, Storage, Session, Utils, PayWall, PayWall2} from "./src/libraries";
 
 class AppsSDK {
     initializePushNotifications = async() => {
@@ -18,5 +18,6 @@ export default {
     storage:                     Storage,
     session:                     Session,
     utils:                       Utils,
-    paywall:                     PayWall
+    paywall:                     PayWall,
+    paywall2:                    PayWall2
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "Apps SDK",
   "main": "index.js",
   "scripts": {
@@ -19,6 +19,7 @@
     "expo-notifications": "^0.23.0",
     "expo-sharing": "^11.10.0",
     "react-native": "^0.73.2",
+    "react-native-btr": "^2.2.1",
     "react-native-webview": "^13.8.1"
   },
   "types": "./types/index.d.ts"

package/src/libraries/PayWall.js

@@ -1,15 +1,10 @@
-import React from "react";
+import React from 'react';
 import { WebView } from 'react-native-webview';
 import { BottomSheet } from 'react-native-btr';
 import Utils from "./Utils";
 import { StyleSheet, View, Dimensions } from 'react-native';
 
-class PayWall extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = { isVisible: false, url: null };
-    }
-
+export default class PayWall extends React.Component {
     webviewRef = React.createRef();
     bottomSheetRef = React.createRef();
 
@@ -27,17 +22,9 @@ class PayWall extends React.Component {
         return "window.subInfoInterval = setInterval(() => window.Appquiles && Appquiles.setSubscriptionPlans(" + JSON.stringify(information.subsPlansInfo) + "), 300);";
     }
 
-    show = (url) => {
-        this.setState({ isVisible: true, url: url });
-    }
-
-    hide = () => {
-        this.setState({ isVisible: false, url: null });
-    }
-
     render() {
         return (
-            this.state.isVisible &&
+            this.props.isVisible &&
             <View style={styles.container}>
                 <BottomSheet
                     ref={this.bottomSheetRef}
@@ -53,7 +40,7 @@ class PayWall extends React.Component {
                 >
                     <WebView
                         style={styles.webview}
-                        source={{ uri: this.state.url }}
+                        source={{ uri: this.props.url }}
                         javaScriptEnabled
                         ref={this.webviewRef}
                         onMessage={this.handleMessage}
@@ -74,5 +61,3 @@ const styles = StyleSheet.create({
         flex: 1,
     }
 });
-
-export default new PayWall();

package/src/libraries/PayWall2.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import { BottomSheet } from 'react-native-btr';
+import { WebView } from 'react-native-webview';
+
+export default function PayWall2({ visible, onClose }) {
+    return (
+        <BottomSheet
+            visible={visible}
+            onBackButtonPress={onClose}
+            onBackdropPress={onClose}
+        >
+            <WebView source={{ uri: 'https://www.google.es' }} />
+        </BottomSheet>
+    );
+}

package/src/libraries/index.js

@@ -4,4 +4,5 @@ export { default as Storage }           from './Storage';
 export { default as Session }           from './Session';
 export { default as Utils }             from './Utils';
 export { default as PayWall }           from './PayWall';
+export { default as PayWall2 }          from './PayWall2';
 

package/types/index.d.ts

@@ -1,4 +1,8 @@
 declare module 'apps-sdk' {
+    import { ComponentType } from 'react';
+    import { WebViewProps } from 'react-native-webview';
+    import { BottomSheetProps } from 'react-native-btr';
+
     export interface SessionData {
         app: {
             shortVersion: string;
@@ -83,11 +87,13 @@ declare module 'apps-sdk' {
         registerForPushNotificationsAsync(): Promise<string>;
     }
 
-    export class PayWall {
-        show(url: string): void;
-        hide(): void;
+    export interface PayWallProps extends BottomSheetProps {
+        visible: boolean;
+        onClose: () => void;
     }
 
+    export const PayWall2: ComponentType<PayWallProps>;
+
     export class AppsSDK {
         initializePushNotifications(): Promise<string>;
     }
@@ -98,7 +104,6 @@ declare module 'apps-sdk' {
         storage: Storage;
         session: Session;
         utils: Utils;
-        paywall: PayWall;
     }
 
     const Core: AppsSDK;