From 8d20dca623fe1f8dc3ffd695a0417a193248032e Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Mon, 16 May 2022 13:20:42 +0430 Subject: [PATCH] reza fixed some bugs --- src/components/Drawer.js | 4 +- src/components/Pressable.js | 2 +- src/screens/AR/components/Book.js | 8 +-- src/screens/AR/index.js | 4 +- src/screens/Activation/index.js | 20 ++----- src/screens/Contact/layouts/Box.js | 6 +- src/screens/Faq/components/Instance.js | 4 +- src/screens/Home/components/Blogs.js | 6 +- src/screens/Home/components/Header.js | 2 +- src/screens/OrderDetails/components/Book.js | 8 +-- src/screens/OrderDetails/index.js | 56 ++++++++----------- .../OrdersFollowUp/components/Order.js | 12 ++-- src/screens/Profile/components/List.js | 2 +- src/screens/Profile/components/User.js | 9 +-- src/screens/Profile/index.js | 2 +- src/screens/QR/layouts/Scan/index.js | 7 ++- .../ShoppingCart/components/Product.js | 8 +-- 17 files changed, 67 insertions(+), 93 deletions(-) diff --git a/src/components/Drawer.js b/src/components/Drawer.js index 850c02e..b6c23e9 100644 --- a/src/components/Drawer.js +++ b/src/components/Drawer.js @@ -86,7 +86,7 @@ const Drawer = ({ icon: ( { +const Book = ({ book, mobile, theme }) => { return ( @@ -29,7 +29,7 @@ const Book = ({ book, mobile, theme, orientation }) => { style={[ tw("rounded-sm w-full"), { - height: mobile ? (width - 32) / 1.5 : height / 4, + height : width / 4.2 * 4 / 3, flex: 1, }, ]} @@ -38,7 +38,7 @@ const Book = ({ book, mobile, theme, orientation }) => { style={[ { fontFamily: "bold", - fontSize: fontSize.lg, + fontSize: mobile ? fontSize.lg : fontSize.tiny, marginTop: 10, color: theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, diff --git a/src/screens/AR/index.js b/src/screens/AR/index.js index 21ea9ac..2456698 100644 --- a/src/screens/AR/index.js +++ b/src/screens/AR/index.js @@ -73,9 +73,9 @@ function AR({ getUserProducts, userProducts, mobile, theme }) { paddingHorizontal: 16, height: height, }} - contentContainerStyle={{ paddingBottom: 60 }} + contentContainerStyle={{ paddingBottom: 100 }} > - + {userProducts ?.filter( (product) => diff --git a/src/screens/Activation/index.js b/src/screens/Activation/index.js index ab89dd5..5be2d64 100644 --- a/src/screens/Activation/index.js +++ b/src/screens/Activation/index.js @@ -49,29 +49,17 @@ function Activation({ add, mobile, theme, route, orientation }) { return ( - - + + { { tw("mt-1"), { fontFamily: "light", - fontSize: mobile ? fontSize.tiny : fontSize.lg, + fontSize: fontSize.tiny, color: info.description.color, textAlign: ios ? "right" : "auto", }, @@ -67,7 +67,7 @@ const Box = ({ info, mobile }) => { tw("self-start mt-2.5"), { fontFamily: "demi", - fontSize: mobile ? fontSize.sm : fontSize.lg, + fontSize: fontSize.sm, color: info?.link?.color, }, ]} diff --git a/src/screens/Faq/components/Instance.js b/src/screens/Faq/components/Instance.js index 8be31b9..986e335 100644 --- a/src/screens/Faq/components/Instance.js +++ b/src/screens/Faq/components/Instance.js @@ -35,7 +35,7 @@ function Instance({ question, selectFaq, mobile, theme }) { theme === "light" ? Colors.theme1.green79 : Colors.theme1.grayF9, - fontSize: mobile ? fontSize.tiny : fontSize.lg, + fontSize: mobile ? fontSize.tiny : fontSize.base, fontFamily: "bold", }, ]} @@ -69,7 +69,7 @@ function Instance({ question, selectFaq, mobile, theme }) { theme === "light" ? Colors.theme1.green79 : Colors.theme1.grayF9, - fontSize: mobile ? fontSize.tiny : fontSize.lg, + fontSize: mobile ? fontSize.tiny : fontSize.base, fontFamily: "light", }, tw("text-right flex-1"), diff --git a/src/screens/Home/components/Blogs.js b/src/screens/Home/components/Blogs.js index 2d08ff7..a83121d 100644 --- a/src/screens/Home/components/Blogs.js +++ b/src/screens/Home/components/Blogs.js @@ -91,8 +91,8 @@ const Blog = ({ blog, mobile, theme }) => { { color: theme === "light" ? Colors.theme1.gray20 : Colors.theme1.white, - fontFamily: "regular", - fontSize: mobile ? fontSize.sm : fontSize.lg, + fontFamily: "bold", + fontSize: mobile ? fontSize.sm : fontSize.tiny, textAlign: ios ? "right" : "auto", }, ]} @@ -116,7 +116,7 @@ const Blog = ({ blog, mobile, theme }) => { ? Colors.theme1.gray20 : Colors.theme1.white, fontFamily: "regular", - fontSize: mobile ? fontSize.xs : fontSize.base, + fontSize: mobile ? fontSize.xs : fontSize.sm, }, ]} > diff --git a/src/screens/Home/components/Header.js b/src/screens/Home/components/Header.js index 9ba8176..4e6b99f 100644 --- a/src/screens/Home/components/Header.js +++ b/src/screens/Home/components/Header.js @@ -23,7 +23,7 @@ const Header = ({ title, route, mobile, theme, state = null }) => { { color: theme === 'light' ? Colors.theme1.green79 : Colors.theme1.white, fontFamily: "demi", - fontSize: mobile ? fontSize.lg : fontSize.xl2, + fontSize: fontSize.lg, }, ]} > diff --git a/src/screens/OrderDetails/components/Book.js b/src/screens/OrderDetails/components/Book.js index 7b299d7..8905fd0 100644 --- a/src/screens/OrderDetails/components/Book.js +++ b/src/screens/OrderDetails/components/Book.js @@ -37,7 +37,7 @@ function Book({ book, mobile, grades, theme }) { { theme === "light" ? Colors.theme1.gray20 : Colors.theme1.white, - fontSize: mobile ? fontSize.tiny : fontSize.lg, + fontSize: fontSize.tiny, }} > {page.name} diff --git a/src/screens/Profile/components/User.js b/src/screens/Profile/components/User.js index 8ec2954..b2b8a51 100644 --- a/src/screens/Profile/components/User.js +++ b/src/screens/Profile/components/User.js @@ -1,9 +1,6 @@ import { View, Text, Platform, Pressable, Dimensions } from "react-native"; import React from "react"; import { connect } from "react-redux"; -import { user } from "../../../redux/actions"; -import Svg, { Path } from "react-native-svg"; -import { asyncAwesomeAlert } from "../../../utils/AsyncWrappers"; import { useNavigation } from "@react-navigation/native"; //components @@ -37,11 +34,11 @@ const User = ({ user, mobile, theme }) => { onPress={() => setDropdown(!dropdown)} > - + {