From 58911ccb595706109f93a3626291e9f602619f4e Mon Sep 17 00:00:00 2001 From: Syntax <2079305+TheUltDev@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:09:22 -0500 Subject: [PATCH] Misc --- client/ios/Podfile.lock | 6 ------ client/package.json | 1 + client/src/app/layout.tsx | 4 ++-- client/src/core/hooks/useOnline.ts | 8 ++++---- client/src/core/routes/ScreenLibrary.tsx | 12 ++++++------ pnpm-lock.yaml | 3 +++ toolkit/bundler/src/libs/exo.native.ts | 5 +++-- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/client/ios/Podfile.lock b/client/ios/Podfile.lock index b4e8de90..cc0befdc 100644 --- a/client/ios/Podfile.lock +++ b/client/ios/Podfile.lock @@ -1084,8 +1084,6 @@ PODS: - React-CoreModules - React-RCTImage - React-RCTText - - ReactNativeUiLib (4.1.3): - - React - ReactTestApp-DevSupport (3.7.0): - React-Core - React-jsi @@ -1180,7 +1178,6 @@ DEPENDENCIES: - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "ReactNativeHost (from `../../node_modules/.pnpm/react-native-test-app@3.7.0_@callstack+react-native-visionos@0.73.10_react-native-macos@0.73._kudraiqpsikfmmfmsseu2enccm/node_modules/@rnx-kit/react-native-host`)" - ReactNativeNavigation (from `../node_modules/react-native-navigation`) - - ReactNativeUiLib (from `../node_modules/react-native-ui-lib`) - ReactTestApp-DevSupport (from `../node_modules/react-native-test-app`) - ReactTestApp-Resources (from `..`) - rive-react-native (from `../node_modules/rive-react-native`) @@ -1322,8 +1319,6 @@ EXTERNAL SOURCES: :path: "../../node_modules/.pnpm/react-native-test-app@3.7.0_@callstack+react-native-visionos@0.73.10_react-native-macos@0.73._kudraiqpsikfmmfmsseu2enccm/node_modules/@rnx-kit/react-native-host" ReactNativeNavigation: :path: "../node_modules/react-native-navigation" - ReactNativeUiLib: - :path: "../node_modules/react-native-ui-lib" ReactTestApp-DevSupport: :path: "../node_modules/react-native-test-app" ReactTestApp-Resources: @@ -1410,7 +1405,6 @@ SPEC CHECKSUMS: ReactCommon: 447281ad2034ea3252bf81a60d1f77d5afb0b636 ReactNativeHost: 6cd1ed318d4137d8e067702461d466c0d0e67422 ReactNativeNavigation: 86a23855d2ccc74ad3e59bff1595c2d4b76ed8cc - ReactNativeUiLib: e23a2b3d196aaaf561694cf76385c1ff3055bdc2 ReactTestApp-DevSupport: 0a10a887d4de1b16dee5d836998da6b9b90bf535 ReactTestApp-Resources: 857244f3a23f2b3157b364fa06cf3e8866deff9c rive-react-native: 125db990f050d72c76aa37dc6c5cfaaf89f66086 diff --git a/client/package.json b/client/package.json index e0c1192a..7452eba6 100644 --- a/client/package.json +++ b/client/package.json @@ -38,6 +38,7 @@ "@react-native-community/slider": "^4.5.2", "@react-native-picker/picker": "^2.7.5", "@shopify/react-native-skia": "1.3.6", + "burnt": "^0.12.2", "design": "workspace:react-exo-ui@*", "react-dom": "^18.2.0", "react-exo": "workspace:*", diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx index 19f453a0..9c4398c3 100644 --- a/client/src/app/layout.tsx +++ b/client/src/app/layout.tsx @@ -1,5 +1,5 @@ import {useEffect} from 'react'; -import {ToastRoot} from 'react-exo/toast'; +//import {ToastRoot} from 'react-exo/toast'; //import {BootSplash} from 'react-exo/device'; import {StatusBar, Appearance} from 'react-native'; import {useInitialTheme, UnistylesRuntime} from 'design/styles'; @@ -31,6 +31,6 @@ export function Layout(props: React.PropsWithChildren) { networkActivityIndicatorVisible={online === false} /> {props.children} - + {/**/} } diff --git a/client/src/core/hooks/useOnline.ts b/client/src/core/hooks/useOnline.ts index 42972ac9..d836f1a2 100644 --- a/client/src/core/hooks/useOnline.ts +++ b/client/src/core/hooks/useOnline.ts @@ -1,17 +1,17 @@ -import {t} from '@lingui/macro'; +//import {t} from '@lingui/macro'; import {useLingui} from '@lingui/react'; import {useState, useEffect} from 'react'; import {isOnline, suscribeOnline} from 'react-exo/device'; -import {toast} from 'react-exo/toast'; +//import {toast} from 'react-exo/toast'; export function useOnline() { const [online, setOnline] = useState(false); const handleConnectivity = (connected: boolean, init?: boolean) => { if (connected && !init) { - toast({title: t`You are online`, preset: 'done'}); + //toast({title: t`You are online`, preset: 'done'}); } else if (!connected) { - toast({title: t`You are offline`, preset: 'error'}); + //toast({title: t`You are offline`, preset: 'error'}); } setOnline(connected); } diff --git a/client/src/core/routes/ScreenLibrary.tsx b/client/src/core/routes/ScreenLibrary.tsx index 8a46a69a..2298cd18 100644 --- a/client/src/core/routes/ScreenLibrary.tsx +++ b/client/src/core/routes/ScreenLibrary.tsx @@ -1,7 +1,7 @@ import {Trans} from '@lingui/macro'; import {Icon} from 'react-exo/icon'; -import {Switch} from 'react-exo/switch'; -//import {Checkbox} from 'react-exo/checkbox'; +//import {Switch} from 'react-exo/switch'; +import {Checkbox} from 'react-exo/checkbox'; //import {Progress} from 'react-exo/progress'; //import {Slider} from 'react-exo/slider'; import {useStyles} from 'design/styles'; @@ -19,14 +19,14 @@ export default function ScreenHome() { color={theme.colors.primary} /> - {/*
+
-
*/} - {/*
+
+ {/*
console.log(value)} /> -
*/} +
mergeConfig( calendar: 'src/widgets/calendar/Calendar.export', checkbox: 'src/widgets/checkbox/Checkbox.export', picker: 'src/widgets/picker/Picker.export', - //progress: 'src/widgets/progress/Progress.export', - //radio: 'src/widgets/radio/Radio.export', + progress: 'src/widgets/progress/Progress.export', + radio: 'src/widgets/radio/Radio.export', slider: 'src/widgets/slider/Slider.export', switch: 'src/widgets/switch/Switch.export', /* Utils */ @@ -84,6 +84,7 @@ export default defineConfig(env => mergeConfig( 'react-native-skottie', 'react-native-svg', 'react-native-video', + 'burnt', ], }, },