Reza_ashrafi
/
RnDanovinExpo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reza fixed components berfore Address

Browse Source
master
Reza_ashrafi 3 years ago
parent 72e4f631a1
commit a8f4d7fe52
13 changed files with 72 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/components/CustomTextInput.js
  2. 6
      src/components/Pressable.js
  3. 2
      src/redux/reducers/public.js
  4. 1
      src/redux/reducers/userFactor.js
  5. 2
      src/redux/store.js
  6. 12
      src/screens/Activation/index.js
  7. 19
      src/screens/Home/components/Blogs.js
  8. 12
      src/screens/Home/components/Header.js
  9. 22
      src/screens/Home/components/MyBooks.js
  10. 2
      src/screens/Home/components/Scroll.js
  11. 13
      src/screens/Home/components/Videos.js
  12. 23
      src/screens/Login/index.js
  13. 23
      src/screens/Otp/index.js

19
src/components/CustomTextInput.js
Unescape View File

@ -5,8 +5,6 @@ import {
Text, Text,
Dimensions, Dimensions,
StyleSheet, StyleSheet,
useColorScheme,
Platform
} from "react-native"; } from "react-native";
import {connect} from 'react-redux'; import {connect} from 'react-redux';
@ -14,8 +12,6 @@ import tw from "tailwind-rn";
import Colors from "../constants/Colors"; import Colors from "../constants/Colors";
import fontSize from "../constants/fontSize"; import fontSize from "../constants/fontSize";
const width = Dimensions.get("window").width;
const FloatingLabelInput = ({ const FloatingLabelInput = ({
label, label,
textAlign, textAlign,
@ -32,9 +28,9 @@ const FloatingLabelInput = ({
mobile, mobile,
keyboardType, keyboardType,
multiline, multiline,
theme,
...props ...props
}) => { }) => {
const colorScheme = useColorScheme();
const [isFocused, setIsFocused] = useState(false); const [isFocused, setIsFocused] = useState(false);
const styles = StyleSheet.create({ const styles = StyleSheet.create({
@ -52,16 +48,16 @@ const FloatingLabelInput = ({
}, },
], ],
color: !isFocused color: !isFocused
? Colors.theme1[colorScheme].gray2077 ? Colors.theme1[theme].gray2077
: Colors.theme1[colorScheme].green79, : Colors.theme1[theme].green79,
}, },
inputStyle: { inputStyle: {
fontSize: fontSize.lg, fontSize: fontSize.lg,
color: Colors.theme1[colorScheme].black, color: Colors.theme1[theme].black,
borderWidth: 1, borderWidth: 1,
borderColor: isFocused borderColor: isFocused
? Colors.theme1[colorScheme].greenC8 ? Colors.theme1[theme].greenC8
: Colors.theme1[colorScheme].gray2077 + "66", : Colors.theme1[theme].gray2077 + "66",
textAlign: textAlign, textAlign: textAlign,
fontFamily: "regular", fontFamily: "regular",
direction: direction ? direction : "rtl", direction: direction ? direction : "rtl",
@ -104,7 +100,8 @@ const FloatingLabelInput = ({
}; };
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
mobile: state.publicApi.mobile mobile: state.publicApi.mobile,
theme: state.publicApi.theme
}) })
export default connect(mapStateToProps)(FloatingLabelInput); export default connect(mapStateToProps)(FloatingLabelInput);

6
src/components/Pressable.js
Unescape View File

@ -14,7 +14,8 @@ function Pressable1({
width, width,
onPress, onPress,
loading, loading,
mobile mobile,
theme
}) { }) {
return ( return (
<TouchableOpacity <TouchableOpacity
@ -43,7 +44,8 @@ function Pressable1({
} }
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
mobile : state.publicApi.mobile mobile : state.publicApi.mobile,
theme : state.publicApi.theme
}) })
export default connect(mapStateToProps)(Pressable1); export default connect(mapStateToProps)(Pressable1);

2
src/redux/reducers/public.js
Unescape View File

