reza added something

navigation/index.js

@@ -453,8 +453,8 @@ const Navigation = ({ getStatus, isLogin }) => {
           contentStyle: { backgroundColor: Colors.theme1[colorScheme].white },
         }}
       >
-        <Stack.Screen name="Splash" component={Splash} />
-        <Stack.Screen name="Login" component={Login} />
+        {/* <Stack.Screen name="Splash" component={Splash} /> */}
+        {/* <Stack.Screen name="Login" component={Login} /> */}
         <Stack.Screen name="Otp" component={Otp} />
         <Stack.Screen name="QR" component={QR} />
         <Stack.Screen name="Root" component={BottomTabNavigator} />

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 }) => {
         <Text
           style={[
             {
-              fontSize: mobile ? fontSize.lg : fontSize.xl3,
+              fontSize: mobile ? fontSize.sm : fontSize.xl3,
               color: Colors.theme1[colorScheme].green79,
               fontFamily: "demi",
             },

src/components/BottomSheetComponents/ProductReview.js

@@ -85,7 +85,7 @@ const ProductReviews = ({ list, mobile }) => {
         <Text
           style={[
             {
-              fontSize: fontSize.lg,
+              fontSize: fontSize.sm,
               color: Colors.theme1[colorScheme].green79,
               fontFamily: "demi",
             },

src/components/BottomSheetComponents/ProductSpecifications.js

@@ -26,7 +26,7 @@ const ProductSpecifications = ({ 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 }) => {
         <Text
           style={[
             {
-              fontSize: fontSize.lg,
+              fontSize: fontSize.sm,
               color: Colors.theme1[colorScheme].green79 ,
               fontFamily: "demi",
             },

src/screens/Home/components/Blogs.js

@@ -67,8 +67,8 @@ function Blogs({ blogs, mobile }) {
               tw("mb-2"),
               {
                 color: Colors.theme1[colorScheme].gray20,
-                fontFamily: "bold",
-                fontSize: mobile ? fontSize.tiny : fontSize.lg,
+                fontFamily: "regular",
+                fontSize: mobile ? fontSize.sm : fontSize.lg,
                 textAlign: ios ? "right" : "auto",
               },
             ]}
@@ -86,7 +86,7 @@ function Blogs({ blogs, mobile }) {
                   {
                     color: Colors.theme1[colorScheme].gray20,
                     fontFamily: "regular",
-                    fontSize: mobile ? fontSize.sm : fontSize.base,
+                    fontSize: mobile ? fontSize.xs : fontSize.base,
                   },
                 ]}
               >
@@ -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,
                   },
                 ]}
               >

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 (
-      <TouchableOpacity
+      <Pressable
         style={tw(`flex flex-col ml-3 ${ios ? "items-end" : ""}`)}
         onPress={() => {}}
       >
@@ -68,7 +68,7 @@ function MyBooks({ books, grades }) {
           {"پایه" + " " + grades[book.product.book.gradeId]}
         </Text>
         <Progress percent={60} alignItems={"items-end"} />
-      </TouchableOpacity>
+      </Pressable>
     );
   };
 

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 (
-        <TouchableOpacity
+        <Pressable
           onPress={() =>
             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%" }}
           />
-        </TouchableOpacity>
+        </Pressable>
       );
     };
     return (
@@ -69,6 +69,7 @@ function Scroll({ books, mobile }) {
         data={[{ id: 0 }]}
         renderItem={({}) => <Box books={books} />}
         keyExtractor={(item) => item.id}
+        
       />
     </View>
   );

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 (
-      <TouchableOpacity
+      <Pressable
         style={tw(`flex flex-col ${mobile ? "ml-3" : "ml-5"}`)}
         onPress={() => 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]}
         </Text>
         <Progress percent={60} alignItems={"items-end"} />
-      </TouchableOpacity>
+      </Pressable>
     );
   };
   return (

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: "",
   },

src/screens/Splash/index.js

@@ -18,15 +18,26 @@ function Splash({ navigation, isLogin }) {
   }, [isLogin]);
 
   return (
-    <View style={{ justifyContent: "center", alignItems: "center", flex: 1 }}>
-      <Image
-        source={Logo}
-        style={{
-          width: width * 0.7,
-          height: (width * 0.7) / 2.09,
-        }}
-      />
-      <ActivityIndicator size={"large"} style={{ marginTop: 20 }} />
+    <View
+      style={{
+        justifyContent: "center",
+        alignItems: "center",
+        flex: 1,
+        display: "flex",
+      }}
+    >
+      <View style={{ height: width * 0.7 * 2 / 3 }}>
+        <Image
+          source={Logo}
+          resizeMode="contain"
+          style={{
+            width: width * 0.7,
+            flex: 1,
+          }}
+        />
+      </View>
+
+      <ActivityIndicator size={"large"} style={{ marginTop: 20}} />
     </View>
   );
 }