diff --git a/navigation/index.js b/navigation/index.js index 03558b6..1f11e63 100644 --- a/navigation/index.js +++ b/navigation/index.js @@ -453,8 +453,8 @@ const Navigation = ({ getStatus, isLogin }) => { contentStyle: { backgroundColor: Colors.theme1[colorScheme].white }, }} > - - + {/* */} + {/* */} diff --git a/src/components/BottomSheetComponents/ProductQuestion.js b/src/components/BottomSheetComponents/ProductQuestion.js index 6250f06..d2b350d 100644 --- a/src/components/BottomSheetComponents/ProductQuestion.js +++ b/src/components/BottomSheetComponents/ProductQuestion.js @@ -27,7 +27,7 @@ const ProductQuestion = ({ list, mobile }) => { style={{ fontFamily: "bold", color: Colors.theme1[colorScheme].green79, - fontSize: mobile ? fontSize.lg : fontSize.xl3, + fontSize: mobile ? fontSize.tiny : fontSize.xl3, textAlign: ios ? "right" : "auto", }} > @@ -37,7 +37,7 @@ const ProductQuestion = ({ list, mobile }) => { style={{ fontFamily: "bold", color: "#323232", - fontSize: mobile ? fontSize.tiny : fontSize.base, + fontSize: mobile ? fontSize.sm : fontSize.base, textAlign: ios ? "right" : "auto", }} > @@ -49,7 +49,7 @@ const ProductQuestion = ({ list, mobile }) => { style={{ fontFamily: "bold", color: Colors.theme1[colorScheme].green79, - fontSize: fontSize.lg, + fontSize: fontSize.tiny, marginTop: 10, textAlign: ios ? "right" : "auto", }} @@ -60,7 +60,7 @@ const ProductQuestion = ({ list, mobile }) => { style={{ fontFamily: "bold", color: Colors.theme1[colorScheme].gray2077, - fontSize: mobile ? fontSize.tiny : fontSize.base, + fontSize: mobile ? fontSize.sm : fontSize.base, textAlign: ios ? "right" : "auto", marginTop: mobile ? "" : 10, }} @@ -92,7 +92,7 @@ const ProductQuestion = ({ list, mobile }) => { { { tw(`pr-2 ${mobile ? "py-3" : "py-4"}`), { fontFamily: "regular", - fontSize: mobile ? fontSize.tiny : fontSize.lg, + fontSize: mobile ? fontSize.sm : fontSize.lg, color: "#07AFAF", textAlign: ios ? "right" : "auto" }, @@ -46,7 +46,7 @@ const ProductSpecifications = ({ list, mobile }) => { tw("text-right"), { fontFamily: "regular", - fontSize: mobile ? fontSize.tiny : fontSize.base, + fontSize: mobile ? fontSize.sm : fontSize.base, color: "#646464", }, ]} @@ -73,7 +73,7 @@ const ProductSpecifications = ({ list, mobile }) => { @@ -100,7 +100,7 @@ function Blogs({ blogs, mobile }) { { color: Colors.theme1[colorScheme].gray20, fontFamily: "regular", - fontSize: mobile ? fontSize.sm : fontSize.base, + fontSize: mobile ? fontSize.xs : fontSize.base, }, ]} > diff --git a/src/screens/Home/components/MyBooks.js b/src/screens/Home/components/MyBooks.js index fd0d325..ddce027 100644 --- a/src/screens/Home/components/MyBooks.js +++ b/src/screens/Home/components/MyBooks.js @@ -2,7 +2,7 @@ import { View, Text, Image, - TouchableOpacity, + Pressable, FlatList, Appearance, Platform, @@ -27,7 +27,7 @@ function MyBooks({ books, grades }) { const Book = ({ book }) => { const navigation = useNavigation(); return ( - {}} > @@ -68,7 +68,7 @@ function MyBooks({ books, grades }) { {"پایه" + " " + grades[book.product.book.gradeId]} - + ); }; diff --git a/src/screens/Home/components/Scroll.js b/src/screens/Home/components/Scroll.js index 45bc8ee..c73da03 100644 --- a/src/screens/Home/components/Scroll.js +++ b/src/screens/Home/components/Scroll.js @@ -2,7 +2,7 @@ import React from "react"; import { View, Image, - TouchableOpacity, + Pressable, FlatList, Platform, Dimensions @@ -20,7 +20,7 @@ function Scroll({ books, mobile }) { const Product = ({ book, position }) => { const navigation = useNavigation(); return ( - navigation.navigate("Product", { id: book?.id, type: "book" }) } @@ -39,7 +39,7 @@ function Scroll({ books, mobile }) { source={{ uri: `https://dnvn.ir/api/v1/file/${book.fileIds}` }} style={{ width: "100%", height: "100%" }} /> - + ); }; return ( @@ -69,6 +69,7 @@ function Scroll({ books, mobile }) { data={[{ id: 0 }]} renderItem={({}) => } keyExtractor={(item) => item.id} + /> ); diff --git a/src/screens/Home/components/Videos.js b/src/screens/Home/components/Videos.js index 63ade89..5264201 100644 --- a/src/screens/Home/components/Videos.js +++ b/src/screens/Home/components/Videos.js @@ -2,7 +2,7 @@ import { View, Text, Image, - TouchableOpacity, + Pressable, FlatList, Appearance, Platform @@ -26,7 +26,7 @@ function Videos({ videos, grades, mobile }) { const Video = ({ video }) => { const navigation = useNavigation(); return ( - navigation.navigate("Video", { id: video.id })} > @@ -46,7 +46,7 @@ function Videos({ videos, grades, mobile }) { { color: Colors.theme1[colorScheme].gray20, fontFamily: "bold", - fontSize: mobile ? fontSize.base : fontSize.xl, + fontSize: mobile ? fontSize.sm : fontSize.xl, textAlign: ios ? "right" : "auto", }, ]} @@ -59,15 +59,15 @@ function Videos({ videos, grades, mobile }) { { color: Colors.theme1[colorScheme].gray20, fontFamily: "regular", - fontSize: mobile ? fontSize.tiny : fontSize.base, + fontSize: mobile ? fontSize.xs : fontSize.base, textAlign: ios ? "right" : "auto", }, ]} > - {grades[video.gradeId]} + {'پایه' + ' ' + grades[video.gradeId]} - + ); }; return ( diff --git a/src/screens/Home/index.js b/src/screens/Home/index.js index b55e6c9..a8e6d96 100644 --- a/src/screens/Home/index.js +++ b/src/screens/Home/index.js @@ -89,7 +89,7 @@ const Home = ({ // Later on in your styles.. const styles = StyleSheet.create({ contentContainerStyle: { - paddingBottom: 100, + paddingBottom: 40, // flex : 1, // alignItems: "", }, diff --git a/src/screens/Login/assets/logo.png b/src/screens/Login/assets/logo.png deleted file mode 100644 index 035ccf2..0000000 Binary files a/src/screens/Login/assets/logo.png and /dev/null differ diff --git a/src/screens/Login/index.js b/src/screens/Login/index.js index 4d14fab..2f6b6f0 100644 --- a/src/screens/Login/index.js +++ b/src/screens/Login/index.js @@ -4,16 +4,15 @@ import { connect } from "react-redux"; import { View, Text, - Image, ActivityIndicator, Dimensions, TouchableHighlight, Appearance, Platform, - TouchableWithoutFeedback, KeyboardAvoidingView, } from "react-native"; -import Logo from "./assets/logo.png"; +import Svg, { Defs, Pattern, Image, Path } from "react-native-svg"; + import CustomTextInput from "../../components/CustomTextInput"; import onInput from "../../utils/onInput"; import { asyncAwesomeAlert } from "../../utils/AsyncWrappers"; @@ -24,7 +23,7 @@ import fontSize from "../../constants/fontSize"; const ios = Platform.OS === "ios"; -const { width } = Dimensions.get("window"); +const { height } = Dimensions.get("window"); function Login(props) { const colorScheme = Appearance.getColorScheme(); @@ -57,18 +56,34 @@ function Login(props) { behavior={ios ? "padding" : "height"} style={[ tw( - `flex flex-col flex-1 justify-center items-center bg-white px-4` + `flex flex-col flex-1 justify-center items-center bg-white px-4 relative` ), ]} > - {/* */} - + + + + + + + + onInput.phonenumber(text)} /> - { - !props.mobile && - } + {!props.mobile && } - {"ادامه"} + {"تایید شماره"} )} - {/* */} + + ورود شما در سامانه به منزله قبول و{" "} + + شرایط , قوانین استفاده + {" "} + می‌باشد + ); } diff --git a/src/screens/Otp/index.js b/src/screens/Otp/index.js index 25520cd..fdaff03 100644 --- a/src/screens/Otp/index.js +++ b/src/screens/Otp/index.js @@ -2,7 +2,6 @@ import React, { useEffect, useState } from "react"; import { View, Text, - Image, TextInput, Dimensions, TouchableOpacity, @@ -12,7 +11,7 @@ import { } from "react-native"; import tw from "tailwind-rn"; import { connect } from "react-redux"; -import Logo from "../Login/assets/logo.png"; +import Svg, { Defs, Pattern, Image, Path } from "react-native-svg"; import { digitToEn } from "../../utils"; import onInput from "../../utils/onInput"; import { user } from "../../redux/actions"; @@ -21,7 +20,7 @@ import fontSize from "../../constants/fontSize"; import Colors from "../../constants/Colors"; const ios = Platform.OS === "ios"; -const { width } = Dimensions.get("window"); +const { height } = Dimensions.get("window"); let ref1; let ref2; let ref3; @@ -126,21 +125,34 @@ function Otp(props) { const goBack = () => { timer = 60; props.navigation.navigate("Login"); - - } + }; return ( - + + + + + + + + {`یک کد تائیدیه به شماره ${props.route.params?.phone} ارسال شد. آن را در قسمت زیر وارد کنید`} + > + یک کد تائیدیه به شماره{" "} + + {props.route.params?.phone || "09123456789"} + {" "} + ارسال شد. آن را در قسمت زیر وارد کنید. + - {"ثبت"} + {"تایید کد"} )} @@ -282,7 +306,7 @@ function Otp(props) { ) : ( goBack()} > diff --git a/src/screens/Splash/index.js b/src/screens/Splash/index.js index 822a07b..81aa003 100644 --- a/src/screens/Splash/index.js +++ b/src/screens/Splash/index.js @@ -18,15 +18,26 @@ function Splash({ navigation, isLogin }) { }, [isLogin]); return ( - - - + + + + + + ); }