apps-sdk 1.0.31 → 1.0.33

package/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "Apps SDK",
   "main": "index.js",
   "scripts": {
@@ -20,6 +20,7 @@
     "expo-sharing": "^11.10.0",
     "react-native": "^0.73.2",
     "react-native-btr": "^2.2.1",
+    "react-native-safe-area-context": "^4.9.0",
     "react-native-webview": "^13.8.1"
   },
   "types": "./types/index.d.ts"

package/src/libraries/PayWall.js

@@ -1,14 +1,22 @@
-import React from 'react';
-import { WebView } from 'react-native-webview';
+import React, { useRef, useEffect } from 'react';
 import { BottomSheet } from 'react-native-btr';
+import { WebView } from 'react-native-webview';
+import { View } from "react-native";
+import { SafeAreaView } from 'react-native-safe-area-context';
 import Utils from "./Utils";
-import { StyleSheet, View, Dimensions } from 'react-native';
 
-export default class PayWall extends React.Component {
-    webviewRef = React.createRef();
-    bottomSheetRef = React.createRef();
+export default function PayWall({ visible, onClose }) {
+    const webviewRef = useRef(null);
+
+    const getURL = () => {
+        return "https://www.google.com";
+    }
 
-    handleMessage = (message) => {
+    const getPayWallJS = () => {
+        return "";
+    }
+
+    const handleMessage = (message) => {
         const data = JSON.parse(message.nativeEvent.data);
         const event = "event" + Utils.capitalize(data.query);
         if (typeof this[event] === 'function') {
@@ -18,46 +26,41 @@ export default class PayWall extends React.Component {
         }
     }
 
-    getPayWallJS = () => {
-        return "window.subInfoInterval = setInterval(() => window.Appquiles && Appquiles.setSubscriptionPlans(" + JSON.stringify(information.subsPlansInfo) + "), 300);";
-    }
+    useEffect(() => {
+        if (visible) {
+            webviewRef.current.injectJavaScript(getPayWallJS());
+        }
+    }, [visible]);
 
-    render() {
-        return (
-            this.props.isVisible &&
-            <View style={styles.container}>
-                <BottomSheet
-                    ref={this.bottomSheetRef}
-                    height={0.9 * Dimensions.get('window').height} // 90% de la altura de la pantalla
-                    open={true}
-                    customStyles={{
-                        container: {
-                            flex: 1,
-                            borderTopLeftRadius: 10,
-                            borderTopRightRadius: 10,
-                        }
-                    }}
-                >
+    return (
+        <SafeAreaView>
+            <BottomSheet
+                visible={visible}
+                onBackButtonPress={onClose}
+                onBackdropPress={onClose}
+            >
+                <View style={styles.bottomNavigationView}>
                     <WebView
-                        style={styles.webview}
-                        source={{ uri: this.props.url }}
+                        style={{flex:1}}
+                        source={{ uri: getURL() }}
                         javaScriptEnabled
-                        ref={this.webviewRef}
-                        onMessage={this.handleMessage}
+                        ref={webviewRef}
+                        onMessage={handleMessage}
                         onError={(err) => {console.log('Error al cargar webview:',err)}}
-                        injectedJavaScript={this.getPayWallJS()}
+                        injectedJavaScript={getPayWallJS()}
                     />
-                </BottomSheet>
-            </View>
-        );
-    }
+                </View>
+            </BottomSheet>
+        </SafeAreaView>
+    );
 }
 
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
+const styles = {
+    bottomNavigationView: {
+        backgroundColor: '#fff',
+        width: '100%',
+        height: '100%',
     },
-    webview: {
-        flex: 1,
-    }
-});
+}
+
+

package/src/libraries/index.js

@@ -4,5 +4,3 @@ 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,6 +1,5 @@
 declare module 'apps-sdk' {
     import { ComponentType } from 'react';
-    import { WebViewProps } from 'react-native-webview';
     import { BottomSheetProps } from 'react-native-btr';
 
     export interface SessionData {
@@ -87,13 +86,11 @@ declare module 'apps-sdk' {
         registerForPushNotificationsAsync(): Promise<string>;
     }
 
-    export interface PayWallProps extends BottomSheetProps {
+    export class PayWall {
         visible: boolean;
         onClose: () => void;
     }
 
-    export const PayWall2: ComponentType<PayWallProps>;
-
     export class AppsSDK {
         initializePushNotifications(): Promise<string>;
     }
@@ -104,6 +101,7 @@ declare module 'apps-sdk' {
         storage: Storage;
         session: Session;
         utils: Utils;
+        paywall: PayWall;
     }
 
     const Core: AppsSDK;

package/src/libraries/PayWall2.js

@@ -1,15 +0,0 @@
-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>
-    );
-}