reza fixed some bugs

master
Reza_ashrafi 2 years ago
parent fe804130a5
commit 8d20dca623
  1. 4
      src/components/Drawer.js
  2. 2
      src/components/Pressable.js
  3. 6
      src/screens/AR/components/Book.js
  4. 4
      src/screens/AR/index.js
  5. 20
      src/screens/Activation/index.js
  6. 6
      src/screens/Contact/layouts/Box.js
  7. 4
      src/screens/Faq/components/Instance.js
  8. 6
      src/screens/Home/components/Blogs.js
  9. 2
      src/screens/Home/components/Header.js
  10. 8
      src/screens/OrderDetails/components/Book.js
  11. 56
      src/screens/OrderDetails/index.js
  12. 12
      src/screens/OrdersFollowUp/components/Order.js
  13. 2
      src/screens/Profile/components/List.js
  14. 9
      src/screens/Profile/components/User.js
  15. 2
      src/screens/Profile/index.js
  16. 7
      src/screens/QR/layouts/Scan/index.js
  17. 8
      src/screens/ShoppingCart/components/Product.js

@ -86,7 +86,7 @@ const Drawer = ({
icon: (
<Svg
xmlns="http://www.w3.org/2000/svg"
width={21.431}
width={22.431}
height={21.431}
>
<G
@ -282,7 +282,7 @@ const Drawer = ({
tw("mr-2"),
{
fontFamily: "regular",
fontSize: mobile ? fontSize.base : fontSize.lg,
fontSize: fontSize.base,
color:
theme === "light"
? Colors.theme1.gray20

@ -42,7 +42,7 @@ function Pressable1({
: fontSize.tiny
: textFontSize
? textFontSize
: fontSize.xl,
: fontSize.base,
color: color,
fontFamily: "bold",
}}

@ -10,7 +10,7 @@ import Colors from "../../../constants/Colors";
const { width, height } = Dimensions.get("window");
const Book = ({ book, mobile, theme, orientation }) => {
const Book = ({ book, mobile, theme }) => {
return (
<Pressable
style={[
@ -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,

@ -73,9 +73,9 @@ function AR({ getUserProducts, userProducts, mobile, theme }) {
paddingHorizontal: 16,
height: height,
}}
contentContainerStyle={{ paddingBottom: 60 }}
contentContainerStyle={{ paddingBottom: 100 }}
>
<View style={tw(`flex justify-between flex-wrap flex-row-reverse`)}>
<View style={tw(`flex flex-wrap flex-row-reverse`)}>
{userProducts
?.filter(
(product) =>

@ -49,29 +49,17 @@ function Activation({ add, mobile, theme, route, orientation }) {
return (
<SafeAreaView
style={[
tw("flex-1"),
{ paddingTop: ios ? 0 : StatusBar.currentHeight, flex: 1 },
]}
style={[{ paddingTop: ios ? 0 : StatusBar.currentHeight, flex: 1 }]}
>
<ScrollView style={tw("flex-1")}>
<KeyboardAvoidingView
behavior={"padding"}
style={{
height: mobile
? height - insets.bottom * 2.5
: orientation === "portrait"
? height - insets.bottom * 2.5
: width - insets.bottom * 2.5,
height: height - insets.bottom * 2.5,
}}
>
<TouchableWithoutFeedback>
<View
style={[
tw("flex-1 justify-between flex "),
// { paddingTop: StatusBar.currentHeight },
]}
>
<TouchableWithoutFeedback style={{ flex: 1 }}>
<View style={[tw("flex-1 justify-between flex ")]}>
<View>
<Navbar
headerOptions={{

@ -42,7 +42,7 @@ const Box = ({ info, mobile }) => {
<Text
style={{
fontFamily: "bold",
fontSize: mobile ? fontSize.lg : fontSize.xl3,
fontSize: fontSize.lg,
color: info.title.color,
textAlign: ios ? "right" : "auto",
}}
@ -54,7 +54,7 @@ const Box = ({ info, mobile }) => {
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,
},
]}

@ -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"),

@ -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,
},
]}
>

@ -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,
},
]}
>

@ -37,7 +37,7 @@ function Book({ book, mobile, grades, theme }) {
<Text
style={[
{
fontSize: mobile ? fontSize.base : fontSize.xl2,
fontSize: mobile ? fontSize.base : fontSize.xl,
color:
theme === "light"
? Colors.theme1.green79
@ -52,7 +52,7 @@ function Book({ book, mobile, grades, theme }) {
style={[
tw(" mt-2"),
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.base,
color:
theme === "light"
? Colors.theme1.green79 + "aa"
@ -97,7 +97,7 @@ function Book({ book, mobile, grades, theme }) {
<Text
style={{
fontFamily: "bold",
fontSize: mobile ? fontSize.sm : fontSize.xl2,
fontSize: mobile ? fontSize.sm : fontSize.lg,
color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
}}
@ -112,7 +112,7 @@ function Book({ book, mobile, grades, theme }) {
theme === "light"
? Colors.theme1.green79
: Colors.theme1.white,
fontSize: fontSize.xl,
fontSize: mobile ? fontSize.xl : fontSize.xl,
fontFamily: "bold",
},
]}

@ -103,11 +103,7 @@ function OrderDetails({ mobile, route, theme }) {
theme === "light"
? Colors.theme1.green79
: Colors.theme1.white,
fontSize: mobile
? mobile
? fontSize.sm
: fontSize.lg
: fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
fontFamily: "bold",
},
]}
@ -135,7 +131,7 @@ function OrderDetails({ mobile, route, theme }) {
<Text
style={[
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -151,8 +147,8 @@ function OrderDetails({ mobile, route, theme }) {
style={[
tw("flex-1 font-light text-right mr-2"),
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
lineHeight: mobile ? 17 : "auto",
fontSize: mobile ? fontSize.sm : fontSize.tiny,
// lineHeight: mobile ? 17 : "auto",
color:
theme === "light"
? Colors.theme1.green79
@ -179,7 +175,7 @@ function OrderDetails({ mobile, route, theme }) {
<Text
style={[
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -195,8 +191,8 @@ function OrderDetails({ mobile, route, theme }) {
style={[
tw("font-light text-right mr-1"),
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
lineHeight: mobile ? 17 : "auto",
fontSize: mobile ? fontSize.sm : fontSize.tiny,
// lineHeight: mobile ? 17 : "auto",
color:
theme === "light"
? Colors.theme1.green79
@ -213,7 +209,7 @@ function OrderDetails({ mobile, route, theme }) {
<Text
style={[
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -229,8 +225,8 @@ function OrderDetails({ mobile, route, theme }) {
style={[
tw("text-right mr-1"),
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
lineHeight: mobile ? 17 : "auto",
fontSize: mobile ? fontSize.sm : fontSize.tiny,
// lineHeight: mobile ? 17 : "auto",
color:
theme === "light"
? Colors.theme1.green79
@ -258,11 +254,7 @@ function OrderDetails({ mobile, route, theme }) {
<Text
style={[
{
fontSize: mobile
? mobile
? fontSize.sm
: fontSize.lg
: fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -278,11 +270,7 @@ function OrderDetails({ mobile, route, theme }) {
style={[
tw("font-light text-right mt-1"),
{
fontSize: mobile
? mobile
? fontSize.sm
: fontSize.lg
: fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -305,7 +293,7 @@ function OrderDetails({ mobile, route, theme }) {
<Text
style={[
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -321,7 +309,7 @@ function OrderDetails({ mobile, route, theme }) {
style={[
tw("font-light text-right mr-1"),
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -349,7 +337,7 @@ function OrderDetails({ mobile, route, theme }) {
<Text
style={[
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -365,7 +353,7 @@ function OrderDetails({ mobile, route, theme }) {
style={[
tw("font-light text-right mr-1"),
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -382,7 +370,7 @@ function OrderDetails({ mobile, route, theme }) {
<Text
style={[
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -398,7 +386,7 @@ function OrderDetails({ mobile, route, theme }) {
style={[
tw("font-light text-right mr-1"),
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -426,7 +414,7 @@ function OrderDetails({ mobile, route, theme }) {
<Text
style={[
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -442,7 +430,7 @@ function OrderDetails({ mobile, route, theme }) {
style={[
tw("font-light text-right mr-1"),
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -461,7 +449,7 @@ function OrderDetails({ mobile, route, theme }) {
<Text
style={[
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79
@ -477,7 +465,7 @@ function OrderDetails({ mobile, route, theme }) {
style={[
tw("font-light text-right mr-1"),
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.green79

@ -60,7 +60,7 @@ function Order({ order, mobile, theme }) {
style={[
tw("font-medium"),
{
fontSize: mobile ? fontSize.base : fontSize.xl,
fontSize: mobile ? fontSize.base : fontSize.base,
color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
fontFamily: mobile ? "regular" : "demi",
@ -78,7 +78,7 @@ function Order({ order, mobile, theme }) {
theme === "light"
? Colors.theme1.green79
: Colors.theme1.white,
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
fontFamily: mobile ? "bold" : "demi",
},
]}
@ -118,7 +118,7 @@ function Order({ order, mobile, theme }) {
tw("py-2 rounded-md"),
{
textAlign: theme === "light" ? "center" : "right",
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: fontSize.sm,
fontFamily: "bold",
backgroundColor: theme === "light" ? "#F0FFF1" : null,
color: theme === "light" ? Colors.theme1.green79 : "#F0FFF1",
@ -135,7 +135,7 @@ function Order({ order, mobile, theme }) {
style={[
tw("my-3"),
{
fontSize: mobile ? fontSize.tiny : fontSize.xl,
fontSize: mobile ? fontSize.tiny : fontSize.base,
color:
theme === "light"
? Colors.theme1.gray20
@ -160,7 +160,7 @@ function Order({ order, mobile, theme }) {
>
<Text
style={{
fontSize: mobile ? fontSize.base : fontSize.xl,
fontSize: fontSize.base,
color: Colors.theme1.greenCF,
fontFamily: "regular",
}}
@ -188,7 +188,7 @@ function Order({ order, mobile, theme }) {
style={[
tw("my-5"),
{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.gray20

@ -254,7 +254,7 @@ const List = ({ mobile, theme }) => {
theme === "light"
? Colors.theme1.gray20
: Colors.theme1.white,
fontSize: mobile ? fontSize.tiny : fontSize.lg,
fontSize: fontSize.tiny,
}}
>
{page.name}

@ -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)}
>
<View style={tw(`flex items-center flex-row-reverse`)}>
<Avatar source={user?.picFileIds} size={width / 5.5} />
<Avatar source={user?.picFileIds} size={mobile ? width / 5.5 : width / 7} />
<View style={tw(`flex mr-2 ${ios ? "items-end" : ""}`)}>
<Text
style={{
fontSize: mobile ? fontSize.lg : fontSize.xl5,
fontSize: mobile ? fontSize.lg : fontSize.xl,
color:
theme === "light"
? Colors.theme1.gray20
@ -53,7 +50,7 @@ const User = ({ user, mobile, theme }) => {
</Text>
<Text
style={{
fontSize: mobile ? fontSize.tiny : fontSize.xl2,
fontSize: mobile ? fontSize.tiny : fontSize.base,
color:
theme === "light"
? Colors.theme1.gray20

@ -115,7 +115,7 @@ function Profile({ mobile, theme, logout, loading }) {
<Text
style={{
fontSize: mobile ? fontSize.base : fontSize.xl,
fontSize: fontSize.tiny,
fontFamily: "bold",
color: Colors.theme1.redFF1,
marginRight: 4,

@ -15,6 +15,7 @@ import { connect } from "react-redux";
//style
import tw from "tailwind-rn";
import Colors from "../../../../constants/Colors";
import fontSize from "../../../../constants/fontSize";
const { width, height } = Dimensions.get("screen");
@ -78,15 +79,15 @@ function Scan({ route, theme, page }) {
]}
>
<Entypo
name="back"
size={width / 27}
name="arrow-left"
size={fontSize.base}
style={{ marginRight: 5, color: Colors.theme1.greenCF }}
/>
<Text
style={[
{
color: Colors.theme1.greenCF,
fontSize: width / 27,
fontSize: fontSize.base,
fontFamily: "regular",
},
]}

@ -82,7 +82,7 @@ function Product({
>
<Text
style={{
fontSize: mobile ? fontSize.lg : fontSize.xl4,
fontSize: mobile ? fontSize.lg : fontSize.xl,
color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
marginBottom: 5,
@ -93,7 +93,7 @@ function Product({
</Text>
<Text
style={{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.gray2077
@ -106,7 +106,7 @@ function Product({
</Text>
<Text
style={{
fontSize: mobile ? fontSize.sm : fontSize.lg,
fontSize: mobile ? fontSize.sm : fontSize.tiny,
color:
theme === "light"
? Colors.theme1.gray2077
@ -289,7 +289,7 @@ function Product({
<Text
style={[
{
fontSize: mobile ? fontSize.xl : fontSize.xl4,
fontSize: mobile ? fontSize.xl : fontSize.xl2,
fontFamily: "regular",
color:
theme === "light"

Loading…
Cancel
Save