diff --git a/assets/bootsplash/Instagram.png b/assets/bootsplash/Instagram.png new file mode 100644 index 0000000..3b171a5 Binary files /dev/null and b/assets/bootsplash/Instagram.png differ diff --git a/assets/bootsplash/Telegram.png b/assets/bootsplash/Telegram.png new file mode 100644 index 0000000..c45f3d4 Binary files /dev/null and b/assets/bootsplash/Telegram.png differ diff --git a/assets/lottie/Empty box.json b/assets/lottie/Empty box.json new file mode 100644 index 0000000..f79bf38 --- /dev/null +++ b/assets/lottie/Empty box.json @@ -0,0 +1 @@ +{"v":"4.7.0","fr":25,"ip":0,"op":50,"w":120,"h":120,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"ruoi","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.967]},"o":{"x":[0.167],"y":[0.033]},"n":["0p833_0p967_0p167_0p033"],"t":35,"s":[100],"e":[0]},{"t":49}]},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0,"y":0},"n":"0p833_0p833_0_0","t":0,"s":[57.361,61.016,0],"e":[57.699,41.796,0],"to":[-4.67500305175781,-4.12800598144531,0],"ti":[-13.9099960327148,5.27300262451172,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":10.219,"s":[57.699,41.796,0],"e":[79.084,33.982,0],"to":[12.8159942626953,-4.85800170898438,0],"ti":[-4.54498291015625,3.73400115966797,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":19.445,"s":[79.084,33.982,0],"e":[59.691,9.121,0],"to":[6.61601257324219,-5.43799591064453,0],"ti":[20.0290069580078,1.20700073242188,0]},{"t":35}]},"a":{"a":0,"k":[60.531,10.945,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.994,0],[0,-0.994],[0.995,0],[0,0.994]],"o":[[0.995,0],[0,0.994],[-0.994,0],[0,-0.994]],"v":[[-0.001,-1.801],[1.801,-0.001],[-0.001,1.801],[-1.801,-0.001]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.529,0.529,0.529,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[62.4,13.144],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.422,0],[0,-1.422],[1.421,0],[0,1.422]],"o":[[1.421,0],[0,1.422],[-1.422,0],[0,-1.422]],"v":[[0.001,-2.574],[2.574,0],[0.001,2.574],[-2.574,0]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.529,0.529,0.529,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0.7},"lc":1,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[64.145,9.606],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":3,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.996,0],[0,-1.996],[1.996,0],[0,1.996]],"o":[[1.996,0],[0,1.996],[-1.996,0],[0,-1.996]],"v":[[0,-3.614],[3.614,0],[0,3.614],[-3.614,0]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.529,0.529,0.529,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0.7},"lc":1,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[57.957,10.552],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":3,"cix":2,"ix":3,"mn":"ADBE Vector Group"},{"ty":"tr","p":{"a":0,"k":[60.531,10.941],"ix":2},"a":{"a":0,"k":[60.531,10.941],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"ruoi","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":50,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 2","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.967]},"o":{"x":[0.167],"y":[0.033]},"n":["0p833_0p967_0p167_0p033"],"t":35,"s":[100],"e":[0]},{"t":49}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[-0.75,-0.75,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-13.91,5.273],[-4.545,3.734],[20.029,1.207]],"o":[[-4.675,-4.128],[12.816,-4.858],[6.616,-5.438],[0,0]],"v":[[-7.383,24.76],[-7.046,5.54],[14.34,-2.273],[-3.178,-24.76]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.627,0.627,0.627,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":1},"lc":2,"lj":2,"d":[{"n":"d","nm":"dash","v":{"a":0,"k":2.028}},{"n":"g","nm":"gap","v":{"a":0,"k":2.028}},{"n":"o","nm":"offset","v":{"a":0,"k":0}}],"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[67.87,37.631],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.953]},"o":{"x":[0.167],"y":[0.033]},"n":["0p833_0p953_0p167_0p033"],"t":0,"s":[0],"e":[100]},{"t":35}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":50,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"im_emptyBox Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[60,60,0]},"a":{"a":0,"k":[60,60,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.001,-16.607],[-32.143,-0.002],[-0.001,16.607],[32.144,-0.002]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.8,0.82,0.851,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[60,55.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[12.856,-23.249],[0,-16.605],[-12.857,-23.249],[-45,-6.641],[-32.144,0.001],[-45,6.645],[-12.857,23.249],[0,16.609],[12.856,23.249],[45,6.645],[32.143,0.001],[45,-6.641]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.957,0.957,0.957,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[60,55.748],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-16.072,24.171],[16.072,11.312],[16.072,-24.171],[-16.072,-24.171]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.902,0.914,0.929,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[76.072,83.33],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-32.143,-24.171],[-32.143,11.311],[-0.001,24.171],[32.144,11.311],[32.144,-24.171]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.8,0.82,0.851,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[60,83.33],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 10","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group"},{"ty":"tr","p":{"a":0,"k":[60,60.186],"ix":2},"a":{"a":0,"k":[60,60.186],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"box","np":4,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":50,"st":0,"bm":0,"sr":1}]} \ No newline at end of file diff --git a/assets/lottie/Empty box.lottie b/assets/lottie/Empty box.lottie new file mode 100644 index 0000000..f000dc5 Binary files /dev/null and b/assets/lottie/Empty box.lottie differ diff --git a/src/components/BottomModal.tsx b/src/components/BottomModal.tsx index 2c0857d..19744df 100644 --- a/src/components/BottomModal.tsx +++ b/src/components/BottomModal.tsx @@ -10,7 +10,7 @@ import { TouchableOpacity, View, } from 'react-native'; -import Fontisto from 'react-native-vector-icons/Fontisto'; +import Telegram from 'screens/../../assets/bootsplash/Telegram.png'; import Local from 'screens/../../assets/bootsplash/local.png'; import Clock from 'svg/Clock'; import CloseIcon from 'svg/Close'; @@ -84,7 +84,7 @@ const BottomModal: React.FC = ({ - + {t('Telegram admin')} {branch?.telegramAdmin} @@ -93,7 +93,7 @@ const BottomModal: React.FC = ({ - + {t('Telegram kanal')} {branch?.telegramChannel} diff --git a/src/components/FileDrop.tsx b/src/components/FileDrop.tsx index e767eae..9fca85e 100644 --- a/src/components/FileDrop.tsx +++ b/src/components/FileDrop.tsx @@ -13,7 +13,7 @@ import { launchImageLibrary, MediaType, } from 'react-native-image-picker'; -import Feather from 'react-native-vector-icons/Feather'; +import Download from 'svg/Download'; interface FileData { uri: string; @@ -83,7 +83,7 @@ const SingleFileDrop: React.FC = ({ ( - + ), diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 309dc0f..358482b 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -12,9 +12,10 @@ import { View, } from 'react-native'; import AppLink from 'react-native-app-link'; -import Fontisto from 'react-native-vector-icons/Fontisto'; -import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons'; import Logo from 'screens/../../assets/bootsplash/logo.png'; +import Bell from 'svg/Bell'; +import Instagram from 'svg/Instagram'; +import Telegram from 'svg/Telegram'; import InAppBrowser from './InAppBrowser'; const { width } = Dimensions.get('window'); @@ -89,15 +90,11 @@ const Navbar = () => { - + - + {/* @@ -112,11 +109,7 @@ const Navbar = () => { navigation.navigate('Notifications')} > - + {/* */} )} diff --git a/src/components/NoResult.tsx b/src/components/NoResult.tsx index 45473b4..f5896f9 100644 --- a/src/components/NoResult.tsx +++ b/src/components/NoResult.tsx @@ -8,7 +8,7 @@ import { useWindowDimensions, View, } from 'react-native'; -import ProgressBar from 'screens/../../assets/lottie/non data found.json'; +import ProgressBar from 'screens/../../assets/lottie/Empty box.json'; interface Props { message?: string; @@ -56,7 +56,7 @@ const NoResult: React.FC = ({ loop autoPlay={true} resizeMode="cover" - style={{ width: 150 * scale, height: 150 * scale }} + style={{ width: 250 * scale, height: 250 * scale }} /> {t(message)} diff --git a/src/screens/auth/login/ui/Confirm.tsx b/src/screens/auth/login/ui/Confirm.tsx index 5f9d754..5f6a45c 100644 --- a/src/screens/auth/login/ui/Confirm.tsx +++ b/src/screens/auth/login/ui/Confirm.tsx @@ -18,10 +18,10 @@ import { View, } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; -import SimpleLineIcons from 'react-native-vector-icons/SimpleLineIcons'; import Logo from 'screens/../../assets/bootsplash/logo_512.png'; import { useModalStore } from 'screens/auth/registeration/lib/modalStore'; import LanguageSelector from 'screens/auth/select-language/SelectLang'; +import ArrowLeft from 'svg/ArrowLeft'; import { RootStackParamList } from 'types/types'; import { useUserStore } from '../lib/userstore'; import { Loginstyle } from './styled'; @@ -135,7 +135,7 @@ const Confirm = () => { navigation.navigate('Login')}> - + diff --git a/src/screens/auth/login/ui/index.tsx b/src/screens/auth/login/ui/index.tsx index 20d6df6..2987d51 100644 --- a/src/screens/auth/login/ui/index.tsx +++ b/src/screens/auth/login/ui/index.tsx @@ -21,10 +21,12 @@ import { View, } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; -import SimpleLineIcons from 'react-native-vector-icons/SimpleLineIcons'; import Logo from 'screens/../../assets/bootsplash/logo_512.png'; import { LoginFormType, loginSchema } from 'screens/auth/login/lib/form'; import LanguageSelector from 'screens/auth/select-language/SelectLang'; +import ArrowDown from 'svg/ArrowDown'; +import ArrowLeft from 'svg/ArrowLeft'; +import ArrowUp from 'svg/ArrowUp'; import { useUserStore } from '../lib/userstore'; import { Loginstyle } from './styled'; @@ -120,7 +122,7 @@ const Login = () => { - + @@ -236,13 +238,11 @@ const Login = () => { {branchList?.find(e => e.id === value)?.name || t('Filialni tanlang...')} - + {filialDropdownVisible ? ( + + ) : ( + + )} {filialDropdownVisible && ( diff --git a/src/screens/auth/registeration/ui/Confirm.tsx b/src/screens/auth/registeration/ui/Confirm.tsx index 5d1cd1a..5171df3 100644 --- a/src/screens/auth/registeration/ui/Confirm.tsx +++ b/src/screens/auth/registeration/ui/Confirm.tsx @@ -18,10 +18,10 @@ import { View, } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; -import SimpleLineIcons from 'react-native-vector-icons/SimpleLineIcons'; import Logo from 'screens/../../assets/bootsplash/logo_512.png'; import { useModalStore } from 'screens/auth/registeration/lib/modalStore'; import LanguageSelector from 'screens/auth/select-language/SelectLang'; +import ArrowLeft from 'svg/ArrowLeft'; import { RootStackParamList } from 'types/types'; import { useUserStore } from '../lib/userstore'; import { RegisterStyle } from './styled'; @@ -138,7 +138,7 @@ const Confirm = ({ setStep(1)}> - + diff --git a/src/screens/auth/registeration/ui/FirstStep.tsx b/src/screens/auth/registeration/ui/FirstStep.tsx index abefe7a..5131bf1 100644 --- a/src/screens/auth/registeration/ui/FirstStep.tsx +++ b/src/screens/auth/registeration/ui/FirstStep.tsx @@ -28,14 +28,16 @@ import { View, } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; -import AntDesign from 'react-native-vector-icons/AntDesign'; -import SimpleLineIcons from 'react-native-vector-icons/SimpleLineIcons'; import Logo from 'screens/../../assets/bootsplash/logo_512.png'; import { FirstStepFormType, FirstStepSchema, } from 'screens/auth/registeration/lib/form'; import LanguageSelector from 'screens/auth/select-language/SelectLang'; +import ArrowDown from 'svg/ArrowDown'; +import ArrowLeft from 'svg/ArrowLeft'; +import ArrowUp from 'svg/ArrowUp'; +import Check from 'svg/Check'; import { RootStackParamList } from 'types/types'; import { useUserStore } from '../lib/userstore'; import { RegisterStyle } from './styled'; @@ -156,7 +158,7 @@ const FirstStep = ({ onNext }: { onNext: () => void }) => { navigation.navigate('select-auth')}> - + @@ -274,13 +276,11 @@ const FirstStep = ({ onNext }: { onNext: () => void }) => { {branchList?.find(e => e.id === value)?.name || t('Filialni tanlang...')} - + {filialDropdownVisible ? ( + + ) : ( + + )} {filialDropdownVisible && ( @@ -341,15 +341,11 @@ const FirstStep = ({ onNext }: { onNext: () => void }) => { 'Bizni kim tavsiya qildi...', )} - + {recommendedDropdownVisible ? ( + + ) : ( + + )} {recommendedDropdownVisible && ( @@ -420,7 +416,7 @@ const FirstStep = ({ onNext }: { onNext: () => void }) => { ], }} > - + )} diff --git a/src/screens/auth/registeration/ui/SecondStep.tsx b/src/screens/auth/registeration/ui/SecondStep.tsx index d97c977..bddfbb0 100644 --- a/src/screens/auth/registeration/ui/SecondStep.tsx +++ b/src/screens/auth/registeration/ui/SecondStep.tsx @@ -29,10 +29,10 @@ import { View, } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; -import AntDesign from 'react-native-vector-icons/AntDesign'; -import SimpleLineIcons from 'react-native-vector-icons/SimpleLineIcons'; import Logo from 'screens/../../assets/bootsplash/logo_512.png'; import LanguageSelector from 'screens/auth/select-language/SelectLang'; +import ArrowLeft from 'svg/ArrowLeft'; +import Calendar from 'svg/Calendar'; import { RootStackParamList } from 'types/types'; import { SecondStepFormType, SecondStepSchema } from '../lib/form'; import { RegisterStyle } from './styled'; @@ -137,7 +137,7 @@ const SecondStep = () => { navigation.goBack()}> - + @@ -327,11 +327,7 @@ const SecondStep = () => { onPress={() => setDatePickerVisibility(true)} style={{ right: 15 }} > - + diff --git a/src/screens/auth/registeration/ui/TermsAndConditions.tsx b/src/screens/auth/registeration/ui/TermsAndConditions.tsx index 1f6a1dc..9e29400 100644 --- a/src/screens/auth/registeration/ui/TermsAndConditions.tsx +++ b/src/screens/auth/registeration/ui/TermsAndConditions.tsx @@ -10,7 +10,7 @@ import { View, } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; -import SimpleLineIcons from 'react-native-vector-icons/SimpleLineIcons'; +import ArrowLeft from 'svg/ArrowLeft'; import { RootStackParamList } from 'types/types'; type TermsScreenNavigationProp = NativeStackNavigationProp< @@ -30,7 +30,7 @@ const TermsAndConditions = () => { navigation.goBack()}> - + {t('Foydalanish shartlari')} diff --git a/src/screens/auth/select-language/SelectLang.tsx b/src/screens/auth/select-language/SelectLang.tsx index 7c95e4b..896332e 100644 --- a/src/screens/auth/select-language/SelectLang.tsx +++ b/src/screens/auth/select-language/SelectLang.tsx @@ -1,9 +1,10 @@ import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Image, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import Icon from 'react-native-vector-icons/Feather'; import RU from 'screens/../../assets/bootsplash/RU.png'; import UZ from 'screens/../../assets/bootsplash/UZ.png'; +import ArrowDown from 'svg/ArrowDown'; +import ArrowUp from 'svg/ArrowUp'; import { changeLanguage } from 'utils/changeLanguage'; const languages = [ @@ -43,11 +44,11 @@ const LanguageSelector = () => { /> {selectedLang?.label} - + {dropdownVisible ? ( + + ) : ( + + )} {dropdownVisible && ( diff --git a/src/screens/home/home/ui/TabsAuto.tsx b/src/screens/home/home/ui/TabsAuto.tsx index d61f33b..24a9d83 100644 --- a/src/screens/home/home/ui/TabsAuto.tsx +++ b/src/screens/home/home/ui/TabsAuto.tsx @@ -4,7 +4,6 @@ import { authApi } from 'api/auth'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { - Alert, FlatList, StyleSheet, Text, @@ -13,7 +12,6 @@ import { View, } from 'react-native'; import Toast from 'react-native-toast-message'; -import AntDesign from 'react-native-vector-icons/AntDesign'; import Copy from 'svg/Copy'; import Kitay from 'svg/Ki'; @@ -27,7 +25,6 @@ const TabsAuto = () => { queryKey: ['getMe'], queryFn: authApi.getMe, }); - console.log(getMe); const addressList = [ { @@ -35,9 +32,9 @@ const TabsAuto = () => { title: 'China (Auto)', postCode: '510440', addressInfo: [ - `收货人: ${getMe?.aviaCargoId}`, - '手机号码: 18335530701', - '北京市顺义区南法信旭辉空港中心C座', + `收件人∶吴彦祖AT(${getMe?.autoCargoId})`, + '地址∶广州市白云区龙归街道南村攀龙六巷30号AТ(N209)', + ' 电话: 18023847617', `1004 ${getMe?.aviaCargoId}`, ], }, @@ -98,9 +95,9 @@ const TabsAuto = () => { {item.title} - + {item.addressInfo.map((line, idx) => ( - + {line} ))} @@ -112,20 +109,6 @@ const TabsAuto = () => { {t('Auto post kodi')}: {item.postCode} - { - Clipboard.setString(item.postCode); - Alert.alert(t('Nusxa olindi'), t('Pochta kodi nusxalandi!')); - }} - style={{ marginLeft: 4 * scale }} - > - - ); @@ -141,12 +124,12 @@ const makeStyles = (scale: number, cardWidth: number, screenWidth: number) => paddingHorizontal: (screenWidth - cardWidth) / 2, }, card: { - height: 220 * scale, + height: '100%', width: cardWidth, backgroundColor: '#28a8e82c', borderRadius: 12 * scale, padding: 15 * scale, - gap: 10 * scale, + gap: 5 * scale, }, titleCard: { flexDirection: 'row', diff --git a/src/screens/home/home/ui/TabsAvia.tsx b/src/screens/home/home/ui/TabsAvia.tsx index 56208a8..463cd88 100644 --- a/src/screens/home/home/ui/TabsAvia.tsx +++ b/src/screens/home/home/ui/TabsAvia.tsx @@ -4,7 +4,6 @@ import { authApi } from 'api/auth'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { - Alert, FlatList, StyleSheet, Text, @@ -13,7 +12,6 @@ import { View, } from 'react-native'; import Toast from 'react-native-toast-message'; -import AntDesign from 'react-native-vector-icons/AntDesign'; import Copy from 'svg/Copy'; import Kitay from 'svg/Ki'; @@ -27,7 +25,7 @@ const TabsAvia = () => { { id: 1, title: 'China (Avia)', - postCode: '510440', + postCode: ' 101399', addressInfo: [ `收货人: ${getMe?.aviaCargoId}`, '手机号码: 18335530701', @@ -112,20 +110,6 @@ const TabsAvia = () => { {t('Avia post kodi')}: {item.postCode} - { - Clipboard.setString(item.postCode); - Alert.alert(t('Nusxa olindi'), t('Pochta kodi nusxalandi!')); - }} - style={{ marginLeft: 4 * scale }} - > - - ); diff --git a/src/screens/passport/createPassport/ui/CreatePassword.tsx b/src/screens/passport/createPassport/ui/CreatePassword.tsx index 09ed7ef..065c18a 100644 --- a/src/screens/passport/createPassport/ui/CreatePassword.tsx +++ b/src/screens/passport/createPassport/ui/CreatePassword.tsx @@ -20,7 +20,7 @@ import { View, } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; -import AntDesign from 'react-native-vector-icons/AntDesign'; +import Calendar from 'svg/Calendar'; import { PassportStyle } from '../../myPassport/ui/styled'; import { CreatePassSchema, CreatePassSchemaType } from '../lib/form'; import CreateModal from './CreateModal'; @@ -313,11 +313,7 @@ const CreatePassword = () => { setDatePickerVisibility(true)} > - + diff --git a/src/screens/profile/myProfile/ui/ProfileHeader.tsx b/src/screens/profile/myProfile/ui/ProfileHeader.tsx index 9b9836c..67e03c7 100644 --- a/src/screens/profile/myProfile/ui/ProfileHeader.tsx +++ b/src/screens/profile/myProfile/ui/ProfileHeader.tsx @@ -14,9 +14,10 @@ import { import ImagePicker from 'react-native-image-crop-picker'; import Modal from 'react-native-modal'; import SendIntentAndroid from 'react-native-send-intent'; -import Fontisto from 'react-native-vector-icons/Fontisto'; import GalleryEdit from 'svg/GalleryEdit'; +import Instagram from 'svg/Instagram'; import Plus from 'svg/Plus'; +import Telegram from 'svg/Telegram'; import Trash from 'svg/Trash'; const { width } = Dimensions.get('window'); @@ -200,19 +201,11 @@ const ProfileHeader = ({ userName = 'Samandar' }: { userName?: string }) => { - + - + {/* diff --git a/src/screens/profile/warehouses/ui/TabsAutoWarehouses.tsx b/src/screens/profile/warehouses/ui/TabsAutoWarehouses.tsx index 72f03ff..df131ea 100644 --- a/src/screens/profile/warehouses/ui/TabsAutoWarehouses.tsx +++ b/src/screens/profile/warehouses/ui/TabsAutoWarehouses.tsx @@ -4,7 +4,6 @@ import { authApi } from 'api/auth'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { - Alert, FlatList, StyleSheet, Text, @@ -13,7 +12,6 @@ import { View, } from 'react-native'; import Toast from 'react-native-toast-message'; -import AntDesign from 'react-native-vector-icons/AntDesign'; import Copy from 'svg/Copy'; import Kitay from 'svg/Ki'; @@ -35,9 +33,9 @@ const TabsAutoWarehouses = () => { title: 'China (Auto)', postCode: '510440', addressInfo: [ - `收货人: ${getMe?.aviaCargoId}`, - '手机号码: 18335530701', - '北京市顺义区南法信旭辉空港中心C座', + `收件人∶吴彦祖AT(${getMe?.autoCargoId})`, + '地址∶广州市白云区龙归街道南村攀龙六巷30号AТ(N209)', + ' 电话: 18023847617', `1004 ${getMe?.aviaCargoId}`, ], }, @@ -94,7 +92,7 @@ const TabsAutoWarehouses = () => { {item.title} - + {item.addressInfo.map((line, idx) => ( {line} @@ -108,20 +106,6 @@ const TabsAutoWarehouses = () => { {t('Auto post kodi')}: {item.postCode} - { - Clipboard.setString(item.postCode); - Alert.alert(t('Nusxa olindi'), t('Pochta kodi nusxalandi!')); - }} - style={{ marginLeft: 4 * scale }} - > - - ); @@ -133,7 +117,7 @@ const TabsAutoWarehouses = () => { const makeStyles = (scale: number, cardWidth: number, screenWidth: number) => StyleSheet.create({ card: { - height: 220 * scale, + height: '100%', width: cardWidth, backgroundColor: '#28a8e82c', borderRadius: 12 * scale, diff --git a/src/screens/profile/warehouses/ui/TabsAviaWarehouses.tsx b/src/screens/profile/warehouses/ui/TabsAviaWarehouses.tsx index c397111..eb863ad 100644 --- a/src/screens/profile/warehouses/ui/TabsAviaWarehouses.tsx +++ b/src/screens/profile/warehouses/ui/TabsAviaWarehouses.tsx @@ -4,7 +4,6 @@ import { authApi } from 'api/auth'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { - Alert, FlatList, StyleSheet, Text, @@ -13,7 +12,6 @@ import { View, } from 'react-native'; import Toast from 'react-native-toast-message'; -import AntDesign from 'react-native-vector-icons/AntDesign'; import Copy from 'svg/Copy'; import Kitay from 'svg/Ki'; @@ -27,7 +25,7 @@ const TabsAviaWarehouses = () => { { id: 1, title: 'China (Avia)', - postCode: '510440', + postCode: ' 101399', addressInfo: [ `收货人: ${getMe?.aviaCargoId}`, '手机号码: 18335530701', @@ -108,20 +106,6 @@ const TabsAviaWarehouses = () => { {t('Avia post kodi')}: {item.postCode} - { - Clipboard.setString(item.postCode); - Alert.alert(t('Nusxa olindi'), t('Pochta kodi nusxalandi!')); - }} - style={{ marginLeft: 4 * scale }} - > - - ); diff --git a/src/svg/ArrowUp.tsx b/src/svg/ArrowUp.tsx new file mode 100644 index 0000000..be79df5 --- /dev/null +++ b/src/svg/ArrowUp.tsx @@ -0,0 +1,16 @@ +import * as React from 'react'; +import Svg, { Path, SvgProps } from 'react-native-svg'; +const ArrowUp = ({ + width = 24, + height = 24, + color = '#2BA6E5', + ...props +}: SvgProps) => ( + + + +); +export default ArrowUp; diff --git a/src/svg/Calendar.tsx b/src/svg/Calendar.tsx new file mode 100644 index 0000000..938f06e --- /dev/null +++ b/src/svg/Calendar.tsx @@ -0,0 +1,28 @@ +import * as React from 'react'; +import Svg, { Path } from 'react-native-svg'; +interface Props { + color?: string; + width?: number; + height?: number; +} + +const Calendar = ({ color, height = 24, width = 24 }: Props) => ( + + + + +); +export default Calendar; diff --git a/src/svg/Download.tsx b/src/svg/Download.tsx new file mode 100644 index 0000000..4e01890 --- /dev/null +++ b/src/svg/Download.tsx @@ -0,0 +1,16 @@ +import * as React from 'react'; +import Svg, { Path } from 'react-native-svg'; +interface Props { + width?: number; + height?: number; + fill?: string; +} +const Download = ({ fill = '#FF6363', height = 24, width = 24 }: Props) => ( + + + +); +export default Download; diff --git a/src/svg/Instagram.tsx b/src/svg/Instagram.tsx new file mode 100644 index 0000000..52b1bc5 --- /dev/null +++ b/src/svg/Instagram.tsx @@ -0,0 +1,17 @@ +import * as React from 'react'; +import Svg, { Path } from 'react-native-svg'; +interface Props { + color: string; + width?: number; + height?: number; +} + +const Instagram = ({ color, height = 24, width = 24 }: Props) => ( + + + +); +export default Instagram; diff --git a/src/svg/Telegram.tsx b/src/svg/Telegram.tsx new file mode 100644 index 0000000..1c39aaa --- /dev/null +++ b/src/svg/Telegram.tsx @@ -0,0 +1,17 @@ +import * as React from 'react'; +import Svg, { Path } from 'react-native-svg'; +interface Props { + color: string; + width?: number; + height?: number; +} + +const Telegram = ({ color, height = 19, width = 20 }: Props) => ( + + + +); +export default Telegram;