From de2b9de55b7f1ff1f933eb677be2b664d8d74b3e Mon Sep 17 00:00:00 2001 From: Samandar Turgunboyev Date: Tue, 26 Aug 2025 18:17:25 +0500 Subject: [PATCH] icon update --- assets/bootsplash/Instagram.png | Bin 0 -> 3538 bytes assets/bootsplash/Telegram.png | Bin 0 -> 2805 bytes assets/lottie/Empty box.json | 1 + assets/lottie/Empty box.lottie | Bin 0 -> 2027 bytes src/components/BottomModal.tsx | 6 +-- src/components/FileDrop.tsx | 4 +- src/components/Navbar.tsx | 19 +++------ src/components/NoResult.tsx | 4 +- src/screens/auth/login/ui/Confirm.tsx | 4 +- src/screens/auth/login/ui/index.tsx | 18 ++++----- src/screens/auth/registeration/ui/Confirm.tsx | 4 +- .../auth/registeration/ui/FirstStep.tsx | 36 ++++++++---------- .../auth/registeration/ui/SecondStep.tsx | 12 ++---- .../registeration/ui/TermsAndConditions.tsx | 4 +- .../auth/select-language/SelectLang.tsx | 13 ++++--- src/screens/home/home/ui/TabsAuto.tsx | 31 ++++----------- src/screens/home/home/ui/TabsAvia.tsx | 18 +-------- .../createPassport/ui/CreatePassword.tsx | 8 +--- .../profile/myProfile/ui/ProfileHeader.tsx | 15 ++------ .../warehouses/ui/TabsAutoWarehouses.tsx | 26 +++---------- .../warehouses/ui/TabsAviaWarehouses.tsx | 18 +-------- src/svg/ArrowUp.tsx | 16 ++++++++ src/svg/Calendar.tsx | 28 ++++++++++++++ src/svg/Download.tsx | 16 ++++++++ src/svg/Instagram.tsx | 17 +++++++++ src/svg/Telegram.tsx | 17 +++++++++ 26 files changed, 170 insertions(+), 165 deletions(-) create mode 100644 assets/bootsplash/Instagram.png create mode 100644 assets/bootsplash/Telegram.png create mode 100644 assets/lottie/Empty box.json create mode 100644 assets/lottie/Empty box.lottie create mode 100644 src/svg/ArrowUp.tsx create mode 100644 src/svg/Calendar.tsx create mode 100644 src/svg/Download.tsx create mode 100644 src/svg/Instagram.tsx create mode 100644 src/svg/Telegram.tsx diff --git a/assets/bootsplash/Instagram.png b/assets/bootsplash/Instagram.png new file mode 100644 index 0000000000000000000000000000000000000000..3b171a50c867acfbd90585abdf9ee950fb23f30b GIT binary patch literal 3538 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 M07*qoM6N<$f+&Ks5&!@I literal 0 HcmV?d00001 diff --git a/assets/bootsplash/Telegram.png b/assets/bootsplash/Telegram.png new file mode 100644 index 0000000000000000000000000000000000000000..c45f3d4c155c108a59b00954334e860ae357c85a GIT binary patch literal 2805 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 literal 0 HcmV?d00001 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;