Skip to content

Commit

Permalink
Misc
Browse files Browse the repository at this point in the history
  • Loading branch information
TheUltDev committed Jun 20, 2024
1 parent 38fe509 commit 58911cc
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 20 deletions.
6 changes: 0 additions & 6 deletions client/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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`)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -1410,7 +1405,6 @@ SPEC CHECKSUMS:
ReactCommon: 447281ad2034ea3252bf81a60d1f77d5afb0b636
ReactNativeHost: 6cd1ed318d4137d8e067702461d466c0d0e67422
ReactNativeNavigation: 86a23855d2ccc74ad3e59bff1595c2d4b76ed8cc
ReactNativeUiLib: e23a2b3d196aaaf561694cf76385c1ff3055bdc2
ReactTestApp-DevSupport: 0a10a887d4de1b16dee5d836998da6b9b90bf535
ReactTestApp-Resources: 857244f3a23f2b3157b364fa06cf3e8866deff9c
rive-react-native: 125db990f050d72c76aa37dc6c5cfaaf89f66086
Expand Down
1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:*",
Expand Down
4 changes: 2 additions & 2 deletions client/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -31,6 +31,6 @@ export function Layout(props: React.PropsWithChildren) {
networkActivityIndicatorVisible={online === false}
/>
{props.children}
<ToastRoot/>
{/*<ToastRoot/>*/}
</>
}
8 changes: 4 additions & 4 deletions client/src/core/hooks/useOnline.ts
Original file line number Diff line number Diff line change
@@ -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);
}
Expand Down
12 changes: 6 additions & 6 deletions client/src/core/routes/ScreenLibrary.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -19,22 +19,22 @@ export default function ScreenHome() {
color={theme.colors.primary}
/>
</Section>
{/* <Section title="Checkbox">
<Section title="Checkbox">
<Checkbox
boxColor={theme.colors.border}
boxColorOn={theme.colors.primary}
indicatorColor={theme.colors.primary}
/>
</Section> */}
{/* <Section title="Slider">
</Section>
{/*<Section title="Slider">
<Slider
value={50}
thumbColor={theme.colors.primary}
rangeColor={theme.colors.primary}
trackColor={theme.colors.secondary}
onChange={(value) => console.log(value)}
/>
</Section> */}
</Section>
<Section title="Switch">
<Switch
value={false}
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions toolkit/bundler/src/libs/exo.native.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export default defineConfig(env => 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 */
Expand Down Expand Up @@ -84,6 +84,7 @@ export default defineConfig(env => mergeConfig(
'react-native-skottie',
'react-native-svg',
'react-native-video',
'burnt',
],
},
},
Expand Down

0 comments on commit 58911cc

Please sign in to comment.