Samandar/cpost-mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

icon update

Browse Source
This commit is contained in:
Samandar Turgunboyev
2025-08-26 18:17:25 +05:00
parent fd95422447
commit de2b9de55b
26 changed files with 170 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/screens/auth/login/ui/Confirm.tsx
View File

@@ -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 = () => {
<SafeAreaView style={{ flex: 1 }}>
<View style={styles.langContainer}>
<TouchableOpacity onPress={() => navigation.navigate('Login')}>
<SimpleLineIcons name="arrow-left" color="#000" size={20} />
<ArrowLeft color={'#000'} />
</TouchableOpacity>
<LanguageSelector />
</View>

18
src/screens/auth/login/ui/index.tsx
View File

@@ -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 = () => {
<SafeAreaView style={{ flex: 1 }}>
<View style={Loginstyle.langContainer}>
<TouchableOpacity onPress={handleBackNavigation}>
<SimpleLineIcons name="arrow-left" color="#000" size={20} />
<ArrowLeft color={'#000'} />
</TouchableOpacity>
<LanguageSelector />
</View>
@@ -236,13 +238,11 @@ const Login = () => {
{branchList?.find(e => e.id === value)?.name ||
t('Filialni tanlang...')}
</Text>
<SimpleLineIcons
name={
filialDropdownVisible ? 'arrow-up' : 'arrow-down'
}
color="#000"
size={14}
/>
{filialDropdownVisible ? (
<ArrowUp color={'#000'} />
) : (
<ArrowDown color={'#000'} />
)}
</TouchableOpacity>
</View>
{filialDropdownVisible && (

4
src/screens/auth/registeration/ui/Confirm.tsx
View File

@@ -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 = ({
<SafeAreaView style={{ flex: 1 }}>
<View style={styles.langContainer}>
<TouchableOpacity onPress={() => setStep(1)}>
<SimpleLineIcons name="arrow-left" color="#000" size={20} />
<ArrowLeft color={'#000'} />
</TouchableOpacity>
<LanguageSelector />
</View>

36
src/screens/auth/registeration/ui/FirstStep.tsx
View File

@@ -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 }) => {
<SafeAreaView style={{ flex: 1 }}>
<View style={RegisterStyle.langContainer}>
<TouchableOpacity onPress={() => navigation.navigate('select-auth')}>
<SimpleLineIcons name="arrow-left" color="#000" size={20} />
<ArrowLeft color="#000" />
</TouchableOpacity>
<LanguageSelector />
</View>
@@ -274,13 +276,11 @@ const FirstStep = ({ onNext }: { onNext: () => void }) => {
{branchList?.find(e => e.id === value)?.name ||
t('Filialni tanlang...')}
</Text>
<SimpleLineIcons
name={
filialDropdownVisible ? 'arrow-up' : 'arrow-down'
}
color="#000"
size={14}
/>
{filialDropdownVisible ? (
<ArrowUp color={'#000'} />
) : (
<ArrowDown color={'#000'} />
)}
</TouchableOpacity>
</View>
{filialDropdownVisible && (
@@ -341,15 +341,11 @@ const FirstStep = ({ onNext }: { onNext: () => void }) => {
'Bizni kim tavsiya qildi...',
)}
</Text>
<SimpleLineIcons
name={
recommendedDropdownVisible
? 'arrow-up'
: 'arrow-down'
}
color="#000"
size={14}
/>
{recommendedDropdownVisible ? (
<ArrowUp color={'#000'} />
) : (
<ArrowDown color={'#000'} />
)}
</TouchableOpacity>
</View>
{recommendedDropdownVisible && (
@@ -420,7 +416,7 @@ const FirstStep = ({ onNext }: { onNext: () => void }) => {
],
}}
>
<AntDesign name="check" color="#fff" size={20} />
<Check color="#fff" />
</Animated.View>
)}
</Animated.View>

12
src/screens/auth/registeration/ui/SecondStep.tsx
View File

@@ -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 = () => {
<SafeAreaView style={{ flex: 1 }}>
<View style={RegisterStyle.langContainer}>
<TouchableOpacity onPress={() => navigation.goBack()}>
<SimpleLineIcons name="arrow-left" color="#000" size={20} />
<ArrowLeft color="#000" />
</TouchableOpacity>
<LanguageSelector />
</View>
@@ -327,11 +327,7 @@ const SecondStep = () => {
onPress={() => setDatePickerVisibility(true)}
style={{ right: 15 }}
>
<AntDesign
name="calendar"
color="#D8DADC"
size={25}
/>
<Calendar color="#D8DADC" width={24} height={24} />
</TouchableOpacity>
</View>

4
src/screens/auth/registeration/ui/TermsAndConditions.tsx
View File

@@ -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 = () => {
<SafeAreaView style={styles.container}>
<View style={styles.header}>
<TouchableOpacity onPress={() => navigation.goBack()}>
<SimpleLineIcons name="arrow-left" color="#000" size={20} />
<ArrowLeft color="#000" />
</TouchableOpacity>
<Text style={styles.headerTitle}>{t('Foydalanish shartlari')}</Text>
<View style={{ width: 20 }} />

13
src/screens/auth/select-language/SelectLang.tsx
View File

@@ -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 = () => {
/>
<Text style={styles.selectedText}>{selectedLang?.label}</Text>
</View>
<Icon
name={dropdownVisible ? 'chevron-up' : 'chevron-down'}
size={20}
color="#555"
/>
{dropdownVisible ? (
<ArrowUp color={'#555'} width={20} height={20} />
) : (
<ArrowDown color={'#555'} width={20} height={20} />
)}
</TouchableOpacity>
{dropdownVisible && (

31
src/screens/home/home/ui/TabsAuto.tsx
View File

@@ -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 = () => {
<Text style={styles.title}>{item.title}</Text>
</View>
<View style={styles.infoId}>
<View style={{ gap: 4 * scale }}>
<View style={{ gap: 4 * scale, width: '90%' }}>
{item.addressInfo.map((line, idx) => (
<Text key={idx} style={styles.infoText}>
<Text key={idx} style={[styles.infoText]}>
{line}
</Text>
))}
@@ -112,20 +109,6 @@ const TabsAuto = () => {
<View style={styles.postCodeWrapper}>
<Text style={styles.postCodeText}>{t('Auto post kodi')}: </Text>
<Text style={styles.postCode}>{item.postCode}</Text>
<TouchableOpacity
onPress={() => {
Clipboard.setString(item.postCode);
Alert.alert(t('Nusxa olindi'), t('Pochta kodi nusxalandi!'));
}}
style={{ marginLeft: 4 * scale }}
>
<AntDesign
name="pushpin"
color="red"
size={16 * scale}
style={{ transform: [{ rotateY: '180deg' }] }}
/>
</TouchableOpacity>
</View>
</View>
);
@@ -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',

18
src/screens/home/home/ui/TabsAvia.tsx
View File

@@ -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 = () => {
<View style={styles.postCodeWrapper}>
<Text style={styles.postCodeText}>{t('Avia post kodi')}: </Text>
<Text style={styles.postCode}>{item.postCode}</Text>
<TouchableOpacity
onPress={() => {
Clipboard.setString(item.postCode);
Alert.alert(t('Nusxa olindi'), t('Pochta kodi nusxalandi!'));
}}
style={{ marginLeft: 4 * scale }}
>
<AntDesign
name="pushpin"
color="red"
size={16 * scale}
style={{ transform: [{ rotateY: '180deg' }] }}
/>
</TouchableOpacity>
</View>
</View>
);

8
src/screens/passport/createPassport/ui/CreatePassword.tsx
View File

@@ -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 = () => {
<TouchableOpacity
onPress={() => setDatePickerVisibility(true)}
>
<AntDesign
name="calendar"
color="#D8DADC"
size={25}
/>
<Calendar color="#D8DADC" width={25} height={25} />
</TouchableOpacity>
</View>

15
src/screens/profile/myProfile/ui/ProfileHeader.tsx
View File

@@ -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 }) => {
<View style={styles.links}>
<TouchableOpacity onPress={openTelegram}>
<Fontisto
name="telegram"
color="#28A7E8"
size={isSmallScreen ? 20 : 24}
/>
<Telegram color="#28A7E8" width={24} height={24} />
</TouchableOpacity>
<TouchableOpacity onPress={openInstagram}>
<Fontisto
name="instagram"
color="#28A7E8"
size={isSmallScreen ? 18 : 22}
/>
<Instagram color="#28A7E8" width={24} height={24} />
</TouchableOpacity>
{/* <TouchableOpacity onPress={openFacebook}>

26
src/screens/profile/warehouses/ui/TabsAutoWarehouses.tsx
View File

@@ -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 = () => {
<Text style={styles.title}>{item.title}</Text>
</View>
<View style={styles.infoId}>
<View style={{ gap: 4 * scale }}>
<View style={{ gap: 4 * scale, width: '90%' }}>
{item.addressInfo.map((line, idx) => (
<Text key={idx} style={styles.infoText}>
{line}
@@ -108,20 +106,6 @@ const TabsAutoWarehouses = () => {
<View style={styles.postCodeWrapper}>
<Text style={styles.postCodeText}>{t('Auto post kodi')}: </Text>
<Text style={styles.postCode}>{item.postCode}</Text>
<TouchableOpacity
onPress={() => {
Clipboard.setString(item.postCode);
Alert.alert(t('Nusxa olindi'), t('Pochta kodi nusxalandi!'));
}}
style={{ marginLeft: 4 * scale }}
>
<AntDesign
name="pushpin"
color="red"
size={16 * scale}
style={{ transform: [{ rotateY: '180deg' }] }}
/>
</TouchableOpacity>
</View>
</View>
);
@@ -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,

18
src/screens/profile/warehouses/ui/TabsAviaWarehouses.tsx
View File

@@ -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 = () => {
<View style={styles.postCodeWrapper}>
<Text style={styles.postCodeText}>{t('Avia post kodi')}: </Text>
<Text style={styles.postCode}>{item.postCode}</Text>
<TouchableOpacity
onPress={() => {
Clipboard.setString(item.postCode);
Alert.alert(t('Nusxa olindi'), t('Pochta kodi nusxalandi!'));
}}
style={{ marginLeft: 4 * scale }}
>
<AntDesign
name="pushpin"
color="red"
size={16 * scale}
style={{ transform: [{ rotateY: '180deg' }] }}
/>
</TouchableOpacity>
</View>
</View>
);