Reza_ashrafi
/
RnDanovinExpo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reza added some changes

Browse Source
master
Reza_ashrafi 3 years ago
parent 26c33c70ca
commit 388573268f
22 changed files with 419 additions and 222 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      App.js
  2. 11
      navigation/index.js
  3. 1
      src/components/BottomSheetComponents/ProductReview.js
  4. 2
      src/components/Drawer.js
  5. 29
      src/screens/AR/components/Book.js
  6. 10
      src/screens/AR/index.js
  7. 4
      src/screens/Address/index.js
  8. 4
      src/screens/Home/components/MyBooks.js
  9. 4
      src/screens/Home/components/Scroll.js
  10. 10
      src/screens/Home/index.js
  11. 111
      src/screens/OrderDetails/components/Book.js
  12. 163
      src/screens/OrderDetails/index.js
  13. BIN
      src/screens/OrdersFollowUp/assets/leftArrow.png
  14. 203
      src/screens/OrdersFollowUp/components/Order.js
  15. 4
      src/screens/OrdersFollowUp/index.js
  16. 8
      src/screens/OrdersFollowUp/left.svg
  17. 2
      src/screens/Products/components/Main.js
  18. 23
      src/screens/Profile/components/List.js
  19. 6
      src/screens/Profile/components/Trophy.js
  20. 14
      src/screens/Profile/components/User.js
  21. 22
      src/screens/QR/Scan/index.js
  22. 4
      src/screens/VideoDisplay/components/Season/index.js

6
App.js
Unescape View File

