circle dependencies issue solved, support bunny auth in UI

package.json

@@ -94,7 +94,7 @@
     "react-native-picker-select": "^8.0.4",
     "react-native-reanimated": "^2.1.0",
     "react-native-responsive-screen": "^1.4.2",
-    "react-native-safe-area-context": "^3.2.0",
+    "react-native-safe-area-context": "3.2.0",
     "react-native-screens": "~3.0.0",
     "react-native-snap-carousel": "^3.9.1",
     "react-native-svg": "12.1.0",

src/App.tsx

@@ -6,20 +6,17 @@ import {AppearanceProvider} from 'react-native-appearance';
 import {Theme as ThemeNavigation} from '@react-navigation/native';
 import BunnyConstants from './constants/constants';
 import {RootState} from './types';
-import {restoreIsReady, restoreNavInitialState, sysError} from './store/actions';
-import {
-    AuthLaborProvider,
-    I18nLaborProvider,
-    RequestProvider,
-    SizeLaborProvider,
-    ThemeLaborContext,
-    ThemeLaborProvider
-} from './providers';
-import {Preparing} from './components';
+import {collectSysError, restoreIsReady, restoreNavInitialState} from './store/actions';
+import {ThemeLaborContext, ThemeLaborProvider} from './providers/theme-labor';
+import {Preparing} from './components/Preparing';
 import {useTranslation} from 'react-i18next';
+import {RequestProvider} from './providers/request-labor';
 import {loadAsync} from 'expo-font';
 import icoMoonFont from './assets/fonts/icomoon/fonts/icomoon.ttf';
+import {SizeLaborProvider} from './providers/size-labor';
 import NavigatorTree from './navigation/NavigatorTree';
+import {AuthLaborProvider} from './providers/auth-labor';
+import {I18nLaborProvider} from './providers/i18n-labor';
 import RequestLoading from './components/RequestLoading';
 import BLToast from './components/BLToast';
 import Sys from './components/Sys';
@@ -42,7 +39,7 @@ function App() {
             try {
                 await loadAsync({IcoMoon: icoMoonFont});
             } catch (err: any) {
-                dispatch(sysError(err.toString()));
+                dispatch(collectSysError(err.toString()));
             } finally {
                 try {
                     if (Platform.OS !== 'web') {
@@ -53,14 +50,14 @@ function App() {
                         }
                     }
                 } catch (err: any) {
-                    dispatch(sysError(err.toString()));
+                    dispatch(collectSysError(err.toString()));
                 } finally {
                     dispatch(restoreIsReady({isReady: true}));
                 }
             }
         };
         bootstrapAsync()
-            .catch((err) => dispatch(sysError(err.toString())));
+            .catch((err) => dispatch(collectSysError(err.toString())));
         return () => clearTimeout(mockPreparingTimer);
     }, []);
 

src/components/AudioPlayer/AudioPlayer.tsx

@@ -6,7 +6,7 @@ import {AVPlaybackSource, AVPlaybackStatus} from '../../../packages/expo-av/src/
 import {Audio} from '../../../packages/expo-av/src';
 import {ProgressBar} from 'react-native-paper';
 import {minuted} from '../../utils';
