esoftplay 0.0.141-e → 0.0.141-g

package/error.ts

@@ -14,12 +14,12 @@ function getTime() {
   const isoStringWithGMTPlus7 = new Date(adjustedDate).toISOString();
   return isoStringWithGMTPlus7.replace('T', ' ').replace(/\.[0-9]+Z/g, "")
 }
-// const defaultErrorHandler = ErrorUtils?.getGlobalHandler?.()
+const defaultErrorHandler = ErrorUtils?.getGlobalHandler?.()
 
 const myErrorHandler = (e: any, isFatal: any) => {
   if (!expoConfig?.packagerOpts)
     setError(e)
-  // defaultErrorHandler?.(e, isFatal)
+  defaultErrorHandler?.(e, isFatal)
 }
 
 export function setError(error?: any) {
@@ -140,4 +140,4 @@ export function getError() {
     }
   })
 }
-//ErrorUtils[REMOVED by esoftplay web].setGlobalHandler(myErrorHandler)
+ErrorUtils.setGlobalHandler(myErrorHandler)

package/modules/lib/image.tsx

@@ -7,7 +7,8 @@ import { LibProgress } from 'esoftplay/cache/lib/progress/import';
 import { LibStyle } from 'esoftplay/cache/lib/style/import';
 import esp from 'esoftplay/esp';
 import useGlobalState from 'esoftplay/global';
-import { Camera } from 'expo-camera';
+import { CameraView } from 'expo-camera';
+import { CameraType } from 'expo-camera/build/legacy/Camera.types';
 import * as ImageManipulator from 'expo-image-manipulator';
 import { SaveFormat } from 'expo-image-manipulator';
 import * as ImagePicker from 'expo-image-picker';