@ -9,9 +9,9 @@ import store from './src/redux/store';
const App = () => { const App = () => {
let [fontsLoaded] = useFonts({ let [fontsLoaded] = useFonts({
light : require("./assets/fonts/Farsi/Regular.ttf"), light : require("./assets/fonts/Farsi/Light.ttf"),
regular: require("./assets/fonts/Farsi/Medium.ttf"), regular: require("./assets/fonts/Farsi/Regular.ttf"),
bold: require("./assets/fonts/Farsi/DemiBold.ttf"), bold: require("./assets/fonts/Farsi/Medium.ttf"),
}); });
if (!fontsLoaded) { if (!fontsLoaded) {

11
navigation/index.js
Unescape View File

@ -345,9 +345,9 @@ const HomeStackScreen = () => {
initialRouteName="Home" initialRouteName="Home"
> >
<HomeStack.Screen name="Home" component={Home} /> <HomeStack.Screen name="Home" component={Home} />
<VODStack.Screen name="VOD" component={Videos} /> <HomeStack.Screen name="VOD" component={Videos} />
<ProductsStack.Screen name="Products" component={Products} /> <HomeStack.Screen name="Products" component={Products} />
<VODStack.Screen name="Video" component={Video} /> <HomeStack.Screen name="Video" component={Video} />
<HomeStack.Screen name="Product" component={Product} /> <HomeStack.Screen name="Product" component={Product} />
</HomeStack.Navigator> </HomeStack.Navigator>
); );
@ -356,7 +356,7 @@ const HomeStackScreen = () => {
const ProductsStack = createNativeStackNavigator(); const ProductsStack = createNativeStackNavigator();
const ProductsStackScreen = () => { const ProductsStackScreen = () => {
return ( return (
<ProductsStack.Navigator screenOptions={{ headerShown: false }}> <ProductsStack.Navigator screenOptions={{ headerShown: false }} initialRouteName="Products">
<ProductsStack.Screen name="Products" component={Products} /> <ProductsStack.Screen name="Products" component={Products} />
<ProductsStack.Screen name="Product" component={Product} /> <ProductsStack.Screen name="Product" component={Product} />
</ProductsStack.Navigator> </ProductsStack.Navigator>
@ -380,7 +380,6 @@ const CARTStackScreen = () => {
<CARTStack.Navigator screenOptions={{ headerShown: false }}> <CARTStack.Navigator screenOptions={{ headerShown: false }}>
<CARTStack.Screen name="ShoppingCart" component={ShoppingCart} /> <CARTStack.Screen name="ShoppingCart" component={ShoppingCart} />
<CARTStack.Screen name="DeliveryForm" component={DeliveryForm} /> <CARTStack.Screen name="DeliveryForm" component={DeliveryForm} />
<CARTStack.Screen name="CreateAddress" component={Address} />
</CARTStack.Navigator> </CARTStack.Navigator>
); );
} }
@ -420,6 +419,8 @@ const Navigation = ({ getStatus, isLogin }) => {
<Stack.Screen name="QRContent" component={QRContent} /> <Stack.Screen name="QRContent" component={QRContent} />
<Stack.Screen name="Contact" component={Contact} /> <Stack.Screen name="Contact" component={Contact} />
<Stack.Screen name="AR" component={AR} /> <Stack.Screen name="AR" component={AR} />
<Stack.Screen name="CreateAddress" component={Address} />
</Stack.Navigator> </Stack.Navigator>
</NavigationContainer> </NavigationContainer>
); );

1
src/components/BottomSheetComponents/ProductReview.js
Unescape View File

@ -50,6 +50,7 @@ const ProductReviews = ({ list }) => {
<View style={[tw("flex flex-row justify-between mt-4")]}> <View style={[tw("flex flex-row justify-between mt-4")]}>
{question.images.map((image, index) => ( {question.images.map((image, index) => (
<View <View
key={index}
style={[ style={[
tw("rounded-md flex flex-row justify-center items-center"), tw("rounded-md flex flex-row justify-center items-center"),
{ {

2
src/components/Drawer.js
Unescape View File

@ -135,7 +135,7 @@ const Drawer = ({ position, setBoxPosition, user }) => {
), ),
]} ]}
></Pressable> ></Pressable>
<View style={[tw("w-4/5 bg-white h-full flex flex-col pt-8")]}> <View style={[tw("w-4/5 bg-white h-full flex flex-col")]}>
<View <View
style={[ style={[
tw("flex flex-col items-end pt-3 pb-1 px-4"), tw("flex flex-col items-end pt-3 pb-1 px-4"),

29
src/screens/AR/components/Book.js
Unescape View File

@ -1,24 +1,41 @@
import { View, Text, Image, Dimensions } from "react-native"; import { View, Text, Image, Dimensions, Appearance } from "react-native";
import React from "react"; import React from "react";
//style
import tw from "tailwind-rn"; import tw from "tailwind-rn";
import fontSize from '../../../constants/fontSize'; import fontSize from "../../../constants/fontSize";
import Colors from '../../../constants/Colors'; import Colors from "../../../constants/Colors";
const { width } = Dimensions.get("window"); const { width } = Dimensions.get("window");
const Book = ({ book }) => { const Book = ({ book }) => {
const colorScheme = Appearance.getColorScheme();
return ( return (
<View <View
style={[tw("w-full flex flex-row-reverse rounded-md p-2 my-2"), {backgroundColor : Colors.theme1.light.blue3}]} style={[
tw("flex flex-col items-end rounded-md p-2 my-2"),
{ width: "48%" },
]}
> >
<Image <Image
source={{ uri: `https://dnvn.ir/api/v1/file/${book.fileId}` }} source={{ uri: `https://dnvn.ir/api/v1/file/${book.fileId}` }}
style={[ style={[
tw("rounded-md"), tw("rounded-md"),
{ width: width / 5.5, height: ((width / 5.5) * 3) / 2 }, { width: width / 2 - 36, height: ((width / 2 - 36) * 4) / 3 },
]} ]}
/> />
<Text style={[{fontFamily: "regular", fontSize: fontSize.base, marginRight : 10 }]}>{book.title}</Text> <Text
style={[
{
fontFamily: "bold",
fontSize: fontSize.lg,
marginTop: 10,
color: Colors.theme1[colorScheme].green79,
},
]}
>
{book.title}
</Text>
</View> </View>
); );
}; };

10
src/screens/AR/index.js
Unescape View File

@ -6,6 +6,7 @@ import {
LayoutAnimation, LayoutAnimation,
Platform, Platform,
Dimensions, Dimensions,
View
} from "react-native"; } from "react-native";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { publicApi } from "../../redux/actions"; import { publicApi } from "../../redux/actions";
@ -14,6 +15,8 @@ import Navbar from "../../components/Navbar";
import Drawer from "../../components/Drawer"; import Drawer from "../../components/Drawer";
import Book from "./components/Book"; import Book from "./components/Book";
import tw from "tailwind-rn";
const { height } = Dimensions.get("window"); const { height } = Dimensions.get("window");
function AR({ getArList, arList }) { function AR({ getArList, arList }) {
@ -33,7 +36,6 @@ function AR({ getArList, arList }) {
style={{ style={{
paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0, paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
position: "relative", position: "relative",
// minHeight: height,
backgroundColor: "white", backgroundColor: "white",
}} }}
> >
@ -58,8 +60,10 @@ function AR({ getArList, arList }) {
}} }}
contentContainerStyle={{ paddingBottom: 100 }} contentContainerStyle={{ paddingBottom: 100 }}
> >
{arList.length > 0 && <View style={tw("flex flex-row justify-between flex-wrap")}>
arList.map((book, index) => <Book book={book} key={index} />)} {arList.length > 0 &&
arList.map((book, index) => <Book book={book} key={index} />)}
</View>
</ScrollView> </ScrollView>
</SafeAreaView> </SafeAreaView>
); );

4
src/screens/Address/index.js
Unescape View File

@ -27,6 +27,8 @@ import tw from "tailwind-rn";
import Colors from "../../constants/Colors"; import Colors from "../../constants/Colors";
import fontSize from "../../constants/fontSize"; import fontSize from "../../constants/fontSize";
const ios = Platform.OS === "ios";
const Address = ({ const Address = ({
city, city,
province, province,
@ -181,7 +183,7 @@ const Address = ({
style={styles.container} style={styles.container}
> >
<View style={tw("w-full flex flex-col pb-4")}> <View style={tw("w-full flex flex-col pb-4")}>
<MapSelector /> {/* <MapSelector /> */}
<Header <Header
title="اطلاعات هویتی" title="اطلاعات هویتی"
text="( لطفا نام و نام خانوادگی خود را به طور کامل وارد نمایید )" text="( لطفا نام و نام خانوادگی خود را به طور کامل وارد نمایید )"

4
src/screens/Home/components/MyBooks.js
Unescape View File

@ -29,7 +29,7 @@ function MyBooks({ books, grades }) {
return ( return (
<TouchableOpacity <TouchableOpacity
style={tw(`flex flex-col ml-3 ${ios ? "items-end" : ""}`)} style={tw(`flex flex-col ml-3 ${ios ? "items-end" : ""}`)}
onPress={() => navigation.navigate("Product")} onPress={() => {}}
> >
<Image <Image
source={{ source={{
@ -73,7 +73,7 @@ function MyBooks({ books, grades }) {
}; };
return ( return (
<View style={[tw("w-full px-4 mb-5")]}> <View style={[tw("flex w-full px-4 mb-5")]}>
<View <View
style={[ style={[
tw(`w-full flex flex-col rounded-md pt-3 px-2 overflow-hidden`), tw(`w-full flex flex-col rounded-md pt-3 px-2 overflow-hidden`),

4
src/screens/Home/components/Scroll.js
Unescape View File

@ -19,7 +19,9 @@ function Scroll({ books }) {
const navigation = useNavigation(); const navigation = useNavigation();
return ( return (
<TouchableOpacity <TouchableOpacity
onPress={() => navigation.navigate("Product")} onPress={() =>
navigation.navigate("Product", { id: book?.id, type: "book" })
}
style={[ style={[
tw("rounded-md mx-1 overflow-hidden rounded-md"), tw("rounded-md mx-1 overflow-hidden rounded-md"),
{ {

10
src/screens/Home/index.js
Unescape View File

@ -20,8 +20,6 @@ import Blogs from "./components/Blogs";
import Drawer from "../../components/Drawer"; import Drawer from "../../components/Drawer";
import Header from "./components/Header"; import Header from "./components/Header";
// import { SafeAreaView } from 'react-native-safe-area-context';
// Within your render function // Within your render function
const Home = ({ const Home = ({
blogs, blogs,
@ -68,7 +66,7 @@ const Home = ({
<Drawer setBoxPosition={setBoxPosition} position={position} /> <Drawer setBoxPosition={setBoxPosition} position={position} />
<ScrollView <ScrollView
contentContainerStyle={styles.contentContainerStyle} contentContainerStyle={styles.contentContainerStyle}
style={[styles.container, tw("w-full flex flex-col")]} style={[styles.container, tw("flex")]}
> >
{userProducts.length > 0 && <MyBooks books={userProducts} />} {userProducts.length > 0 && <MyBooks books={userProducts} />}
<View style={tw("px-4 w-full")}> <View style={tw("px-4 w-full")}>
@ -77,7 +75,7 @@ const Home = ({
{books.length > 0 && <Scroll books={books} />} {books.length > 0 && <Scroll books={books} />}
{books.length > 0 && <Videos videos={books} />} {books.length > 0 && <Videos videos={books} />}
{blogs.length > 0 && <Blogs blogs={blogs} />} {blogs.length > 0 && <Blogs blogs={blogs} />}
</ScrollView> </ScrollView>
</SafeAreaView> </SafeAreaView>
); );
}; };
@ -85,12 +83,10 @@ const Home = ({
// Later on in your styles.. // Later on in your styles..
const styles = StyleSheet.create({ const styles = StyleSheet.create({
contentContainerStyle: { contentContainerStyle: {
paddingBottom: 60, paddingBottom: 20,
}, },
container: { container: {
width: Dimensions.get("window").width,
backgroundColor: "white", backgroundColor: "white",
flexDirection: "column",
paddingVertical: 0, paddingVertical: 0,
paddingHorizontal: 0, paddingHorizontal: 0,
}, },

111
src/screens/OrderDetails/components/Book.js
Unescape View File

@ -1,69 +1,110 @@
import React from 'react'; import React from "react";
import {View, Text, Dimensions, Image} from 'react-native'; import { View, Text, Dimensions, Image, Appearance } from "react-native";
import tw from 'tailwind-rn';
import fontSize from '../../../constants/fontSize';
import _ from 'lodash';
const width = Dimensions.get('window').width; //style
import tw from "tailwind-rn";
import fontSize from "../../../constants/fontSize";
import Colors from "../../../constants/Colors";
export default function Book({book}) { import _ from "lodash";
const width = Dimensions.get("window").width;
export default function Book({ book }) {
const colorScheme = Appearance.getColorScheme();
return ( return (
<View <View
style={[ style={[
tw('w-full flex flex-row-reverse justify-between py-3'), tw("w-full flex flex-row-reverse justify-between py-3"),
{borderBottomWidth: 1, borderColor: '#86A0B933'}, {
]}> borderBottomWidth: 1,
<View style={tw('flex flex-row-reverse items-center flex-1')}> borderColor: Colors.theme1[colorScheme].grayE3,
},
]}
>
<View style={tw("flex flex-row-reverse items-center flex-1")}>
<Image <Image
source={book} source={book}
style={[ style={[
tw('rounded-md'), tw("rounded-md"),
{width: width / 5, height: width / 5 * (4 / 2.8)}, { width: width / 5, height: (width / 5) * (4 / 2.8) },
]} ]}
/> />
<View style={tw('flex flex-col items-end mr-2')}> <View style={tw("flex flex-col items-end mr-2")}>
<Text <Text
style={[ style={[
{fontSize: fontSize.base, color: '#05335F', fontFamily: 'regular'}, {
]}> fontSize: fontSize.base,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]}
>
علوم اجتماعی علوم اجتماعی
</Text> </Text>
<Text <Text
style={[ style={[
tw(' mt-2'), tw(" mt-2"),
{fontSize: fontSize.sm, color: '#707070', fontFamily: 'light'}, {
]}> fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].gray20 + "aa",
fontFamily: "regular",
},
]}
>
پایه دوم پایه دوم
</Text> </Text>
<Text <Text
style={[ style={[
tw(' mt-1'), tw(" mt-1"),
{fontSize: fontSize.sm, color: '#05335F', fontFamily: 'light'}, {
]}> fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].greenBA,
fontFamily: "regular",
},
]}
>
نسخه دیجیتال نسخه دیجیتال
</Text> </Text>
</View> </View>
</View> </View>
<View style={tw('flex flex-row-reverse items-center')}> <View style={tw("flex flex-row-reverse items-center")}>
<Text <Text
style={[ style={[
tw(' py-1 px-3 rounded-sm'), tw(" py-1 px-3 rounded-sm"),
{ {
color: '#132F52', color: "#132F52",
fontSize: fontSize.xl, fontSize: fontSize.xl,
backgroundColor: '#F1F1F1', backgroundColor: "#F1F1F1",
fontFamily: 'bold' fontFamily: "bold",
}, },
]}> ]}
>
1 1
</Text> </Text>
<Text <View style={tw("flex flex-row items-center")}>
style={[ <Text
tw(' mr-3'), style={{
{color: '#132F52', fontSize: fontSize.base, fontFamily: 'regular'}, fontFamily: "regular",
]}> fontSize: fontSize.sm,
126.000 تومان color: Colors.theme1[colorScheme].green79,
</Text> }}
>
تومان
</Text>
<Text
style={[
tw(" mr-3"),
{
color: Colors.theme1[colorScheme].green79,
fontSize: fontSize.xl,
fontFamily: "bold",
},
]}
>
126.000
</Text>
</View>
</View> </View>
</View> </View>
); );

163
src/screens/OrderDetails/index.js
Unescape View File

@ -9,15 +9,23 @@ import {
Platform, Platform,
StatusBar, StatusBar,
LayoutAnimation, LayoutAnimation,
Appearance,
} from "react-native"; } from "react-native";
import { connect } from "react-redux";
import _ from "lodash";
//components
import Navbar from "../../components/Navbar"; import Navbar from "../../components/Navbar";
import Drawer from "../../components/Drawer"; import Drawer from "../../components/Drawer";
import Book from "./components/Book"; import Book from "./components/Book";
import { connect } from "react-redux";
//style
import tw from "tailwind-rn"; import tw from "tailwind-rn";
import fontSize from "../../constants/fontSize"; import fontSize from "../../constants/fontSize";
import Colors from "../../constants/Colors";
//assets
import b1Image from "./assets/b1.png"; import b1Image from "./assets/b1.png";
import _ from "lodash";
const width = Dimensions.get("window").width; const width = Dimensions.get("window").width;
@ -36,6 +44,7 @@ const status = {
}; };
function OrderDetails({ order }) { function OrderDetails({ order }) {
const colorScheme = Appearance.getColorScheme();
const [position, setPosition] = useState("100%"); const [position, setPosition] = useState("100%");
const setBoxPosition = () => { const setBoxPosition = () => {
@ -57,7 +66,7 @@ function OrderDetails({ order }) {
hamburgerMenu: false, hamburgerMenu: false,
title: "", title: "",
bookmark: false, bookmark: false,
qr: true, qr: false,
back: true, back: true,
}} }}
/> />
@ -69,15 +78,15 @@ function OrderDetails({ order }) {
<View <View
style={[ style={[
tw("flex flex-row-reverse w-full justify-between items-center p-3"), tw("flex flex-row-reverse w-full justify-between items-center p-3"),
{ backgroundColor: "#EEF7FF" }, { backgroundColor: Colors.theme1[colorScheme].greenCF + "1a" },
]} ]}
> >
<Text <Text
style={[ style={[
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
color: "#20297B", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "bold",
}, },
]} ]}
> >
@ -86,7 +95,11 @@ function OrderDetails({ order }) {
<View style={tw("flex flex-row-reverse items-center")}> <View style={tw("flex flex-row-reverse items-center")}>
<Text <Text
style={[ style={[
{ color: "#20297B", fontSize: fontSize.sm, fontFamily: "bold" }, {
color: Colors.theme1[colorScheme].green79,
fontSize: fontSize.sm,
fontFamily: "bold",
},
]} ]}
> >
{status[order.status]} {status[order.status]}
@ -102,12 +115,19 @@ function OrderDetails({ order }) {
<View <View
style={[ style={[
tw("w-full flex flex-row-reverse items-center py-4"), tw("w-full flex flex-row-reverse items-center py-4"),
{ borderBottomWidth: 1, borderColor: "#86A0B933" }, {
borderBottomWidth: 1,
borderColor: Colors.theme1[colorScheme].grayE3,
},
]} ]}
> >
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
آدرس تحویل: آدرس تحویل:
@ -118,8 +138,8 @@ function OrderDetails({ order }) {
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
lineHeight: 17, lineHeight: 17,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -129,13 +149,20 @@ function OrderDetails({ order }) {
<View <View
style={[ style={[
tw("w-full flex flex-row-reverse justify-between py-4"), tw("w-full flex flex-row-reverse justify-between py-4"),
{ borderBottomWidth: 1, borderColor: "#86A0B933" }, {
borderBottomWidth: 1,
borderColor: Colors.theme1[colorScheme].grayE3,
},
]} ]}
> >
<View style={tw("flex flex-row-reverse items-center")}> <View style={tw("flex flex-row-reverse items-center")}>
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
مشخصات تحویل گیرنده: مشخصات تحویل گیرنده:
@ -146,8 +173,8 @@ function OrderDetails({ order }) {
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
lineHeight: 17, lineHeight: 17,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -157,7 +184,11 @@ function OrderDetails({ order }) {
<View style={tw("flex flex-row-reverse items-center")}> <View style={tw("flex flex-row-reverse items-center")}>
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
شماره موبایل: شماره موبایل:
@ -168,8 +199,8 @@ function OrderDetails({ order }) {
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
lineHeight: 17, lineHeight: 17,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -180,12 +211,16 @@ function OrderDetails({ order }) {
<View <View
style={[ style={[
tw("w-full rounded-md flex flex-col p-4 items-end mt-2"), tw("w-full rounded-md flex flex-col p-4 items-end mt-2"),
{ backgroundColor: "#EEF6FF" }, { backgroundColor: Colors.theme1[colorScheme].greenFF1 + 'aa' },
]} ]}
> >
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
{_.join(["کد تحویل", order.receiveCode], " ")} {_.join(["کد تحویل", order.receiveCode], " ")}
@ -195,8 +230,8 @@ function OrderDetails({ order }) {
tw("font-light text-right mt-1"), tw("font-light text-right mt-1"),
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -212,7 +247,11 @@ function OrderDetails({ order }) {
<View style={tw("flex flex-row-reverse")}> <View style={tw("flex flex-row-reverse")}>
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
مبلغ سبد خرید: مبلغ سبد خرید:
@ -222,8 +261,8 @@ function OrderDetails({ order }) {
tw("font-light text-right mr-1"), tw("font-light text-right mr-1"),
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -233,7 +272,11 @@ function OrderDetails({ order }) {
<View style={tw("flex flex-row-reverse")}> <View style={tw("flex flex-row-reverse")}>
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
تخفیف: تخفیف:
@ -243,8 +286,8 @@ function OrderDetails({ order }) {
tw("font-light text-right mr-1"), tw("font-light text-right mr-1"),
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -255,13 +298,20 @@ function OrderDetails({ order }) {
<View <View
style={[ style={[
tw("w-full flex flex-row-reverse justify-between py-4"), tw("w-full flex flex-row-reverse justify-between py-4"),
{ borderBottomWidth: 1, borderColor: "#86A0B933" }, {
borderBottomWidth: 1,
borderColor: Colors.theme1[colorScheme].grayE3,
},
]} ]}
> >
<View style={tw("flex flex-row-reverse")}> <View style={tw("flex flex-row-reverse")}>
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
هزینه ارسال کالا: هزینه ارسال کالا:
@ -271,8 +321,8 @@ function OrderDetails({ order }) {
tw("font-light text-right mr-1"), tw("font-light text-right mr-1"),
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -282,7 +332,11 @@ function OrderDetails({ order }) {
<View style={tw("flex flex-row-reverse")}> <View style={tw("flex flex-row-reverse")}>
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
جمع هزینه پرداختی: جمع هزینه پرداختی:
@ -292,8 +346,8 @@ function OrderDetails({ order }) {
tw("font-light text-right mr-1"), tw("font-light text-right mr-1"),
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -304,13 +358,20 @@ function OrderDetails({ order }) {
<View <View
style={[ style={[
tw("w-full flex flex-row-reverse justify-between py-4"), tw("w-full flex flex-row-reverse justify-between py-4"),
{ borderBottomWidth: 1, borderColor: "#86A0B933" }, {
borderBottomWidth: 1,
borderColor: Colors.theme1[colorScheme].grayE3,
},
]} ]}
> >
<View style={tw("flex flex-row-reverse")}> <View style={tw("flex flex-row-reverse")}>
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
نحوه پرداخت: نحوه پرداخت:
@ -320,8 +381,8 @@ function OrderDetails({ order }) {
tw("font-light text-right mr-1"), tw("font-light text-right mr-1"),
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -331,7 +392,11 @@ function OrderDetails({ order }) {
<View style={tw("flex flex-row-reverse items-center")}> <View style={tw("flex flex-row-reverse items-center")}>
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
شماره تراکنش: شماره تراکنش:
@ -341,8 +406,8 @@ function OrderDetails({ order }) {
tw("font-light text-right mr-1"), tw("font-light text-right mr-1"),
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -354,7 +419,11 @@ function OrderDetails({ order }) {
<View style={tw("flex flex-row-reverse items-center")}> <View style={tw("flex flex-row-reverse items-center")}>
<Text <Text
style={[ style={[
{ fontSize: fontSize.sm, color: "#05335F", fontFamily: "bold" }, {
fontSize: fontSize.sm,
color: Colors.theme1[colorScheme].green79,
fontFamily: "bold",
},
]} ]}
> >
تاریخ تحویل: تاریخ تحویل:
@ -364,8 +433,8 @@ function OrderDetails({ order }) {
tw("font-light text-right mr-1"), tw("font-light text-right mr-1"),
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
color: "#05335F", color: Colors.theme1[colorScheme].green79,
fontFamily: "light", fontFamily: "regular",
}, },
]} ]}
> >
@ -387,8 +456,8 @@ const styles = StyleSheet.create({
width: width, width: width,
backgroundColor: "white", backgroundColor: "white",
flexDirection: "column", flexDirection: "column",
paddingVertical: 5, paddingVertical: 0,
paddingHorizontal: 10, paddingHorizontal: 16,
}, },
}); });

BIN
src/screens/OrdersFollowUp/assets/leftArrow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 241 B

203
src/screens/OrdersFollowUp/components/Order.js
Unescape View File

@ -1,141 +1,192 @@
import React from 'react'; import React from "react";
import { import {
View, View,
Text, Text,
Dimensions, Dimensions,
StyleSheet, StyleSheet,
Image, Image,
TouchableOpacity TouchableOpacity,
} from 'react-native'; Appearance,
import { useNavigation } from '@react-navigation/native'; } from "react-native";
import tw from 'tailwind-rn'; import { useNavigation } from "@react-navigation/native";
import fontSize from '../../../constants/fontSize'; import Svg, { Path } from "react-native-svg"
import leftArrowIcon from '../assets/leftArrow.png'; import _ from "lodash";
import _ from 'lodash';
const width = Dimensions.get('window').width; //style
import tw from "tailwind-rn";
import fontSize from "../../../constants/fontSize";
import Colors from "../../../constants/Colors";
const width = Dimensions.get("window").width;
const colors = { const colors = {
1: '#FFF700', 1: "#FFF700",
4: '#FF0000', 4: "#FF0000",
3: '#4CFF00', 3: "#4CFF00",
2: '#196EC0', 2: "#196EC0",
}; };
const status = { const status = {
1: 'در حال پردازش', 1: "در حال پردازش",
4: 'درخواست رد شد', 4: "درخواست رد شد",
3: 'تکمیل شد', 3: "تکمیل شد",
2: 'ارسال شده', 2: "ارسال شده",
}; };
function Order({order}) { function Order({ order }) {
const colorScheme = Appearance.getColorScheme();
const navigation = useNavigation(); const navigation = useNavigation();
return ( return (
<View <View
style={[ style={[
tw('w-full flex flex-col rounded-md overflow-hidden my-3'), tw("w-full flex flex-col rounded-md overflow-hidden my-3"),
{borderWidth: 1, borderColor: '#EEF7FF'}, {
]}> borderWidth: 1,
borderColor: Colors.theme1[colorScheme].greenCF + "22",
},
]}
>
<View <View
style={[ style={[
tw( tw("flex flex-row-reverse w-full justify-between items-center p-3"),
'flex flex-row-reverse w-full justify-between items-center p-3', { backgroundColor: Colors.theme1[colorScheme].greenCF + "1a" },
), ]}
{backgroundColor: '#EEF7FF'}, >
]}>
<Text <Text
style={[ style={[
tw('font-medium'), tw("font-medium"),
{fontSize: fontSize.base, color: '#20297B', fontFamily: 'regular'}, {
]}> fontSize: fontSize.base,
{_.join(['شماره سفارش:', order.number], ' ')} color: Colors.theme1[colorScheme].green79,
fontFamily: "regular",
},
]}
>
{_.join(["شماره سفارش:", order.number], " ")}
</Text> </Text>
<View style={tw('flex flex-row-reverse items-center')}> <View style={tw("flex flex-row-reverse items-center")}>
<Text <Text
style={[ style={[
tw('font-light'), tw("font-light"),
{color: '#20297B', fontSize: fontSize.sm, fontFamily: 'bold'}, {
]}> color: Colors.theme1[colorScheme].green79,
fontSize: fontSize.sm,
fontFamily: "bold",
},
]}
>
{status[order.status]} {status[order.status]}
</Text> </Text>
<View <View
style={[ style={[
tw('h-4 w-4 rounded-full mr-2'), tw("h-4 w-4 rounded-full mr-2"),
{backgroundColor: colors[order.status]}, { backgroundColor: colors[order.status] },
]}></View> ]}
></View>
</View> </View>
</View> </View>
<View <View style={tw("w-full flex flex-row-reverse justify-between p-3")}>
style={tw('w-full flex flex-row-reverse justify-between p-3')}> <View style={tw("flex flex-col")}>
<View style={tw('flex flex-col')}> <View style={tw("flex flex-row-reverse mb-2")}>
<View style={tw('flex flex-row-reverse mb-2')}>
{order.items.length < 2 {order.items.length < 2
? order?.items?.map(item => ( ? order?.items?.map((item, index) => (
<Image <Image
key={index}
source={item} source={item}
style={[ style={[
tw('rounded-md ml-1.5'), tw("rounded-md ml-1.5"),
{width: width / 5, height: width / 5 * (4 / 3)}, { width: width / 5, height: (width / 5) * (4 / 3) },
]} ]}
/> />
)) ))
: order.items : order.items
?.slice(0, 1) ?.slice(0, 1)
?.map(item => ( ?.map((item, index) => (
<Image <Image
key={index}
source={item} source={item}
style={[ style={[
tw('rounded-md ml-1.5'), tw("rounded-md ml-1.5"),
{width: width / 5, height: width / 5 * (4 / 3)}, { width: width / 5, height: (width / 5) * (4 / 3) },
]} ]}
/> />
))} ))}
</View> </View>
<View style={[tw('')]}> <View style={[tw("")]}>
<Text <Text
style={[ style={[
tw('p-2 rounded-md text-center'), tw("p-2 rounded-md text-center"),
{ {
fontSize: fontSize.sm, fontSize: fontSize.sm,
fontFamily: 'bold', fontFamily: "bold",
backgroundColor: '#F0FFF1', backgroundColor: "#F0FFF1",
color: '#05335F', color: Colors.theme1[colorScheme].green79,
}, },
]}> ]}
{_.join(['کد تحویل:', order.receiveCode], ' ')} >
{_.join(["کد تحویل:", order.receiveCode], " ")}
</Text> </Text>
</View> </View>
</View> </View>
<View style={tw('flex flex-col items-center mr-4')}> <View style={tw("flex flex-col items-center mr-4")}>
<Text <Text
style={[ style={[
tw('my-3'), tw("my-3"),
{fontSize: width / 31, color: '#132F52', fontFamily: 'bold'}, {
]}> fontSize: fontSize.tiny,
{_.join(['جمع فاکتور:', order.cost], ' ')} color: Colors.theme1[colorScheme].gray20,
fontFamily: "bold",
},
]}
>
{_.join(["جمع فاکتور:", order.cost], " ")}
</Text> </Text>
<TouchableOpacity <TouchableOpacity
onPress={() => navigation.navigate('Order')} onPress={() => navigation.navigate("Order")}
style={[ style={[
tw('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'}, {
]}> borderWidth: 1,
<Text style={{fontSize: fontSize.base, color: '#1999C0', fontFamily: 'regular'}}> borderColor: Colors.theme1[colorScheme].greenCF,
},
]}
>
<Text
style={{
fontSize: fontSize.base,
color: Colors.theme1[colorScheme].greenCF,
fontFamily: "regular",
}}
>
جزئیات سفارش جزئیات سفارش
</Text> </Text>
<Image <Svg
source={leftArrowIcon} xmlns="http://www.w3.org/2000/svg"
style={{width: 18, height: 18, marginRight: 10}} width={14.381}
/> height={14.381}
style={{marginTop : 3, marginRight : 5}}
>
<Path
d="M8.988 11.936 5.081 8.03a1.19 1.19 0 0 1 0-1.678l3.907-3.907"
fill="none"
stroke={Colors.theme1[colorScheme].greenCF}
strokeLinecap="round"
strokeLinejoin="round"
data-name="vuesax/linear/arrow-left"
/>
</Svg>
</TouchableOpacity> </TouchableOpacity>
<Text <Text
style={[ style={[
tw('my-5'), tw("my-5"),
{fontSize: fontSize.sm, color: '#132F52', fontFamily: 'light'}, {
]}> fontSize: fontSize.sm,
{_.join(['تاریخ سفارش:', order.date], ' ')} color: Colors.theme1[colorScheme].gray20,
fontFamily: "light",
},
]}
>
{_.join(["تاریخ سفارش:", order.date], " ")}
</Text> </Text>
</View> </View>
</View> </View>
@ -146,12 +197,12 @@ function Order({order}) {
const styles = StyleSheet.create({ const styles = StyleSheet.create({
contentContainerStyle: { contentContainerStyle: {
paddingBottom: 50, paddingBottom: 50,
alignItems: 'flex-end', alignItems: "flex-end",
}, },
container: { container: {
width: width, width: width,
backgroundColor: 'white', backgroundColor: "white",
flexDirection: 'column', flexDirection: "column",
paddingVertical: 5, paddingVertical: 5,
paddingHorizontal: 10, paddingHorizontal: 10,
}, },

4
src/screens/OrdersFollowUp/index.js
Unescape View File

@ -63,8 +63,8 @@ const styles = StyleSheet.create({
width: width, width: width,
backgroundColor: "white", backgroundColor: "white",
flexDirection: "column", flexDirection: "column",
paddingVertical: 5, paddingVertical: 0,
paddingHorizontal: 10, paddingHorizontal: 16,
}, },
}); });

8
src/screens/OrdersFollowUp/left.svg
Unescape View File

@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" width="14.381" height="14.381" viewBox="0 0 14.381 14.381">
<g id="vuesax_linear_arrow-left" data-name="vuesax/linear/arrow-left" transform="translate(-364 -252)">
<g id="arrow-left" transform="translate(364 252)">
<path id="Vector" d="M4.253,9.491.346,5.585a1.19,1.19,0,0,1,0-1.678L4.253,0" transform="translate(4.735 2.445)" fill="none" stroke="#1999c0" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<path id="Vector-2" data-name="Vector" d="M0,0H14.381V14.381H0Z" transform="translate(14.381 14.381) rotate(180)" fill="none" opacity="0"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 643 B

2
src/screens/Products/components/Main.js
Unescape View File

@ -72,7 +72,7 @@ const Main = ({ books, filterOptions, grades }) => {
? bySearchFilter?.map((product, index) => ( ? bySearchFilter?.map((product, index) => (
<Pressable <Pressable
style={[tw(`w-full flex flex-col mb-5`)]} style={[tw(`w-full flex flex-col mb-5`)]}
key={Math.random()} key={index}
onPress={() => navigation.navigate("Product")} onPress={() => navigation.navigate("Product")}
> >
<View style={[tw("relative w-full mb-1")]}> <View style={[tw("relative w-full mb-1")]}>

23
src/screens/Profile/components/List.js
Unescape View File

@ -9,6 +9,7 @@ import {
import React from "react"; import React from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import Svg, { Path, G } from "react-native-svg"; import Svg, { Path, G } from "react-native-svg";
import { useNavigation } from "@react-navigation/native";
//style //style
import tw from "tailwind-rn"; import tw from "tailwind-rn";
@ -18,6 +19,7 @@ import Colors from "../../../constants/Colors";
const ios = Platform.OS === "ios"; const ios = Platform.OS === "ios";
const List = ({}) => { const List = ({}) => {
const navigation = useNavigation();
const colorScheme = Appearance.getColorScheme(); const colorScheme = Appearance.getColorScheme();
const [dropdown, setDropdown] = React.useState(true); const [dropdown, setDropdown] = React.useState(true);
const pages = [ const pages = [
@ -44,6 +46,7 @@ const List = ({}) => {
</Svg> </Svg>
), ),
name: "اطلاعات حساب کاربری", name: "اطلاعات حساب کاربری",
onPress: () => navigation.push("CreateAddress", { type: "profile" }),
}, },
{ {
icon: ( icon: (
@ -77,6 +80,7 @@ const List = ({}) => {
</Svg> </Svg>
), ),
name: "سفارشات", name: "سفارشات",
onPress: () => navigation.push("Orders"),
}, },
{ {
icon: ( icon: (
@ -101,6 +105,7 @@ const List = ({}) => {
</Svg> </Svg>
), ),
name: "کتاب‌های من", name: "کتاب‌های من",
onPress: () => navigation.push("AR"),
}, },
{ {
icon: ( icon: (
@ -128,6 +133,7 @@ const List = ({}) => {
</Svg> </Svg>
), ),
name: "دوره‌های من", name: "دوره‌های من",
onPress: () => {},
}, },
{ {
icon: ( icon: (
@ -152,6 +158,7 @@ const List = ({}) => {
</Svg> </Svg>
), ),
name: "لیست علاقه‌مندی‌ها", name: "لیست علاقه‌مندی‌ها",
onPress: () => {},
}, },
{ {
icon: ( icon: (
@ -185,6 +192,7 @@ const List = ({}) => {
</Svg> </Svg>
), ),
name: "آدرس‌ها", name: "آدرس‌ها",
onPress: () => {},
}, },
]; ];
return ( return (
@ -194,25 +202,24 @@ const List = ({}) => {
key={index} key={index}
style={[ style={[
tw( tw(
`w-full flex items-center justify-between mb-4 pb-4 ${ `w-full flex items-center justify-between mb-4 pb-4 flex-row-reverse`
ios ? "flex-row-reverse" : "flex-row"
}`
), ),
{ {
borderBottomWidth: 1, borderBottomWidth: 1,
borderColor: Colors.theme1[colorScheme].grayE3 + "aa", borderColor: Colors.theme1[colorScheme].grayE3 + "aa",
}, },
]} ]}
onPress={() => page.onPress()}
> >
<View <View
style={tw( style={tw(
`flex items-center ${ios ? "flex-row-reverse" : "flex-row"}` `flex items-center flex-row-reverse`
)} )}
> >
{page.icon} {page.icon}
<Text <Text
style={{ style={{
fontFamily: "light", fontFamily: "regular",
marginTop: 5, marginTop: 5,
marginRight: 10, marginRight: 10,
color: Colors.theme1[colorScheme].gray20, color: Colors.theme1[colorScheme].gray20,
@ -221,11 +228,7 @@ const List = ({}) => {
{page.name} {page.name}
</Text> </Text>
</View> </View>
<Svg <Svg xmlns="http://www.w3.org/2000/svg" width={24} height={24}>
xmlns="http://www.w3.org/2000/svg"
width={24}
height={24}
>
<Path <Path
d="M15.002 19.92 8.479 13.4a1.986 1.986 0 0 1 0-2.8l6.523-6.52" d="M15.002 19.92 8.479 13.4a1.986 1.986 0 0 1 0-2.8l6.523-6.52"
fill="none" fill="none"

6
src/screens/Profile/components/Trophy.js
Unescape View File

@ -17,14 +17,12 @@ const Trophy = ({}) => {
<View <View
style={[ style={[
tw( tw(
`w-full flex py-4 px-3 justify-between ${ `w-full flex py-4 px-3 justify-between flex-row-reverse`
ios ? "flex-row-reverse" : "flex-row"
}`
), ),
{ backgroundColor: Colors.theme1[colorScheme].yellow2 }, { backgroundColor: Colors.theme1[colorScheme].yellow2 },
]} ]}
> >
<View style={[tw(`flex ${ios ? "flex-row-reverse" : "flex-row"}`)]}> <View style={[tw(`flex flex-row-reverse`)]}>
<Svg xmlns="http://www.w3.org/2000/svg" width={23.862} height={23.862}> <Svg xmlns="http://www.w3.org/2000/svg" width={23.862} height={23.862}>
<G fill="none" stroke="#d6d020" data-name="vuesax/linear/cup"> <G fill="none" stroke="#d6d020" data-name="vuesax/linear/cup">
<Path <Path

14
src/screens/Profile/components/User.js
Unescape View File

@ -17,15 +17,13 @@ const User = ({ user }) => {
<View style={tw(`w-full flex-col ${ios ? "items-end" : ""}`)}> <View style={tw(`w-full flex-col ${ios ? "items-end" : ""}`)}>
<Pressable <Pressable
style={tw( style={tw(
`w-full mt-2 mb-2 flex justify-between items-center ${ `w-full mt-2 mb-2 flex flex-row-reverse justify-between items-center`
ios ? "flex-row-reverse" : "flex-row"
}`
)} )}
onPress={() => setDropdown(!dropdown)} onPress={() => setDropdown(!dropdown)}
> >
<View <View
style={tw( style={tw(
`flex items-center ${ios ? "flex-row-reverse" : "flex-row"}` `flex items-center flex-row-reverse`
)} )}
> >
{user?.picFileId ? ( {user?.picFileId ? (
@ -82,9 +80,7 @@ const User = ({ user }) => {
<View <View
style={[ style={[
tw( tw(
`flex items-center w-full pb-3 mb-4 ${ `flex items-center w-full pb-3 mb-4 flex-row-reverse`
ios ? "flex-row-reverse" : "flex-row "
}`
), ),
{ {
borderBottomWidth: 1, borderBottomWidth: 1,
@ -118,9 +114,7 @@ const User = ({ user }) => {
<View <View
style={[ style={[
tw( tw(
`flex items-center w-full pb-3 mb-3 ${ `flex items-center w-full pb-3 mb-3 flex-row-reverse`
ios ? "flex-row-reverse" : "flex-row "
}`
), ),
{ {
borderBottomWidth: 1, borderBottomWidth: 1,

22
src/screens/QR/Scan/index.js
Unescape View File

@ -6,19 +6,22 @@ import {
Dimensions, Dimensions,
ImageBackground, ImageBackground,
StatusBar, StatusBar,
Appearance,
} from "react-native"; } from "react-native";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
import tw from "tailwind-rn";
import { BarCodeScanner } from "expo-barcode-scanner"; import { BarCodeScanner } from "expo-barcode-scanner";
import Colors from "../../../constants/Colors";
import { Entypo } from "@expo/vector-icons"; import { Entypo } from "@expo/vector-icons";
import tw from "tailwind-rn";
import Colors from "../../../constants/Colors";
const { width, height } = Dimensions.get("screen"); const { width, height } = Dimensions.get("screen");
//assets //assets
import laptopImage from "../assets/laptop.png"; import laptopImage from "../assets/laptop.png";
export default function Scan({}) { export default function Scan({}) {
const colorScheme = Appearance.getColorScheme();
const navigation = useNavigation(); const navigation = useNavigation();
const [hasPermission, setHasPermission] = useState(null); const [hasPermission, setHasPermission] = useState(null);
const [scanned, setScanned] = useState(false); const [scanned, setScanned] = useState(false);
@ -68,19 +71,26 @@ export default function Scan({}) {
{ {
width: height / 3.5, width: height / 3.5,
borderWidth: 1, borderWidth: 1,
borderColor: Colors.theme1.light.blue8, borderColor: Colors.theme1[colorScheme].greenCF,
}, },
]} ]}
> >
<Entypo name="back" size={width / 27} style={{marginRight : 5, color : 'white'}} /> <Entypo
name="back"
size={width / 27}
style={{ marginRight: 5, color: Colors.theme1[colorScheme].greenCF }}
/>
<Text <Text
style={[ style={[
{ color: "white", fontSize: width / 27, fontFamily: "regular" }, {
color: Colors.theme1[colorScheme].greenCF,
fontSize: width / 27,
fontFamily: "regular",
},
]} ]}
> >
بازگشت بازگشت
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
{/* )} */} {/* )} */}

4
src/screens/VideoDisplay/components/Season/index.js
Unescape View File

@ -64,7 +64,7 @@ const Season = ({ season, activeUnit, name, setVideoActive }) => {
style={[ style={[
{ {
fontFamily: "bold", fontFamily: "bold",
fontSize: fontSize.xl, fontSize: fontSize.base,
color: color:
activeUnit === unit ? "white" : Colors.theme1[colorScheme].green79, activeUnit === unit ? "white" : Colors.theme1[colorScheme].green79,
}, },
@ -99,7 +99,7 @@ const Season = ({ season, activeUnit, name, setVideoActive }) => {
width: "100%", width: "100%",
textAlign: "center", textAlign: "center",
fontFamily: "bold", fontFamily: "bold",
fontSize: fontSize.lg, fontSize: fontSize.base,
color: activeUnit === unit ? "white" : Colors.theme1[colorScheme].green79, color: activeUnit === unit ? "white" : Colors.theme1[colorScheme].green79,
}} }}
> >

Write Preview
Loading…
Cancel
Save