-import {useBunnyKit} from '../../hooks';
+import {useBunnyKit} from '../../hooks/bunny-kit';
 
 export interface AudioPlayerProps {
     source: AVPlaybackSource,
@@ -58,7 +58,7 @@ export function AudioPlayer(props: AudioPlayerProps) {
                 soundRef.current = sound;
                 soundRef.current.setOnPlaybackStatusUpdate(setStatus);
                 onLoadEnd?.();
-            } catch (e) {
+            } catch (e: any) {
                 isDebug && console.log(e.toString());
                 setError(e.toString());
                 onError?.(e);

src/components/AudioPlayer/styles.tsx

@@ -1,5 +1,5 @@
 import {StyleSheet} from 'react-native';
-import {useSizeLabor} from '../../providers';
+import {useSizeLabor} from '../../providers/size-labor';
 import {getSharedStyles} from '../../helpers';
 import {SizeLabor, ThemeLabor} from '../../types';
 

src/components/AudioRecorder/AudioRecorder.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {useEffect, useState} from 'react';
-import {useBunnyKit} from '../../hooks';
+import {useBunnyKit} from '../../hooks/bunny-kit';
 import {IcoMoon} from '../UI';
 import {Platform, TouchableHighlight, Vibration} from 'react-native';
 import {Audio} from '../../../packages/expo-av/src';

src/components/AudioRecorder/styles.tsx

@@ -1,5 +1,5 @@
 import {StyleSheet} from 'react-native';
-import {useSizeLabor} from '../../providers';
+import {useSizeLabor} from '../../providers/size-labor';
 import {getSharedStyles} from '../../helpers';
 import {SizeLabor, ThemeLabor} from '../../types';
 

src/components/Avatar/Avatar.tsx

@@ -3,7 +3,7 @@ import {Image, ImageSourcePropType, ImageStyle, ImageURISource, StyleProp} from
 import {getStyles} from './styles';
 import {SizeKeys} from '../../types';
 import {ImageUploader, ImageUploaderProps} from '../ImageUploader';
-import {useBunnyKit} from '../../hooks';
+import {useBunnyKit} from '../../hooks/bunny-kit';
 
 export interface AvatarProps {
     source: ImageSourcePropType,

src/components/Avatar/styles.tsx

@@ -1,5 +1,5 @@
 import {StyleSheet} from 'react-native';
-import {useSizeLabor} from '../../providers';
+import {useSizeLabor} from '../../providers/size-labor';
 import {getSharedStyles} from '../../helpers';
 import {SizeLabor, ThemeLabor} from '../../types';
 

src/components/BLToast/BLToast.tsx

@@ -5,7 +5,7 @@ import {getStyles} from './styles';
 import {Snackbar} from 'react-native-paper';
 import {Text, View} from '../UI';
 import {setBLResult} from '../../store/actions';
-import {useBunnyKit} from '../../hooks';
+import {useBunnyKit} from '../../hooks/bunny-kit';
 
 const BLToast = () => {
     const {sizeLabor, themeLabor} = useBunnyKit();

src/components/BunnyChat/Actions.tsx

@@ -1,6 +1,6 @@
 import React, {ReactNode} from 'react';
 import {StyleProp, StyleSheet, Text, TextStyle, TouchableOpacity, View, ViewStyle,} from 'react-native';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {ActionSheetProps, connectActionSheet} from '../../../packages/react-native-action-sheet/src';
 import {SizeLabor, ThemeLabor} from '../../types';
 

src/components/BunnyChat/Bubble.tsx

@@ -23,7 +23,7 @@ import Time, {TimeProps} from './Time';
 import {isSameDay, isSameUser} from './utils';
 import {IMessage, LeftRightStyle, PositionLeftOrRight, User,} from './types';
 import MessageSticker, {MessageStickerProps} from './MessageSticker';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {ActionSheetProps, connectActionSheet} from '../../../packages/react-native-action-sheet/src';
 import {SizeLabor, ThemeLabor} from '../../types';
 

src/components/BunnyChat/BunnyAvatar.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import {Image, ImageStyle, StyleProp, StyleSheet, Text, TextStyle, TouchableOpacity, View,} from 'react-native';
 import {User} from './types';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {SizeLabor, ThemeLabor} from '../../types';
 
 

src/components/BunnyChat/BunnyChat.tsx

@@ -36,7 +36,7 @@ import BunnyAvatar from './BunnyAvatar';
 
 import {DATE_FORMAT, DEFAULT_PLACEHOLDER, MAX_COMPOSER_HEIGHT, MIN_COMPOSER_HEIGHT, TIME_FORMAT,} from './Constant';
 import {IMessage,} from './types';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {SizeLabor, ThemeLabor} from '../../types';
 
 dayjs.extend(localizedFormat);

src/components/BunnyChat/ChatAvatar.tsx

@@ -3,7 +3,7 @@ import {ImageStyle, StyleSheet, TextStyle, View, ViewStyle,} from 'react-native'
 import BunnyAvatar from './BunnyAvatar';
 import {isSameDay, isSameUser} from './utils';
 import {IMessage, LeftRightStyle, PositionLeftOrRight, User} from './types';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {SizeLabor, ThemeLabor} from '../../types';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {

src/components/BunnyChat/Composer.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import {Platform, StyleSheet, TextInput, TextInputProps} from 'react-native';
 import {DEFAULT_PLACEHOLDER, MIN_COMPOSER_HEIGHT} from './Constant';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {SizeLabor, ThemeLabor} from '../../types';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {

src/components/BunnyChat/Day.tsx

@@ -5,7 +5,7 @@ import dayjs from 'dayjs';
 import {isSameDay} from './utils';
 import {DATE_FORMAT} from './Constant';
 import {IMessage} from './types';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {SizeLabor, ThemeLabor} from '../../types';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {

src/components/BunnyChat/InputToolbar.tsx

@@ -5,7 +5,7 @@ import Composer, {ComposerProps} from './Composer';
 import Send, {SendProps} from './Send';
 import Actions, {ActionsProps} from './Actions';
 import {IMessage} from './types';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {SizeLabor, ThemeLabor} from '../../types';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {

src/components/BunnyChat/LoadEarlier.tsx

@@ -10,7 +10,7 @@ import {
     View,
     ViewStyle,
 } from 'react-native';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {ActivityIndicatorSize} from './types';
 import {SizeLabor, ThemeLabor} from '../../types';
 

src/components/BunnyChat/Message.tsx

@@ -8,7 +8,7 @@ import Day, {DayProps} from './Day';
 
 import {isSameUser} from './utils';
 import {IMessage, LeftRightStyle, PositionLeftOrRight, User} from './types';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {SizeLabor, ThemeLabor} from '../../types';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {

src/components/BunnyChat/MessageAudio.tsx

@@ -4,7 +4,7 @@ import {StyleProp, StyleSheet, Text, TextStyle, View, ViewStyle} from 'react-nat
 import {IMessage, PositionLeftOrRight} from './types';
 import {AudioPlayer, AudioPlayerProps} from '../AudioPlayer';
 import {SizeLabor, ThemeLabor} from '../../types';
-import {withBunnyKit, WithBunnyKit} from '../../hooks';
+import {withBunnyKit, WithBunnyKit} from '../../hooks/bunny-kit';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {
     const {wp} = sizeLabor.designsBasedOn.iphoneX;

src/components/BunnyChat/MessageContainer.tsx

@@ -20,7 +20,7 @@ import Message, {MessageProps} from './Message';
 import {IMessage, PositionLeftOrRight, Reply, User} from './types';
 import {warning} from './utils';
 import TypingIndicator from './TypingIndicator';
-import {withBunnyKit, WithBunnyKit} from '../../hooks';
+import {withBunnyKit, WithBunnyKit} from '../../hooks/bunny-kit';
 import {SizeLabor, ThemeLabor} from '../../types';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {

src/components/BunnyChat/MessageImage.tsx

@@ -3,7 +3,7 @@ import {Image, ImageProps, ImageStyle, StyleProp, StyleSheet, Text, View, ViewSt
 import {IMessage} from './types';
 import LightBox from '../../../packages/react-native-lightbox';
 import {SizeLabor, ThemeLabor} from '../../types';
-import {withBunnyKit, WithBunnyKit} from '../../hooks';
+import {withBunnyKit, WithBunnyKit} from '../../hooks/bunny-kit';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {
     const {wp} = sizeLabor.designsBasedOn.iphoneX;

src/components/BunnyChat/MessageSticker.tsx

@@ -3,7 +3,7 @@ import {Image, ImageProps, ImageStyle, StyleProp, StyleSheet, Text, View, ViewSt
 // TODO: support web
 import {IMessage} from './types';
 import {SizeLabor, ThemeLabor} from '../../types';
-import {withBunnyKit, WithBunnyKit} from '../../hooks';
+import {withBunnyKit, WithBunnyKit} from '../../hooks/bunny-kit';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {
     const {wp} = sizeLabor.designsBasedOn.iphoneX;

src/components/BunnyChat/MessageText.tsx

@@ -3,7 +3,7 @@ import {Linking, StyleProp, StyleSheet, Text, TextProps, TextStyle, View, ViewSt
 import ParsedText from 'react-native-parsed-text';
 import Communications from 'react-native-communications';
 import {IMessage, LeftRightStyle, PositionLeftOrRight} from './types';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {ActionSheetProps, connectActionSheet} from '../../../packages/react-native-action-sheet/src';
 import {SizeLabor, ThemeLabor} from '../../types';
 

src/components/BunnyChat/MessageVideo.tsx

@@ -4,7 +4,7 @@ import {StyleProp, StyleSheet, Text, View, ViewStyle} from 'react-native';
 import {IMessage} from './types';
 import {Video, VideoProps} from '../../../packages/expo-av/src';
 import {SizeLabor, ThemeLabor} from '../../types';
-import {withBunnyKit, WithBunnyKit} from '../../hooks';
+import {withBunnyKit, WithBunnyKit} from '../../hooks/bunny-kit';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {
     const {wp} = sizeLabor.designsBasedOn.iphoneX;

src/components/BunnyChat/QuickReplies.tsx

@@ -3,7 +3,7 @@ import {StyleProp, StyleSheet, Text, TouchableOpacity, View, ViewStyle,} from 'r
 import {IMessage, Reply} from './types';
 import {warning} from './utils';
 import {SizeLabor, ThemeLabor} from '../../types';
-import {withBunnyKit, WithBunnyKit} from '../../hooks';
+import {withBunnyKit, WithBunnyKit} from '../../hooks/bunny-kit';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {
     const {wp} = sizeLabor.designsBasedOn.iphoneX;

src/components/BunnyChat/Send.tsx

@@ -11,7 +11,7 @@ import {
 } from 'react-native';
 import {IMessage} from './types';
 import {SizeLabor, ThemeLabor} from '../../types';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {
     const {wp} = sizeLabor.designsBasedOn.iphoneX;

src/components/BunnyChat/SystemMessage.tsx

@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 import {StyleProp, StyleSheet, Text, TextStyle, View, ViewStyle,} from 'react-native';
 import {IMessage} from './types';
 import {SizeLabor, ThemeLabor} from '../../types';
-import {withBunnyKit, WithBunnyKit} from '../../hooks';
+import {withBunnyKit, WithBunnyKit} from '../../hooks/bunny-kit';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {
     const {wp} = sizeLabor.designsBasedOn.iphoneX;

src/components/BunnyChat/Time.tsx

@@ -3,7 +3,7 @@ import {StyleSheet, Text, TextStyle, View, ViewStyle} from 'react-native';
 import dayjs from 'dayjs';
 import {TIME_FORMAT} from './Constant';
 import {IMessage, LeftRightStyle, PositionLeftOrRight} from './types';
-import {WithBunnyKit, withBunnyKit} from '../../hooks';
+import {WithBunnyKit, withBunnyKit} from '../../hooks/bunny-kit';
 import {SizeLabor, ThemeLabor} from '../../types';
 
 

src/components/BunnyChat/TypingIndicator.tsx

@@ -4,7 +4,7 @@ import {TypingAnimation} from 'react-native-typing-animation';
 import {useUpdateLayoutEffect} from './hooks/useUpdateLayoutEffect';
 import config from '../../config';
 import {SizeLabor, ThemeLabor} from '../../types';
-import {useBunnyKit} from '../../hooks';
+import {useBunnyKit} from '../../hooks/bunny-kit';
 
 const getStyles = (sizeLabor: SizeLabor, themeLabor: ThemeLabor) => {
     const {wp} = sizeLabor.designsBasedOn.iphoneX;

src/components/CachedImage/CachedImage.tsx

@@ -54,8 +54,8 @@ export class CachedImage extends React.Component<CashedImageProps, CashedImageSt
                         }
                     }, (progress) => {
                     });
-            } catch (error) {
-                onError?.(error);
+            } catch (e: any) {
+                onError?.(e);
             }
         }
     }

src/components/ColorValuesCard/ColorValuesCard.tsx

@@ -3,8 +3,9 @@ import {Text, View} from '../UI';
 import {CopyableText} from '../CopyableText';
 import React from 'react';
 import {getStyles} from './styles';
-import {Col, Row} from '../../containers';
-import {useBunnyKit} from '../../hooks';
+import {Row} from '../../containers/Row';
+import {Col} from '../../containers/Col';
+import {useBunnyKit} from '../../hooks/bunny-kit';
 
 export const ColorValuesCard = (props: { item: ColorDiffWithThemeColorsItem | ColorDiffWithPaletteItem | ColorInputItem }) => {
     const {sizeLabor, themeLabor} = useBunnyKit();

src/components/CopyableText/CopyableText.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import {Clipboard, TextProps, TouchableOpacity} from 'react-native';
 import {collectBLResult} from '../../store/actions';
 import {blSuccess} from '../../helpers';
-import {useThemeLabor} from '../../providers';
+import {useThemeLabor} from '../../providers/theme-labor';
 import {Text} from '../UI';
 import {useDispatch} from 'react-redux';
 

src/components/DemoCCClock/DemoCCClock.tsx

@@ -1,6 +1,6 @@
 import React, {PureComponent} from 'react';
 import {ButtonTO, InButtonText, Text, View} from '../UI';
-import {withSizeLabor, WithSizeLabor} from '../../providers/size-labor';
+import {WithSizeLabor, withSizeLabor} from '../../providers/size-labor';
 
 interface Props extends WithSizeLabor {
     title: string,
@@ -57,6 +57,4 @@ export class DemoCCClockInner extends PureComponent<Props, States> {
     }
 }
 
-console.log('withSizeLabor', withSizeLabor);
-
 export const DemoCCClock = withSizeLabor(DemoCCClockInner);

src/components/DemoLazy/DemoLazy.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import {Text, View} from '../UI';
 import {getStyles} from './styles';
-import {useBunnyKit} from '../../hooks';
+import {useBunnyKit} from '../../hooks/bunny-kit';
 
 interface Props {
     title: string;

src/components/DemoLazyLoading/DemoLazyLoading.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import {Text, View} from '../UI';
 import {getStyles} from './styles';
 import {ActivityIndicator} from 'react-native';
-import {useBunnyKit} from '../../hooks';
+import {useBunnyKit} from '../../hooks/bunny-kit';
 
 export function DemoLazyLoading() {
     const {sizeLabor, themeLabor, t, wp} = useBunnyKit();

src/components/DemoPureComponent/DemoPureComponent.tsx

@@ -1,7 +1,8 @@
 import React, {PureComponent} from 'react';
 import {Text, View} from '../UI';
 import {getStyles} from './styles';
-import {SizeLaborContext, ThemeLaborContext} from '../../providers';
+import {SizeLaborContext} from '../../providers/size-labor';
+import {ThemeLaborContext} from '../../providers/theme-labor';
 
 interface Props {
     title?: string,