@@ -80,7 +81,7 @@ class m extends LibComponent<LibImageProps, LibImageState> {
   constructor(props: LibImageProps) {
     super(props);
     this.state = {
-      type: Camera.Constants.Type.back,
+      type: CameraType.back,
       loading: false,
       image: null,
       flashLight: 'off'
@@ -302,17 +303,17 @@ class m extends LibComponent<LibImageProps, LibImageState> {
           return (
             <View style={{ position: 'absolute', top: 0, left: 0, right: 0, bottom: 0 }} >
               <View style={{ flex: 1 }} >
-                <Camera
+                <CameraView
                   ref={(camera: any) => this.camera = camera}
-                  type={type}
+                  facing={type}
                   ratio={'4:3'}
-                  flashMode={flashLight}
+                  flash={flashLight}
                   zoom={0.1}
                   style={{ height: LibStyle.width * 4 / 3, width: LibStyle.width }}>
                   <View style={{ height: height, width: width, backgroundColor: 'transparent' }} >
-                    {image ? <Image source={image} style={{ height: LibStyle.width * 4 / 3, width: width, resizeMode: 'cover', transform: [{ scaleX: this.state.type == Camera.Constants.Type.back ? 1 : -1 }] }} /> : null}
+                    {image ? <Image source={image} style={{ height: LibStyle.width * 4 / 3, width: width, resizeMode: 'cover', transform: [{ scaleX: this.state.type == CameraType.back ? CameraType.front : CameraType.back }] }} /> : null}
                   </View>
-                </Camera>
+                </CameraView>
                 <View style={{ position: 'absolute', top: 10 + LibStyle.STATUSBAR_HEIGHT, left: 10 }} >
                   <TouchableOpacity onPress={() => this.setState({ flashLight: flashLight == 'on' ? 'off' : 'on' })} >
                     <LibIcon color={'white'} size={24} name={flashLight == 'on' ? 'flash' : "flash-off"} />
@@ -324,11 +325,11 @@ class m extends LibComponent<LibImageProps, LibImageState> {
                       {
                         image ?
                           <TouchableOpacity onPress={() => this.setState({ image: false })} >
-                            <LibIcon.Ionicons name='ios-close-circle' style={{ fontSize: 40, color: 'white' }} />
+                            <LibIcon.Ionicons name='close-circle' style={{ fontSize: 40, color: 'white' }} />
                           </TouchableOpacity>
                           :
-                          <TouchableOpacity onPress={() => this.setState({ type: this.state.type === Camera.Constants.Type.back ? Camera.Constants.Type.front : Camera.Constants.Type.back })} >
-                            <LibIcon.Ionicons name='ios-refresh-circle' style={{ fontSize: 40, color: 'white' }} />
+                          <TouchableOpacity onPress={() => this.setState({ type: this.state.type === CameraType.back ? CameraType.front : CameraType.back })} >
+                            <LibIcon.Ionicons name='refresh-circle' style={{ fontSize: 40, color: 'white' }} />
                           </TouchableOpacity>
                       }
                     </View>
@@ -358,7 +359,7 @@ class m extends LibComponent<LibImageProps, LibImageState> {
                                 clearTimeout(timer)
                               });
                           }} >
-                            <LibIcon.Ionicons name='ios-checkmark-circle' style={{ fontSize: 40, color: 'white' }} />
+                            <LibIcon.Ionicons name='checkmark-circle' style={{ fontSize: 40, color: 'white' }} />
                           </TouchableOpacity>
                           :
                           <TouchableOpacity onPress={() => {
@@ -369,7 +370,7 @@ class m extends LibComponent<LibImageProps, LibImageState> {
                               });
                             clearTimeout(timer)
                           }} >
-                            <LibIcon.Ionicons name='ios-close-circle' style={{ fontSize: 40, color: 'white' }} />
+                            <LibIcon.Ionicons name='close-circle' style={{ fontSize: 40, color: 'white' }} />
                           </TouchableOpacity>
                       }
                     </View>

package/modules/lib/keyboard_avoid.tsx

@@ -1,23 +1,17 @@
 // withHooks
 // noPage
 
-import NavigationContainerRefContext from '@react-navigation/core/src/NavigationContainerRefContext';
-import NavigationContext from '@react-navigation/core/src/NavigationContext';
-import type { NavigationProp } from '@react-navigation/core/src/types';
-import React, { useRef, useState } from 'react';
-import { KeyboardAvoidingView, Platform, ViewStyle } from 'react-native';
-
+import React from 'react';
+import { Platform, ViewStyle } from 'react-native';
+import { KeyboardAvoidingView } from 'react-native-keyboard-controller';
 
 export interface LibKeyboard_avoidProps {
   children?: any,
   style?: ViewStyle
 }
-export default function m(props: LibKeyboard_avoidProps): any {
-
-  // const isFocussed = useIsFocused();
 
-  // const Custom = isFocussed ? KeyboardAvoidingView : View
 
+export default function m(props: LibKeyboard_avoidProps): any {
   return (
     <KeyboardAvoidingView behavior={Platform.OS == 'android' ? 'height' : 'padding'} style={[{ flex: 1 }, props.style]} >
       {props.children}
@@ -25,55 +19,3 @@ export default function m(props: LibKeyboard_avoidProps): any {
   )
 }
 
-
-/**
- * Hook to access the navigation prop of the parent screen anywhere.
- *
- * @returns Navigation prop of the parent screen.
- */
-function useNavigation<T = NavigationProp<ReactNavigation.RootParamList>>(): T {
-  const root = React.useContext(NavigationContainerRefContext);
-  const navigation = React.useContext(NavigationContext);
-
-  if (navigation === undefined && root === undefined) {
-
-  }
-  return (navigation ?? root) as unknown as T;
-}
-
-function useIsFocused(): boolean {
-  const navigation = useNavigation();
-
-  const forceTrue = useRef(false)
-
-  if (navigation == undefined) {
-    forceTrue.current = true
-  }
-
-  const [isFocused, setIsFocused] = useState(navigation?.isFocused);
-
-  const valueToReturn = !!navigation?.isFocused?.();
-
-  if (isFocused !== valueToReturn) {
-    setIsFocused(valueToReturn);
-  }
-
-  React.useEffect(() => {
-    const unsubscribeFocus = navigation?.addListener?.('focus', () =>
-      setIsFocused(true)
-    );
-
-    const unsubscribeBlur = navigation?.addListener?.('blur', () =>
-      setIsFocused(false)
-    );
-
-    return () => {
-      unsubscribeFocus?.();
-      unsubscribeBlur?.();
-    };
-  }, [navigation]);
-
-  React.useDebugValue(valueToReturn);
-
-  return (forceTrue.current || valueToReturn);
-}

package/modules/lib/picture.tsx

@@ -1,8 +1,8 @@
 // withHooks
 // noPage
+import { Image } from 'expo-image';
 import React from 'react';
 import { ImageStyle } from 'react-native';
-import FastImage from 'react-native-fast-image';
 
 export interface LibPictureSource {
   uri: string
@@ -11,7 +11,6 @@ export interface LibPictureProps {
   source: LibPictureSource | any,
   style: ImageStyle,
   resizeMode?: "contain" | "cover",
-  noCache?: boolean,
   onError?: () => void,
 }
 
@@ -19,15 +18,17 @@ export default function m(props: LibPictureProps): any {
 
   let resizeMode
   if (props?.style?.resizeMode == 'cover')
-    resizeMode = FastImage.resizeMode.cover
+    resizeMode = "cover"
   else if (props?.style?.resizeMode == 'contain')
-    resizeMode = FastImage.resizeMode.contain
+    resizeMode = "contain"
   else if (props?.resizeMode == 'cover')
-    resizeMode = FastImage.resizeMode.cover
+    resizeMode = "cover"
   else if (props?.resizeMode == 'contain')
-    resizeMode = FastImage.resizeMode.contain
+    resizeMode = "contain"
   else
-    resizeMode = FastImage.resizeMode.cover
+    resizeMode = "cover"
 
-  return <FastImage  {...props} resizeMode={resizeMode} />
+  return (
+    <Image {...props} contentFit={resizeMode} allowDownscaling cachePolicy={"disk"} />
+  )
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay",
-  "version": "0.0.141-e",
+  "version": "0.0.141-g",
   "description": "embedding data from esoftplay framework (web based) into mobile app",
   "main": "cache/index.js",
   "types": "../../index.d.ts",