esoftplay 0.0.126 → 0.0.127-a

package/bin/build.js

@@ -82,10 +82,7 @@ if (fs.existsSync(packjson)) {
 			} catch (error) { }
 		if (!$appjson.expo.hasOwnProperty('runtimeVersion')) {
 			$appjson.expo.runtimeVersion = 1
-		}
-		if (!$appjson.expo.hasOwnProperty('android')) {
 			$appjson.expo.android = {
-				"useNextNotificationsApi": true,
 				"package": "com.domain",
 				"versionCode": 1,
 				"intentFilters": [
@@ -120,7 +117,12 @@ if (fs.existsSync(packjson)) {
 				"associatedDomains": [
 					"applinks:*.domain.com",
 					"applinks:domain.com"
-				]
+				],
+				"infoPlist": {
+					"LSApplicationQueriesSchemes": [
+						"itms-apps"
+					]
+				}
 			}
 
 			fs.writeFile(appjson, JSON.stringify($appjson, null, 2), (err) => {
@@ -369,22 +371,24 @@ export default function App() {
 			// 	fs.writeFileSync('../@firebase/app/dist/index.rn.cjs.js', firebaseText)
 			// }
 			// /* end AsyncStorage @firebase section */
-			if (fs.existsSync('../@expo/vector-icons')) {
-				let esoftplayIcon = ''
-				fs.readdir('../@expo/vector-icons/build', (err, files) => {
-					const dfiles = files.filter((file) => file.includes('d.ts'))
-					dfiles.map((dfile, i) => {
-						const rdfile = fs.readFileSync('../@expo/vector-icons/build/' + dfile, { encoding: 'utf8' })
-						const names = (/import\("\.\/createIconSet"\)\.Icon<((.*))\,.*>/g).exec(rdfile);
-						if (names && names[1].includes('|')) {
-							esoftplayIcon += 'export type ' + dfile.replace('.d.ts', 'Types') + ' = ' + names[1] + '\n';
-						}
+			if (appjson)
+
+				if (fs.existsSync('../@expo/vector-icons')) {
+					let esoftplayIcon = ''
+					fs.readdir('../@expo/vector-icons/build', (err, files) => {
+						const dfiles = files.filter((file) => file.includes('d.ts'))
+						dfiles.map((dfile, i) => {
+							const rdfile = fs.readFileSync('../@expo/vector-icons/build/' + dfile, { encoding: 'utf8' })
+							const names = (/import\("\.\/createIconSet"\)\.Icon<((.*))\,.*>/g).exec(rdfile);
+							if (names && names[1].includes('|')) {
+								esoftplayIcon += 'export type ' + dfile.replace('.d.ts', 'Types') + ' = ' + names[1] + '\n';
+							}
+						})
+						fs.writeFileSync('../@expo/vector-icons/build/esoftplay_icons.ts', esoftplayIcon)
 					})
-					fs.writeFileSync('../@expo/vector-icons/build/esoftplay_icons.ts', esoftplayIcon)
-				})
-			} else {
-				console.log("@expo/vector-icons not installed")
-			}
+				} else {
+					console.log("@expo/vector-icons not installed")
+				}
 			console.log('Please wait until processes has finished...');
 		});
 	}

package/bin/cli.js

@@ -15,7 +15,6 @@ const confjson = DIR + "config.json"
 const conflive = DIR + "config.live.json"
 const confdebug = DIR + "config.debug.json"
 const gitignore = DIR + ".gitignore"
-
 const gplist = DIR + "GoogleService-Info.plist"
 const gplistlive = DIR + "GoogleService-Info.live.plist"
 const gplistdebug = DIR + "GoogleService-Info.debug.plist"
@@ -132,6 +131,61 @@ switch (args[0]) {
 		break;
 }
 
+function switchStatusAssets(status) {
+
+	const iconpng = DIR + "assets/icon.png"
+	const icondebug = DIR + "assets/icon.debug.png"
+	const iconlive = DIR + "assets/icon.live.png"
+
+	const icon_iospng = DIR + "assets/icon_ios.png"
+	const icon_iosdebug = DIR + "assets/icon_ios.debug.png"
+	const icon_ioslive = DIR + "assets/icon_ios.live.png"
+
+	const iconNotifpng = DIR + "assets/iconNotif.png"
+	const iconNotifdebug = DIR + "assets/iconNotif.debug.png"
+	const iconNotiflive = DIR + "assets/iconNotif.live.png"
+
+	const splashpng = DIR + "assets/splash.png"
+	const splashdebug = DIR + "assets/splash.debug.png"
+	const splashlive = DIR + "assets/splash.live.png"
+
+
+	function copyFileFromTo(from, to) {
+		if (fs.existsSync(from)) {
+			if (fs.existsSync(to))
+				command('rm ' + to)
+			command('cp ' + from + ' ' + to)
+		}
+	}
+	if (status.includes('l')) {
+		copyFileFromTo(iconlive, iconpng)
+		copyFileFromTo(icon_ioslive, icon_iospng)
+		copyFileFromTo(splashlive, splashpng)
+		copyFileFromTo(iconNotiflive, iconNotifpng)
+	}
+	if (status.includes('d')) {
+		copyFileFromTo(icondebug, iconpng)
+		copyFileFromTo(icon_iosdebug, icon_iospng)
+		copyFileFromTo(splashdebug, splashpng)
+		copyFileFromTo(iconNotifdebug, iconNotifpng)
+	}
+
+	fs.readdirSync(DIR + '/modules/').forEach((mod) => {
+		const path = DIR + '/modules/' + mod
+		fs.readdirSync(path).forEach((file) => {
+			if (status.includes('d'))
+				if (file.match(/^.*.debug.*/g)) {
+					copyFileFromTo(path + '/' + file, path + '/' + file.replace('.debug.', '.'))
+				}
+			if (status.includes('l'))
+				if (file.match(/^.*.live.*/g)) {
+					copyFileFromTo(path + '/' + file, path + '/' + file.replace('.live.', '.'))
+				}
+		})
+	})
+
+}
+
 function excludeModules() {
 	let cjson = readToJSON(confjson)
 	if (cjson.config.hasOwnProperty('excludeModules')) {
@@ -451,6 +505,7 @@ function readToJSON(path) {
 	return isJSON ? JSON.parse(txt) : txt
 }
 
+
 function publish(notes) {
 	jsEng(appjson, true)
 	jsEng(appdebug, true)
@@ -540,8 +595,26 @@ function publish(notes) {
 		esplibs.forEach((key) => {
 			stringBuilder += ("\n" + key + ": " + pack.dependencies[key])
 		})
-		stringBuilder += (notes != '' ? ("\n\n- " + notes) : '')
-		tm(stringBuilder)
+		const { exec } = require('child_process');
+		exec("publisher=$(npx expo whoami &); echo $publisher;", (error, stdout, stderr) => {
+			if (error) {
+				console.error(`exec error: ${error}`);
+				return;
+			}
+			let accountName = stdout.trim();
+			stringBuilder += "\npublisher: @" + accountName + "\n"
+			stringBuilder += (notes != '' ? ("\n\n- " + notes) : '')
+			tm(stringBuilder)
+			if (notes.startsWith('*') && ajson.config.publish_id) {
+				const config = readToJSON(confjson).config;
+				const ajson = readToJSON(appjson);
+				const url = config.publish_uri + ajson.config.publish_id
+				const fetch = require('node-fetch')
+				console.log("PROCESSING FORCE UPDATE")
+				fetch(url).then((res) => JSON.stringify(res.json(), undefined, 2)).then(consoleSucces)
+			}
+		});
+
 	}
 }
 
@@ -915,10 +988,20 @@ function switchStatus(status) {
 	let valid = true
 	if (valid)
 		valid = copyFromTo(status.includes("l") ? applive : appdebug, appjson)
-	if (valid)
+	if (valid) {
 		valid = copyFromTo(status.includes("l") ? conflive : confdebug, confjson)
+
+		const cjson = readToJSON(confjson)
+		if (cjson.hasOwnProperty('config')) {
+			if (cjson.config.hasOwnProperty('build')) {
+				const [usr, pwd] = cjson.config.build
+				command(`expo logout && expo login -u ${usr} -p ${pwd}`)
+			}
+		}
+	}
 	if (valid && fs.existsSync(gplist))
 		valid = copyFromTo(status.includes("l") ? gplistlive : gplistdebug, gplistlive)
+	switchStatusAssets(status)
 	if (!valid) {
 		consoleError('TERJADI KESALAHAN')
 		checkApp()

package/esp.ts

@@ -186,9 +186,9 @@ const esp = {
       theme: ["light", "dark"],
       comment_login: 1,
       notification: 0,
-      isDebug: __DEV__ ? 1 : 0,
       ...app.config
     }
+    
     if (!config.hasOwnProperty('url') || config.url.length == 0) {
       config.url = config.protocol + "://" + config.api + "." + config.domain + config.uri;
     }

package/modules/lib/collaps.tsx

@@ -3,9 +3,9 @@
 import { useSafeState } from 'esoftplay';
 
 
-import React, { useCallback } from 'react';
+import React, { useEffect } from 'react';
 import { Pressable } from 'react-native';
-import Animated, { interpolate, useAnimatedStyle, useSharedValue, withSpring, withTiming } from 'react-native-reanimated';
+import Animated, { runOnJS, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
 
 
 export interface LibCollapsArgs {
@@ -17,42 +17,51 @@ export interface LibCollapsProps {
   style?: any
 }
 export default function m(props: LibCollapsProps): any {
-  const animHeight = useSharedValue(-1)
-  const bodyHeight = useSharedValue(1)
   const [expand, setExpand] = useSafeState(props.show)
+  const opacity = useSharedValue(0);
+  const translateY = useSharedValue(-10);
 
-  const heightStyle = useAnimatedStyle(() => {
+  const animatedStyle = useAnimatedStyle(() => {
     return {
-      overflow: 'hidden',
-      height: interpolate(animHeight.value,
-        [0, 1, 2],
-        [0, bodyHeight.value, bodyHeight.value * 2]),
-      opacity: interpolate(animHeight.value,
-        [-1, 0],
-        [0, 1])
+      opacity: opacity.value,
+      transform: [{ translateY: translateY.value }],
+    };
+  });
+
+  useEffect(() => {
+    if (expand) {
+      toggleAnimation()
     }
-  })
+  }, [expand])
+
+  const toggleAnimation = () => {
+    opacity.value = withTiming(opacity.value === 0 ? 1 : 0, { duration: 300 }, (status) => {
+      if (opacity.value == 0 && status) {
+        runOnJS(setExpand)(false)
+      }
+    });
+    translateY.value = withTiming(opacity.value !== 0 ? -10 : 0, { duration: 300})
+  };
 
-  const toggle = useCallback(() => {
-    animHeight.value = animHeight.value == 0 ? withSpring(1) : withTiming(0)
-    setExpand(animHeight.value != 1)
-  }, [])
+  function toggle() {
+    if (!expand) {
+      setExpand(true)
+    } else {
+      toggleAnimation()
+    }
+  }
 
   return (
-    <Animated.View style={{ overflow: 'hidden' }} >
-      <Pressable onPress={toggle} >
+    <Animated.View>
+       <Pressable onPress={toggle} style={{zIndex:11}} >
         {props.header(expand)}
       </Pressable>
-      <Animated.View
-        onLayout={({ nativeEvent: { layout: { height } } }) => {
-          if (height && animHeight.value == -1) {
-            bodyHeight.value = height + 5
-            animHeight.value = props.show ? 1 : 0
-          }
-        }}
-        style={[heightStyle]}>
-        {props.children}
-      </Animated.View>
+      {expand &&
+        <Animated.View
+          style={[{ paddingBottom: expand ? 10 : 0, zIndex:10 }, animatedStyle]}>
+          {props.children}
+        </Animated.View>
+      }
     </Animated.View>
   )
 }

package/modules/lib/input.tsx

@@ -5,7 +5,7 @@ import { LibTheme } from 'esoftplay/cache/lib/theme/import';
 import { LibUtils } from 'esoftplay/cache/lib/utils/import';
 
 import React from 'react';
-import { TextInput, View } from 'react-native';
+import { Platform, TextInput, View } from 'react-native';
 
 export interface LibInputProps {
   icon?: (color: string) => any,
@@ -122,7 +122,7 @@ export default class m extends LibComponent<LibInputProps, LibInputState>{
       for (let i = 0; i < rMask.length; i++) {
         const iMask = rMask[i];
         if (iMask == '#') {
-          if (rText[i - _addRange] != undefined) {
+          if (rText?.[i - _addRange] != undefined) {
             maskedText += _addMaskChar + rText[i - _addRange]
           }
           else {
@@ -222,7 +222,7 @@ export default class m extends LibComponent<LibInputProps, LibInputState>{
             allowFontScaling={false}
             {...this.props}
             style={[{
-              outlineWidth: 0,
+              outlineWidth: Platform.OS == 'web' ? 0 : undefined,
               paddingVertical: 8,
               marginBottom: 2,
               paddingRight: suffix ? (suffix.length * 14) : 0,

package/modules/lib/locale.ts

@@ -3,6 +3,7 @@ import { useGlobalReturn } from 'esoftplay';
 import { LibNavigation } from 'esoftplay/cache/lib/navigation/import';
 import { LibObject } from 'esoftplay/cache/lib/object/import';
 import useGlobalState from 'esoftplay/global';
+import { NativeModules, Platform } from 'react-native';
 
 
 const state = useGlobalState("id", { persistKey: 'lib_locale_lang' })
@@ -26,4 +27,16 @@ export default class m {
     LibNavigation.reset()
     state.set(langId)
   }
+
+  static getDeviceLanguange(): string {
+    const appLanguage =
+      Platform.OS === 'ios'
+        ? NativeModules.SettingsManager.settings.AppleLocale ||
+        NativeModules.SettingsManager.settings.AppleLanguages[0]
+        : NativeModules.I18nManager.localeIdentifier;
+
+    const fixAppLanguage = appLanguage.search(/-|_/g) !== -1 ? appLanguage.slice(0, 2) : appLanguage;
+    let def = fixAppLanguage == 'in' ? 'id' : fixAppLanguage
+    return def
+  }
 }

package/modules/lib/version.tsx

@@ -7,6 +7,7 @@ import { LibIcon } from 'esoftplay/cache/lib/icon/import';
 import { LibNavigation } from 'esoftplay/cache/lib/navigation/import';
 import { LibStyle } from 'esoftplay/cache/lib/style/import';
 import { LibTextstyle } from 'esoftplay/cache/lib/textstyle/import';
+import { LibUpdaterProperty } from 'esoftplay/cache/lib/updater/import';
 
 import Constants from 'expo-constants';
 import React from 'react';
@@ -21,15 +22,10 @@ export interface LibVersionState {
 export default class m extends LibComponent<LibVersionProps, LibVersionState> {
 
   static appVersion(): string {
-    let version: any = (Platform.OS == 'android' ? Constants.manifest.android.versionCode : Constants.manifest.ios.buildNumber)
+    let version: any = (Platform.OS == 'android' ? Constants?.manifest?.android?.versionCode : Constants?.manifest?.ios?.buildNumber)
     return version
   }
 
-  static isAutoUpdate(): boolean {
-    let enabled: any = esp.appjson().expo.updates.enabled
-    return enabled == true
-  }
-
   static showDialog(title: string, message: string, link: string, onOk: (link: string) => void, onCancel: () => void): void {
     LibDialog.confirm(title, message, 'Update', () => onOk(link), 'Nanti', onCancel)
   }
@@ -43,28 +39,30 @@ export default class m extends LibComponent<LibVersionProps, LibVersionState> {
   }
 
   static toStore(link: string): void {
-    Linking.canOpenURL(link) && Linking.openURL(link)
+    Linking.openURL(link)
   }
 
   static onDone(res: any, msg: string): void {
-    const { title, version, android, ios } = res
+    const { title, version, android, ios, isForceUpdate } = res
+
     function isAvailableNewVersion(newVersion: string): boolean {
       let oldVersion = m.appVersion()
       return newVersion > oldVersion
     }
-
     if (isAvailableNewVersion(version)) {
       LibNavigation.backToRoot()
       LibNavigation.replace("lib/version", { res, msg: msg == 'success' ? 'Update to a new version now' : msg })
     }
-
+    if (isForceUpdate == 1) {
+      LibUpdaterProperty.check((isNew) => { if (isNew) LibUpdaterProperty.install() })
+    }
   }
   static check(): void {
     new LibCurl("public_version", null, m.onDone)
   }
 
   render(): any {
-    const { res: { title, version, android, ios }, msg } = LibNavigation.getArgsAll(this.props)
+    const { res: { title, version, android, ios }, msg } = LibNavigation.getArgsAll<any>(this.props)
     const link = Platform.OS == 'ios' ? ios : android
     return (
       <ImageBackground source={esp.assets("splash.png")} blurRadius={100} style={{ flex: 1, justifyContent: 'center', alignItems: 'center', borderStartColor: 'white', paddingHorizontal: 17 }} >
@@ -72,7 +70,7 @@ export default class m extends LibComponent<LibVersionProps, LibVersionState> {
         <LibTextstyle textStyle="headline" text={title || 'A new version is available'} style={{ textAlign: 'center', marginTop: 10 }} />
         <LibTextstyle textStyle="callout" text={msg} style={{ textAlign: 'center', marginTop: 10, color: '#333' }} />
         <TouchableOpacity
-          onPress={() => { Linking.canOpenURL(link) && Linking.openURL(link) }}
+          onPress={() => { Linking.openURL(link) }}
           style={{ marginTop: 20, borderRadius: 10, paddingHorizontal: 17, paddingVertical: 10, backgroundColor: LibStyle.colorPrimary }} >
           <LibTextstyle textStyle="body" text="Update Sekarang" />
         </TouchableOpacity>

package/modules/user/data.ts

@@ -1,6 +1,7 @@
 // noPage
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import _global from 'esoftplay/_global';
+import Storage from 'esoftplay/storage';
 
 export default class m {
   static register(name: string): void {
@@ -28,7 +29,11 @@ export default class m {
       if (_global?.useGlobalUserDelete) {
         Object.values?.(_global?.useGlobalUserDelete)?.map?.((func) => func?.())
       }
-      if (x) AsyncStorage.multiRemove(JSON.parse(x))
+      if (x) {
+        AsyncStorage.multiRemove(JSON.parse(x))
+        const arx = JSON.parse(x)
+        arx.forEach((ix) => { Storage.removeItem(ix) })
+      }
     })
   }
 }

package/modules/user/hook.tsx

@@ -16,6 +16,10 @@ export default class m extends LibComponent<UserMainProps, UserMainState> {
   }
 
   render(): any {
-    return null
+    return (
+      <>
+        {/* <LibAuto_update /> */}
+      </>
+    )
   }
 }

package/modules/user/index.tsx

@@ -51,7 +51,7 @@ function setFonts(): Promise<void> {
 }
 
 
-const route = useGlobalState<any>(undefined, { persistKey: 'user_index_routes_initial' })
+const route = useGlobalState<any>(undefined, { persistKey: 'user_index_routes_initial', inFile: true })
 export default function m(props: UserIndexProps): any {
   const [loading, setLoading] = useSafeState(true)
   const user = UserClass.state().useSelector(s => s)
@@ -105,8 +105,6 @@ export default function m(props: UserIndexProps): any {
 
       }
     }
-
-
     LibUpdaterProperty.check()
   }, [])
 

package/package.json

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

package/state.ts

@@ -8,7 +8,8 @@ export default function useRefState<T = any>(defaultValue?: T): UseRefStateResul
 
   const updateState = useCallback((value: T | undefined) => {
     if (isMountedRef.current) {
-      setState(value);
+      setState(value)
+      // InteractionManager.runAfterInteractions(() => setState(value))
     }
   }, []);