From ed0b09695922a7e1746750149ca03742886767e9 Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Sat, 22 Jan 2022 00:48:47 +0330 Subject: [PATCH] reza added some change --- navigation/index.js | 13 +- src/components/Drawer.js | 5 +- src/components/Header.js | 36 ++--- src/redux/store.js | 4 +- src/screens/Activation/assets/bgQr.png | Bin 8042 -> 11994 bytes src/screens/Activation/assets/qr.png | Bin 3632 -> 0 bytes src/screens/Activation/index.js | 11 +- src/screens/Contact/Box.js | 6 +- src/screens/Faq/components/Instance.js | 9 +- src/screens/OrderDetails/components/Book.js | 33 ++-- src/screens/OrderDetails/index.js | 152 +++++++++--------- .../OrdersFollowUp/components/Order.js | 52 +++--- 12 files changed, 151 insertions(+), 170 deletions(-) delete mode 100644 src/screens/Activation/assets/qr.png diff --git a/navigation/index.js b/navigation/index.js index cf213f7..97b3eb8 100644 --- a/navigation/index.js +++ b/navigation/index.js @@ -6,8 +6,6 @@ import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; import { Entypo, FontAwesome, - Ionicons, - MaterialIcons, } from "@expo/vector-icons"; import OrderDetails from "../src/screens/OrderDetails"; import OrdersFollowUp from "../src/screens/OrdersFollowUp"; @@ -51,12 +49,12 @@ const BottomTabNavigator = () => { { name="ShoppingCartTab" component={ShoppingCart} options={{ - tabBarStyle: { - flex : 'flex-col', - display: 'flex', - - }, title : 'سبد خرید', tabBarIcon: ({ focused, color }) => ( ), @@ -95,7 +88,7 @@ const BottomTabNavigator = () => { tabBarIcon: ({ focused, color }) => ( focused ? : { { name: "سوالات متداول", route: "Faq", - icon: , + icon: , toast: "", message: "", }, @@ -86,7 +87,7 @@ const Drawer = ({ position, setBoxPosition }) => { > {route.icon} {route.name} diff --git a/src/components/Header.js b/src/components/Header.js index a978f8a..5114599 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -1,8 +1,7 @@ -import React, { useState, useEffect } from "react"; -import { View, Text, Dimensions, Image, ImageBackground } from "react-native"; +import { View, Text, Dimensions, ImageBackground } from "react-native"; import tw from "tailwind-rn"; +import fontSize from "../constants/fontSize"; -const width = Dimensions.get("window").width; const height = Dimensions.get("window").height; export default function Header({ title, description, background }) { @@ -16,29 +15,22 @@ export default function Header({ title, description, background }) { + - + {title} + - {title} - - - {description} - + style={[ + { color: "#86A0B9", fontSize: fontSize.sm, fontFamily: "light" }, + ]} + > + {description} + ); } diff --git a/src/redux/store.js b/src/redux/store.js index 62ad1cd..2fcf25b 100644 --- a/src/redux/store.js +++ b/src/redux/store.js @@ -55,12 +55,12 @@ const persistor = persistStore(store); const ReactNative = require("react-native"); try { - ReactNative.I18nManager.allowRTL(true); + ReactNative.I18nManager.allowRTL(false); // enableScreens(); } catch (e) { // console.log(e); } -// console.disableYellowBox = true; +console.disableYellowBox = true; export default store; diff --git a/src/screens/Activation/assets/bgQr.png b/src/screens/Activation/assets/bgQr.png index 45fd939c95e6dedfe1714bde482744513227f7ef..4d3dc734136a987e3a444518fd711420b329e40e 100644 GIT binary patch literal 11994 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 DmjJdN literal 8042 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%0A(jtqI}aw;wCd@`4gJ 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 @@ -94,7 +89,7 @@ function Activation({}) { backgroundColor: "#F9F9F9", borderColor: "#DFDFDF", borderWidth: 1, - fontSize: width / 31, + fontSize: fontSize.base, fontFamily: "light", }, ]} diff --git a/src/screens/Contact/Box.js b/src/screens/Contact/Box.js index be3753d..ea64b64 100644 --- a/src/screens/Contact/Box.js +++ b/src/screens/Contact/Box.js @@ -20,7 +20,7 @@ const Box = ({ info }) => { @@ -31,7 +31,7 @@ const Box = ({ info }) => { tw("mt-1"), { fontFamily: "light", - fontSize: fontSize.xs, + fontSize: fontSize.sm, color: info.description.color, }, ]} @@ -43,7 +43,7 @@ const Box = ({ info }) => { tw("self-start mt-2"), { fontFamily: "light", - fontSize: fontSize.xs, + fontSize: fontSize.sm, color: info?.link?.color, }, ]} diff --git a/src/screens/Faq/components/Instance.js b/src/screens/Faq/components/Instance.js index a42106e..a44f24d 100644 --- a/src/screens/Faq/components/Instance.js +++ b/src/screens/Faq/components/Instance.js @@ -1,6 +1,7 @@ import { View, Text, Dimensions, TouchableOpacity } from "react-native"; import { Entypo } from "@expo/vector-icons"; import tw from "tailwind-rn"; +import fontSize from '../../../constants/fontSize'; const { width } = Dimensions.get("window"); @@ -24,7 +25,7 @@ function Instance({ question, selectFaq }) { width: "90%", textAlign: "right", color: "#196EC0", - fontSize: width / 34, + fontSize: fontSize.sm, fontFamily: "bold", }, ]} @@ -32,16 +33,16 @@ function Instance({ question, selectFaq }) { {question.title} {question.active ? ( - + ) : ( - + )} {question.active && ( diff --git a/src/screens/OrderDetails/components/Book.js b/src/screens/OrderDetails/components/Book.js index fccb9a6..b763378 100644 --- a/src/screens/OrderDetails/components/Book.js +++ b/src/screens/OrderDetails/components/Book.js @@ -1,6 +1,7 @@ import React from 'react'; import {View, Text, Dimensions, Image} from 'react-native'; -import tw from 'tailwind-react-native-classnames'; +import tw from 'tailwind-rn'; +import fontSize from '../../../constants/fontSize'; import _ from 'lodash'; const width = Dimensions.get('window').width; @@ -9,47 +10,47 @@ export default function Book({book}) { return ( - + - + علوم اجتماعی پایه دوم نسخه دیجیتال - + 126.000 تومان diff --git a/src/screens/OrderDetails/index.js b/src/screens/OrderDetails/index.js index 5d8a3bc..0e14745 100644 --- a/src/screens/OrderDetails/index.js +++ b/src/screens/OrderDetails/index.js @@ -14,12 +14,12 @@ import Navbar from "../../components/Navbar"; import Drawer from "../../components/Drawer"; import Book from "./components/Book"; import { connect } from "react-redux"; -import tw from "tailwind-react-native-classnames"; +import tw from "tailwind-rn"; +import fontSize from "../../constants/fontSize"; import b1Image from "./assets/b1.png"; import _ from "lodash"; const width = Dimensions.get("window").width; -const height = Dimensions.get("window").height; const colors = { 1: "#FFF700", @@ -52,13 +52,13 @@ function OrderDetails({ order }) { @@ -68,30 +68,32 @@ function OrderDetails({ order }) { > {_.join(["شماره سفارش:", order.number], " ")} - + {status[order.status]} @@ -99,22 +101,22 @@ function OrderDetails({ order }) { آدرس تحویل: - + مشخصات تحویل گیرنده: - + شماره موبایل: {_.join(["کد تحویل", order.receiveCode], " ")} این کد را پس از دریافت کالا، به مامور ارسال دانوین اعلام فرمایید - + {order.items.map((item, index) => ( ))} - - + + مبلغ سبد خرید: {_.join([order.shoppingCardPrice, "تومان"], " ")} - + تخفیف: @@ -252,46 +254,46 @@ function OrderDetails({ order }) { - + هزینه ارسال کالا: {_.join([order.sendPrice, "تومان"], " ")} - + جمع هزینه پرداختی: @@ -301,46 +303,46 @@ function OrderDetails({ order }) { - + نحوه پرداخت: {order.payMethod} - + شماره تراکنش: @@ -348,26 +350,22 @@ function OrderDetails({ order }) { - - + + تاریخ تحویل: diff --git a/src/screens/OrdersFollowUp/components/Order.js b/src/screens/OrdersFollowUp/components/Order.js index 717d600..459387f 100644 --- a/src/screens/OrdersFollowUp/components/Order.js +++ b/src/screens/OrdersFollowUp/components/Order.js @@ -8,9 +8,9 @@ import { TouchableOpacity } from 'react-native'; import { useNavigation } from '@react-navigation/native'; -import tw from 'tailwind-react-native-classnames'; +import tw from 'tailwind-rn'; +import fontSize from '../../../constants/fontSize'; import leftArrowIcon from '../assets/leftArrow.png'; -import { AntDesign } from '@expo/vector-icons'; import _ from 'lodash'; const width = Dimensions.get('window').width; @@ -34,49 +34,49 @@ function Order({order}) { return ( {_.join(['شماره سفارش:', order.number], ' ')} - + {status[order.status]} - - + style={tw('w-full flex flex-row-reverse justify-between p-3')}> + + {order.items.length < 2 ? order?.items?.map(item => ( )) @@ -86,19 +86,19 @@ function Order({order}) { ))} - + - + {_.join(['جمع فاکتور:', order.cost], ' ')} @@ -119,10 +119,10 @@ function Order({order}) { navigation.navigate('Order')} style={[ - tw.style('rounded-md flex flex-row-reverse justify-center px-5 py-2'), + tw('rounded-md flex flex-row-reverse justify-center px-5 py-2'), {borderWidth: 1, borderColor: '#1999C0'}, ]}> - + جزئیات سفارش {_.join(['تاریخ سفارش:', order.date], ' ')}