@ -4,7 +4,7 @@ import { Dimensions } from "react-native";
const width = Dimensions.get("window").width; const width = Dimensions.get("window").width;
const initialState = { const initialState = {
// isDark: (await AsyncStorage.getItem("isDark")) || false, theme: 'light',
mobile : width < 720, mobile : width < 720,
homeData: [], homeData: [],
newProducts: [], newProducts: [],

1
src/redux/reducers/userFactor.js
Unescape View File

@ -28,7 +28,6 @@ export default function userFactor(state = initialState, action) {
error: null, error: null,
}; };
case "userFactor/fullList": case "userFactor/fullList":
console.log(data);
return { return {
...state, ...state,
loading: false, loading: false,

2
src/redux/store.js
Unescape View File

@ -68,7 +68,7 @@ const persistor = persistStore(store);
const ReactNative = require("react-native"); const ReactNative = require("react-native");
try { try {
ReactNative.I18nManager.allowRTL(false); ReactNative.I18nManager.allowRTL(false);
// enableScreens(); enableScreens();
} catch (e) { } catch (e) {
} }

12
src/screens/Activation/index.js
Unescape View File

@ -1,13 +1,11 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { import {
View, View,
Text,
TextInput, TextInput,
StatusBar, StatusBar,
Platform, Platform,
KeyboardAvoidingView, KeyboardAvoidingView,
TouchableWithoutFeedback, TouchableWithoutFeedback,
Appearance,
SafeAreaView, SafeAreaView,
} from "react-native"; } from "react-native";
import { connect } from "react-redux"; import { connect } from "react-redux";
@ -29,8 +27,7 @@ import bgQr from "./assets/bgQr.png";
const ios = Platform.OS === "ios"; const ios = Platform.OS === "ios";
function Activation({ add, mobile }) { function Activation({ add, mobile, theme }) {
const colorScheme = Appearance.getColorScheme();
const [value, setValue] = useState(null); const [value, setValue] = useState(null);
return ( return (
@ -101,7 +98,7 @@ function Activation({ add, mobile }) {
/> />
<CustomPressable <CustomPressable
title={"تایید کد"} title={"تایید کد"}
backgroundColor={Colors.theme1[colorScheme].greenCF} backgroundColor={Colors.theme1[theme].greenCF}
color={"white"} color={"white"}
border={{ color: "#196EC0", width: 0 }} border={{ color: "#196EC0", width: 0 }}
width={"100%"} width={"100%"}
@ -110,7 +107,7 @@ function Activation({ add, mobile }) {
<Or /> <Or />
<CustomPressable <CustomPressable
title={"فعالسازی با کد QR"} title={"فعالسازی با کد QR"}
backgroundColor={Colors.theme1[colorScheme].greenD9} backgroundColor={Colors.theme1[theme].greenD9}
color={"white"} color={"white"}
border={{ color: "#196EC0", width: 0 }} border={{ color: "#196EC0", width: 0 }}
width={"100%"} width={"100%"}
@ -129,7 +126,8 @@ Activation.defaultProps = {
}; };
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
mobile : state.publicApi.mobile mobile : state.publicApi.mobile,
theme: state.publicApi.theme
}); });
const mapDispatchToProps = { const mapDispatchToProps = {

19
src/screens/Home/components/Blogs.js
Unescape View File

@ -11,7 +11,7 @@ import {
Platform, Platform,
} from "react-native"; } from "react-native";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { useNavigation} from '@react-navigation/native'; import { useNavigation } from "@react-navigation/native";
//components //components
import Header from "../components/Header"; import Header from "../components/Header";
@ -27,7 +27,7 @@ import userImage from "../assets/user.png";
const { width } = Dimensions.get("window"); const { width } = Dimensions.get("window");
const ios = Platform.OS === "ios"; const ios = Platform.OS === "ios";
function Blogs({ blogs, mobile }) { function Blogs({ blogs, mobile, theme }) {
return ( return (
<View style={[tw("flex mb-5")]}> <View style={[tw("flex mb-5")]}>
<View style={tw("w-full px-4")}> <View style={tw("w-full px-4")}>
@ -39,7 +39,9 @@ function Blogs({ blogs, mobile }) {
inverted={true} inverted={true}
style={[tw("flex flex-row mt-3 pb-7")]} style={[tw("flex flex-row mt-3 pb-7")]}
data={blogs} data={blogs}
renderItem={({ item }) => <Blog blog={item} mobile={mobile} />} renderItem={({ item }) => (
<Blog blog={item} mobile={mobile} theme={theme} />
)}
keyExtractor={(item) => item.id} keyExtractor={(item) => item.id}
initialNumToRender={5} initialNumToRender={5}
/> />
@ -47,8 +49,7 @@ function Blogs({ blogs, mobile }) {
); );
} }
const Blog = ({ blog, mobile }) => { const Blog = ({ blog, mobile, theme }) => {
const colorScheme = Appearance.getColorScheme();
const navigation = useNavigation(); const navigation = useNavigation();
return ( return (
@ -88,7 +89,7 @@ const Blog = ({ blog, mobile }) => {
style={[ style={[
tw("mb-1"), tw("mb-1"),
{ {
color: Colors.theme1[colorScheme].gray20, color: Colors.theme1[theme].gray20,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.lg, fontSize: mobile ? fontSize.sm : fontSize.lg,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
@ -109,7 +110,7 @@ const Blog = ({ blog, mobile }) => {
<Text <Text
style={[ style={[
{ {
color: Colors.theme1[colorScheme].gray20, color: Colors.theme1[theme].gray20,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.xs : fontSize.base, fontSize: mobile ? fontSize.xs : fontSize.base,
}, },
@ -123,7 +124,7 @@ const Blog = ({ blog, mobile }) => {
style={[ style={[
tw("ml-1"), tw("ml-1"),
{ {
color: Colors.theme1[colorScheme].gray20, color: Colors.theme1[theme].gray20,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.xs : fontSize.base, fontSize: mobile ? fontSize.xs : fontSize.base,
}, },
@ -139,7 +140,7 @@ const Blog = ({ blog, mobile }) => {
}; };
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
// features: state.publicApi.home?.features,
mobile: state.publicApi.mobile, mobile: state.publicApi.mobile,
theme: state.publicApi.theme,
}); });
export default connect(mapStateToProps, {})(Blogs); export default connect(mapStateToProps, {})(Blogs);

12
src/screens/Home/components/Header.js
Unescape View File

@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { View, Text, Pressable, Appearance } from "react-native"; import { View, Text, Pressable } from "react-native";
import { Entypo } from "@expo/vector-icons"; import { Entypo } from "@expo/vector-icons";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
import {connect} from 'react-redux'; import {connect} from 'react-redux';
@ -10,15 +10,14 @@ import tw from "tailwind-rn";
//Color //Color
import Color from "../../../constants/Colors"; import Color from "../../../constants/Colors";
const Header = ({ title, route, mobile }) => { const Header = ({ title, route, mobile, theme }) => {
const colorScheme = Appearance.getColorScheme();
const navigation = useNavigation(); const navigation = useNavigation();
return ( return (
<View style={tw(`w-full flex flex-row-reverse justify-between ${mobile ? "" : "mb-2"}`)}> <View style={tw(`w-full flex flex-row-reverse justify-between ${mobile ? "" : "mb-2"}`)}>
<Text <Text
style={[ style={[
{ {
color: Color.theme1[colorScheme].green79, color: Color.theme1[theme].green79,
fontFamily: "demi", fontFamily: "demi",
fontSize: mobile ? fontSize.lg : fontSize.xl2, fontSize: mobile ? fontSize.lg : fontSize.xl2,
}, },
@ -28,7 +27,7 @@ const Header = ({ title, route, mobile }) => {
</Text> </Text>
{route ? ( {route ? (
<Pressable onPress={() => navigation.navigate(route)} style={{transform: [{translateX : -fontSize.xl6 / 3}]}}> <Pressable onPress={() => navigation.navigate(route)} style={{transform: [{translateX : -fontSize.xl6 / 3}]}}>
<Entypo name="chevron-small-left" size={fontSize.xl6} color={Color.theme1[colorScheme].green79} /> <Entypo name="chevron-small-left" size={fontSize.xl6} color={Color.theme1[theme].green79} />
</Pressable> </Pressable>
) : null} ) : null}
</View> </View>
@ -36,7 +35,8 @@ const Header = ({ title, route, mobile }) => {
}; };
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
mobile : state.publicApi.mobile mobile : state.publicApi.mobile,
theme : state.publicApi.theme
}) })
export default connect(mapStateToProps)(Header); export default connect(mapStateToProps)(Header);

22
src/screens/Home/components/MyBooks.js
Unescape View File

@ -4,10 +4,8 @@ import {
Image, Image,
Pressable, Pressable,
FlatList, FlatList,
Appearance,
Platform, Platform,
} from "react-native"; } from "react-native";
import { useNavigation } from "@react-navigation/native";
import { connect } from "react-redux"; import { connect } from "react-redux";
//components //components
@ -20,16 +18,15 @@ import fontSize from "../../../constants/fontSize";
const ios = Platform.OS === "ios"; const ios = Platform.OS === "ios";
function MyBooks({ books, grades }) { function MyBooks({ books, grades, theme }) {
const colorScheme = Appearance.getColorScheme();
return ( return (
<View style={[tw("flex w-full mb-5")]}> <View style={[tw("flex w-full mb-5")]}>
<View <View
style={[ style={[
tw(`w-full flex rounded-md pt-3 overflow-hidden`), tw(`w-full flex rounded-md pt-3 overflow-hidden`),
{ {
backgroundColor: Colors.theme1[colorScheme].greenCF + "0F", backgroundColor: Colors.theme1[theme].greenCF + "0F",
borderColor: Colors.theme1[colorScheme].greenD9 + "", borderColor: Colors.theme1[theme].greenD9 + "",
borderWidth: 1, borderWidth: 1,
}, },
]} ]}
@ -38,7 +35,7 @@ function MyBooks({ books, grades }) {
style={[ style={[
tw(`pr-4 ${ios ? "text-right" : ""} w-full`), tw(`pr-4 ${ios ? "text-right" : ""} w-full`),
{ {
color: Colors.theme1[colorScheme].green79, color: Colors.theme1[theme].green79,
fontFamily: "demi", fontFamily: "demi",
fontSize: fontSize.lg, fontSize: fontSize.lg,
}, },
@ -52,7 +49,7 @@ function MyBooks({ books, grades }) {
horizontal={true} horizontal={true}
inverted={true} inverted={true}
data={books} data={books}
renderItem={({ item }) => <Book book={item} grades={grades} />} renderItem={({ item }) => <Book book={item} grades={grades} theme={theme} />}
keyExtractor={(book) => book?.id} keyExtractor={(book) => book?.id}
/> />
</View> </View>
@ -60,9 +57,7 @@ function MyBooks({ books, grades }) {
); );
} }
const Book = ({ book, grades }) => { const Book = ({ book, grades, theme }) => {
const colorScheme = Appearance.getColorScheme();
const navigation = useNavigation();
return ( return (
<Pressable <Pressable
style={tw(`flex mr-4 ${ios ? "items-end" : ""}`)} style={tw(`flex mr-4 ${ios ? "items-end" : ""}`)}
@ -86,7 +81,7 @@ const Book = ({ book, grades }) => {
style={[ style={[
tw("mt-2 pr-1"), tw("mt-2 pr-1"),
{ {
color: Colors.theme1[colorScheme].gray20, color: Colors.theme1[theme].gray20,
fontFamily: "bold", fontFamily: "bold",
fontSize: fontSize.sm, fontSize: fontSize.sm,
}, },
@ -98,7 +93,7 @@ const Book = ({ book, grades }) => {
style={[ style={[
tw("pr-1"), tw("pr-1"),
{ {
color: Colors.theme1[colorScheme].gray20, color: Colors.theme1[theme].gray20,
fontFamily: "light", fontFamily: "light",
fontSize: fontSize.sm, fontSize: fontSize.sm,
}, },
@ -113,6 +108,7 @@ const Book = ({ book, grades }) => {
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
grades: state.publicApi.grades, grades: state.publicApi.grades,
theme: state.publicApi.theme
}); });
export default connect(mapStateToProps)(MyBooks); export default connect(mapStateToProps)(MyBooks);

2
src/screens/Home/components/Scroll.js
Unescape View File

@ -5,13 +5,11 @@ import {
Pressable, Pressable,
FlatList, FlatList,
Platform, Platform,
Dimensions
} from "react-native"; } from "react-native";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
import tw from "tailwind-rn"; import tw from "tailwind-rn";
const ios = Platform.OS === "ios"; const ios = Platform.OS === "ios";
const {height} = Dimensions.get("window");
import { connect } from "react-redux"; import { connect } from "react-redux";

13
src/screens/Home/components/Videos.js
Unescape View File

@ -4,7 +4,6 @@ import {
Image, Image,
Pressable, Pressable,
FlatList, FlatList,
Appearance,
Platform, Platform,
} from "react-native"; } from "react-native";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
@ -21,7 +20,7 @@ import fontSize from "../../../constants/fontSize";
const ios = Platform.OS === "ios"; const ios = Platform.OS === "ios";
function Videos({ videos, grades, mobile }) { function Videos({ videos, grades, mobile, theme }) {
return ( return (
<View style={[tw("w-full mb-5")]}> <View style={[tw("w-full mb-5")]}>
<View style={[tw("w-full flex rounded-md pt-2 overflow-hidden")]}> <View style={[tw("w-full flex rounded-md pt-2 overflow-hidden")]}>
@ -35,7 +34,7 @@ function Videos({ videos, grades, mobile }) {
inverted={true} inverted={true}
data={videos} data={videos}
renderItem={({ item }) => ( renderItem={({ item }) => (
<Video video={item} grades={grades} mobile={mobile} /> <Video video={item} grades={grades} mobile={mobile} theme={theme} />
)} )}
keyExtractor={(item) => item.id} keyExtractor={(item) => item.id}
/> />
@ -44,9 +43,8 @@ function Videos({ videos, grades, mobile }) {
); );
} }
const Video = ({ video, mobile, grades }) => { const Video = ({ video, mobile, grades, theme }) => {
const navigation = useNavigation(); const navigation = useNavigation();
const colorScheme = Appearance.getColorScheme();
return ( return (
<Pressable <Pressable
style={[ style={[
@ -68,7 +66,7 @@ const Video = ({ video, mobile, grades }) => {
style={[ style={[
tw("mt-2 px-1"), tw("mt-2 px-1"),
{ {
color: Colors.theme1[colorScheme].gray20, color: Colors.theme1[theme].gray20,
fontFamily: "bold", fontFamily: "bold",
fontSize: mobile ? fontSize.sm : fontSize.xl, fontSize: mobile ? fontSize.sm : fontSize.xl,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
@ -81,7 +79,7 @@ const Video = ({ video, mobile, grades }) => {
style={[ style={[
tw("mt-1 pr-1"), tw("mt-1 pr-1"),
{ {
color: Colors.theme1[colorScheme].gray20, color: Colors.theme1[theme].gray20,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.xs : fontSize.base, fontSize: mobile ? fontSize.xs : fontSize.base,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
@ -100,6 +98,7 @@ const Video = ({ video, mobile, grades }) => {
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
grades: state.publicApi.grades, grades: state.publicApi.grades,
mobile: state.publicApi.mobile, mobile: state.publicApi.mobile,
theme: state.publicApi.theme
}); });
export default connect(mapStateToProps, {})(Videos); export default connect(mapStateToProps, {})(Videos);

23
src/screens/Login/index.js
Unescape View File

@ -7,7 +7,6 @@ import {
ActivityIndicator, ActivityIndicator,
Dimensions, Dimensions,
TouchableHighlight, TouchableHighlight,
Appearance,
Platform, Platform,
KeyboardAvoidingView, KeyboardAvoidingView,
} from "react-native"; } from "react-native";
@ -26,7 +25,6 @@ const ios = Platform.OS === "ios";
const { height } = Dimensions.get("window"); const { height } = Dimensions.get("window");
function Login(props) { function Login(props) {
const colorScheme = Appearance.getColorScheme();
const [phone, setPhone] = useState(""); const [phone, setPhone] = useState("");
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
@ -52,12 +50,12 @@ function Login(props) {
}; };
return ( return (
<KeyboardAvoidingView <View
behavior={ios ? "padding" : "height"}
style={[ style={[
tw( tw(`flex flex-1 justify-center items-center bg-white px-4 relative`),
`flex flex-1 justify-center items-center bg-white px-4 relative` {
), minHeight: height,
},
]} ]}
> >
<Svg <Svg
@ -94,7 +92,7 @@ function Login(props) {
{ {
fontSize: fontSize.xl2, fontSize: fontSize.xl2,
fontFamily: "bold", fontFamily: "bold",
color: Colors.theme1[colorScheme].black, color: Colors.theme1[props.theme].black,
}, },
]} ]}
> >
@ -110,7 +108,7 @@ function Login(props) {
{ {
fontSize: fontSize.xl2, fontSize: fontSize.xl2,
fontFamily: "bold", fontFamily: "bold",
color: Colors.theme1[colorScheme].black, color: Colors.theme1[props.theme].black,
}, },
]} ]}
> >
@ -142,11 +140,11 @@ function Login(props) {
{!props.mobile && <View style={tw("mt-10")}></View>} {!props.mobile && <View style={tw("mt-10")}></View>}
<TouchableHighlight <TouchableHighlight
disabled={loading} disabled={loading}
underlayColor={Colors.theme1[colorScheme].greenC8} underlayColor={Colors.theme1[props.theme].greenC8}
style={[ style={[
tw(`w-full py-3 rounded-sm ${props.mobile ? "" : "w-2/4"}`), tw(`w-full py-3 rounded-sm ${props.mobile ? "" : "w-2/4"}`),
{ {
backgroundColor: Colors.theme1[colorScheme].greenCF, backgroundColor: Colors.theme1[props.theme].greenCF,
alignItems: "center", alignItems: "center",
justifyContent: "center", justifyContent: "center",
marginTop: 25, marginTop: 25,
@ -181,12 +179,13 @@ function Login(props) {
</Text>{" "} </Text>{" "}
می‌باشد می‌باشد
</Text> </Text>
</KeyboardAvoidingView> </View>
); );
} }
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
mobile: state.publicApi.mobile, mobile: state.publicApi.mobile,
theme: state.publicApi.theme,
}); });
const mapDispatchToProps = { const mapDispatchToProps = {

23
src/screens/Otp/index.js
Unescape View File

@ -6,7 +6,6 @@ import {
Dimensions, Dimensions,
TouchableOpacity, TouchableOpacity,
ActivityIndicator, ActivityIndicator,
Appearance,
Platform, Platform,
} from "react-native"; } from "react-native";
import tw from "tailwind-rn"; import tw from "tailwind-rn";
@ -29,7 +28,6 @@ let ref4;
let timer = 60; let timer = 60;
function Otp(props) { function Otp(props) {
const colorScheme = Appearance.getColorScheme();
const [firstCode, setFirstCode] = useState(""); const [firstCode, setFirstCode] = useState("");
const [secondCode, setSecondCode] = useState(""); const [secondCode, setSecondCode] = useState("");
const [thirdCode, setThirdCode] = useState(""); const [thirdCode, setThirdCode] = useState("");
@ -128,7 +126,7 @@ function Otp(props) {
}; };
return ( return (
<View style={[tw("px-4 flex-1 justify-center items-center bg-white")]}> <View style={[tw("px-4 flex-1 justify-center items-center bg-white"), {minHeight: height}]}>
<Svg <Svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
xmlnsXlink="http://www.w3.org/1999/xlink" xmlnsXlink="http://www.w3.org/1999/xlink"
@ -163,14 +161,14 @@ function Otp(props) {
{ {
fontSize: props.mobile ? fontSize.tiny : fontSize.base, fontSize: props.mobile ? fontSize.tiny : fontSize.base,
fontFamily: "light", fontFamily: "light",
color: Colors.theme1[colorScheme].gray20, color: Colors.theme1[props.theme].gray20,
}, },
]} ]}
> >
یک کد تائیدیه به شماره{" "} یک کد تائیدیه به شماره{" "}
<Text <Text
style={{ style={{
color: Colors.theme1[colorScheme].greenCF, color: Colors.theme1[props.theme].greenCF,
fontSize: fontSize.base, fontSize: fontSize.base,
fontFamily: "demi", fontFamily: "demi",
}} }}
@ -190,7 +188,7 @@ function Otp(props) {
{ {
fontSize: fontSize.xl5, fontSize: fontSize.xl5,
fontFamily: "demi", fontFamily: "demi",
color: Colors.theme1[colorScheme].green79, color: Colors.theme1[props.theme].green79,
width: fontSize.xl5 + 40, width: fontSize.xl5 + 40,
}, },
]} ]}
@ -209,7 +207,7 @@ function Otp(props) {
{ {
fontSize: fontSize.xl5, fontSize: fontSize.xl5,
fontFamily: "demi", fontFamily: "demi",
color: Colors.theme1[colorScheme].green79, color: Colors.theme1[props.theme].green79,
width: fontSize.xl5 + 40, width: fontSize.xl5 + 40,
}, },
]} ]}
@ -228,7 +226,7 @@ function Otp(props) {
{ {
fontSize: fontSize.xl5, fontSize: fontSize.xl5,
fontFamily: "bold", fontFamily: "bold",
color: Colors.theme1[colorScheme].green79, color: Colors.theme1[props.theme].green79,
width: fontSize.xl5 + 40, width: fontSize.xl5 + 40,
}, },
]} ]}
@ -247,7 +245,7 @@ function Otp(props) {
{ {
fontSize: fontSize.xl5, fontSize: fontSize.xl5,
fontFamily: "demi", fontFamily: "demi",
color: Colors.theme1[colorScheme].green79, color: Colors.theme1[props.theme].green79,
width: fontSize.xl5 + 40, width: fontSize.xl5 + 40,
}, },
]} ]}
@ -270,7 +268,7 @@ function Otp(props) {
}` }`
), ),
{ {
backgroundColor: Colors.theme1[colorScheme].greenCF, backgroundColor: Colors.theme1[props.theme].greenCF,
}, },
]} ]}
onPress={() => submit()} onPress={() => submit()}
@ -297,7 +295,7 @@ function Otp(props) {
{ {
fontFamily: "light", fontFamily: "light",
fontSize: fontSize.base, fontSize: fontSize.base,
color: Colors.theme1[colorScheme].gray20, color: Colors.theme1[props.theme].gray20,
}, },
]} ]}
> >
@ -315,7 +313,7 @@ function Otp(props) {
textAlign: "center", textAlign: "center",
fontFamily: "light", fontFamily: "light",
fontSize: fontSize.base, fontSize: fontSize.base,
color: Colors.theme1[colorScheme].greenBA, color: Colors.theme1[props.theme].greenBA,
}} }}
> >
{"بازگشت به مرحله قبل و اصلاح شماره"} {"بازگشت به مرحله قبل و اصلاح شماره"}
@ -330,6 +328,7 @@ function Otp(props) {
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
isLogin: state.user.status, isLogin: state.user.status,
mobile: state.publicApi.mobile, mobile: state.publicApi.mobile,
theme: state.publicApi.theme
}); });
const mapDispatchToProps = { const mapDispatchToProps = {

Write Preview
Loading…
Cancel
Save