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

Compare commits

base: Reza_ashrafi:df4e25db4caf7dbbb62b630a5388d210c72b3ba8
Branches Tags
Reza_ashrafi:master
..
compare: Reza_ashrafi:fe804130a5f9101c6b6e2c0af975613bdaf00ee3
Branches Tags
Reza_ashrafi:master

No commits in common. 'df4e25db4caf7dbbb62b630a5388d210c72b3ba8' and 'fe804130a5f9101c6b6e2c0af975613bdaf00ee3' have entirely different histories.
df4e25db4c ... fe804130a5

25 changed files with 119 additions and 91 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
  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. 4
      src/screens/Address/index.js
  7. 6
      src/screens/Contact/layouts/Box.js
  8. 6
      src/screens/DeliveryForm/Address/index.js
  9. 4
      src/screens/DeliveryForm/TransportDate/index.js
  10. 4
      src/screens/DeliveryForm/TransportMethod/index.js
  11. 4
      src/screens/Faq/components/Instance.js
  12. 6
      src/screens/Home/components/Blogs.js
  13. 2
      src/screens/Home/components/Header.js
  14. 8
      src/screens/OrderDetails/components/Book.js
  15. 56
      src/screens/OrderDetails/index.js
  16. 12
      src/screens/OrdersFollowUp/components/Order.js
  17. 10
      src/screens/Product/components/Book.js
  18. 12
      src/screens/Product/components/Comments.js
  19. 2
      src/screens/Product/components/LinkBox.js
  20. 2
      src/screens/Profile/components/List.js
  21. 8
      src/screens/Profile/components/ProfileAddress/index.js
  22. 9
      src/screens/Profile/components/User.js
  23. 2
      src/screens/Profile/index.js
  24. 7
      src/screens/QR/layouts/Scan/index.js
  25. 8
      src/screens/ShoppingCart/components/Product.js

4
src/components/Drawer.js
Unescape View File

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

2
src/components/Pressable.js
Unescape View File

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

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

@ -10,7 +10,7 @@ import Colors from "../../../constants/Colors";
const { width, height } = Dimensions.get("window"); const { width, height } = Dimensions.get("window");
const Book = ({ book, mobile, theme }) => { const Book = ({ book, mobile, theme, orientation }) => {
return ( return (
<Pressable <Pressable
style={[ style={[
@ -29,7 +29,7 @@ const Book = ({ book, mobile, theme }) => {
style={[ style={[
tw("rounded-sm w-full"), tw("rounded-sm w-full"),
{ {
height : width / 4.2 * 4 / 3, height: mobile ? (width - 32) / 1.5 : height / 4,
flex: 1, flex: 1,
}, },
]} ]}
@ -38,7 +38,7 @@ const Book = ({ book, mobile, theme }) => {
style={[ style={[
{ {
fontFamily: "bold", fontFamily: "bold",
fontSize: mobile ? fontSize.lg : fontSize.tiny, fontSize: fontSize.lg,
marginTop: 10, marginTop: 10,
color: color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,

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

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

20
src/screens/Activation/index.js
Unescape View File

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

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

@ -348,7 +348,7 @@ const Address = ({
<Text <Text
style={{ style={{
fontFamily: "bold", fontFamily: "bold",
fontSize: mobile ? fontSize.lg : fontSize.lg, fontSize: mobile ? fontSize.lg : fontSize.xl2,
color: color:
theme === "light" ? Colors.theme1.gray20 : Colors.theme1.white, theme === "light" ? Colors.theme1.gray20 : Colors.theme1.white,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
@ -359,7 +359,7 @@ const Address = ({
<Text <Text
style={{ style={{
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.tiny, fontSize: mobile ? fontSize.sm : fontSize.base,
color: color:
theme === "light" theme === "light"
? Colors.theme1.gray20 + "aa" ? Colors.theme1.gray20 + "aa"

6
src/screens/Contact/layouts/Box.js
Unescape View File

@ -42,7 +42,7 @@ const Box = ({ info, mobile }) => {
<Text <Text
style={{ style={{
fontFamily: "bold", fontFamily: "bold",
fontSize: fontSize.lg, fontSize: mobile ? fontSize.lg : fontSize.xl3,
color: info.title.color, color: info.title.color,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
}} }}
@ -54,7 +54,7 @@ const Box = ({ info, mobile }) => {
tw("mt-1"), tw("mt-1"),
{ {
fontFamily: "light", fontFamily: "light",
fontSize: fontSize.tiny, fontSize: mobile ? fontSize.tiny : fontSize.lg,
color: info.description.color, color: info.description.color,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
}, },
@ -67,7 +67,7 @@ const Box = ({ info, mobile }) => {
tw("self-start mt-2.5"), tw("self-start mt-2.5"),
{ {
fontFamily: "demi", fontFamily: "demi",
fontSize: fontSize.sm, fontSize: mobile ? fontSize.sm : fontSize.lg,
color: info?.link?.color, color: info?.link?.color,
}, },
]} ]}

6
src/screens/DeliveryForm/Address/index.js
Unescape View File

@ -87,7 +87,7 @@ const Address = ({
style={[ style={[
{ {
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.lg,
lineHeight: 22, lineHeight: 22,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
color: active color: active
@ -158,7 +158,7 @@ const Address = ({
{addresses?.length ? ( {addresses?.length ? (
<Text <Text
style={{ style={{
fontSize: mobile ? fontSize.base : fontSize.base, fontSize: mobile ? fontSize.base : fontSize.xl,
fontFamily: "bold", fontFamily: "bold",
color: light ? Colors.theme1.green79 : Colors.theme1.white, color: light ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
@ -194,7 +194,7 @@ const Address = ({
<Text <Text
style={{ style={{
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.lg,
color: light ? Colors.theme1.gray2077 : Colors.theme1.grayE3, color: light ? Colors.theme1.gray2077 : Colors.theme1.grayE3,
}} }}
> >

4
src/screens/DeliveryForm/TransportDate/index.js
Unescape View File

@ -40,7 +40,7 @@ const TransportDate = ({ transportDate, mobile, theme }) => {
<Text <Text
style={{ style={{
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.xl,
color: active color: active
? light ? light
? Colors.theme1.gray20 ? Colors.theme1.gray20
@ -88,7 +88,7 @@ const TransportDate = ({ transportDate, mobile, theme }) => {
<View style={tw(`w-full`)}> <View style={tw(`w-full`)}>
<Text <Text
style={{ style={{
fontSize: mobile ? fontSize.base : fontSize.base, fontSize: mobile ? fontSize.base : fontSize.xl2,
fontFamily: "bold", fontFamily: "bold",
color: light ? Colors.theme1.green79 : Colors.theme1.white, color: light ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",

4
src/screens/DeliveryForm/TransportMethod/index.js
Unescape View File

@ -89,7 +89,7 @@ const TransportMethod = ({
<Text <Text
style={{ style={{
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.xl2,
color: active color: active
? light ? light
? Colors.theme1.gray20 ? Colors.theme1.gray20
@ -143,7 +143,7 @@ const TransportMethod = ({
<View style={tw(`w-full ${mobile ? "mt-4" : "mt-4"}`)}> <View style={tw(`w-full ${mobile ? "mt-4" : "mt-4"}`)}>
<Text <Text
style={{ style={{
fontSize: mobile ? fontSize.base : fontSize.tiny, fontSize: mobile ? fontSize.base : fontSize.xl,
fontFamily: "bold", fontFamily: "bold",
color: light ? Colors.theme1.green79 : Colors.theme1.white, color: light ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",

4
src/screens/Faq/components/Instance.js
Unescape View File

@ -35,7 +35,7 @@ function Instance({ question, selectFaq, mobile, theme }) {
theme === "light" theme === "light"
? Colors.theme1.green79 ? Colors.theme1.green79
: Colors.theme1.grayF9, : Colors.theme1.grayF9,
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.lg,
fontFamily: "bold", fontFamily: "bold",
}, },
]} ]}
@ -69,7 +69,7 @@ function Instance({ question, selectFaq, mobile, theme }) {
theme === "light" theme === "light"
? Colors.theme1.green79 ? Colors.theme1.green79
: Colors.theme1.grayF9, : Colors.theme1.grayF9,
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.lg,
fontFamily: "light", fontFamily: "light",
}, },
tw("text-right flex-1"), tw("text-right flex-1"),

6
src/screens/Home/components/Blogs.js
Unescape View File

@ -91,8 +91,8 @@ const Blog = ({ blog, mobile, theme }) => {
{ {
color: color:
theme === "light" ? Colors.theme1.gray20 : Colors.theme1.white, theme === "light" ? Colors.theme1.gray20 : Colors.theme1.white,
fontFamily: "bold", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.tiny, fontSize: mobile ? fontSize.sm : fontSize.lg,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
}, },
]} ]}
@ -116,7 +116,7 @@ const Blog = ({ blog, mobile, theme }) => {
? Colors.theme1.gray20 ? Colors.theme1.gray20
: Colors.theme1.white, : Colors.theme1.white,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.xs : fontSize.sm, fontSize: mobile ? fontSize.xs : fontSize.base,
}, },
]} ]}
> >

2
src/screens/Home/components/Header.js
Unescape View File

@ -23,7 +23,7 @@ const Header = ({ title, route, mobile, theme, state = null }) => {
{ {
color: theme === 'light' ? Colors.theme1.green79 : Colors.theme1.white, color: theme === 'light' ? Colors.theme1.green79 : Colors.theme1.white,
fontFamily: "demi", fontFamily: "demi",
fontSize: fontSize.lg, fontSize: mobile ? fontSize.lg : fontSize.xl2,
}, },
]} ]}
> >

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

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

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

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

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

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

10
src/screens/Product/components/Book.js
Unescape View File

@ -176,7 +176,7 @@ function Book({
theme === "light" theme === "light"
? Colors.theme1.green79 ? Colors.theme1.green79
: Colors.theme1.white, : Colors.theme1.white,
fontSize: mobile ? fontSize.base : fontSize.lg, fontSize: mobile ? fontSize.base : fontSize.xl3,
marginBottom: 5, marginBottom: 5,
fontFamily: "bold", fontFamily: "bold",
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
@ -190,7 +190,7 @@ function Book({
theme === "light" theme === "light"
? Colors.theme1.green79 ? Colors.theme1.green79
: Colors.theme1.white, : Colors.theme1.white,
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.xl,
fontFamily: "regular", fontFamily: "regular",
}} }}
> >
@ -208,7 +208,7 @@ function Book({
color: color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: "center", textAlign: "center",
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.lg,
fontFamily: "regular", fontFamily: "regular",
}} }}
> >
@ -229,7 +229,7 @@ function Book({
color: color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: "center", textAlign: "center",
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.lg,
fontFamily: "regular", fontFamily: "regular",
}} }}
> >
@ -258,7 +258,7 @@ function Book({
color: color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
textAlign: "center", textAlign: "center",
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.lg,
fontFamily: "regular", fontFamily: "regular",
}} }}
> >

12
src/screens/Product/components/Comments.js
Unescape View File

@ -32,7 +32,6 @@ function Commnets({
getFullList, getFullList,
orderFullList, orderFullList,
theme, theme,
mobile,
}) { }) {
React.useEffect(() => { React.useEffect(() => {
if (!orderFullList?.length) { if (!orderFullList?.length) {
@ -51,7 +50,7 @@ function Commnets({
renderItem={({ item }) => <Comment comment={item} theme={theme} />} renderItem={({ item }) => <Comment comment={item} theme={theme} />}
keyExtractor={(item) => item?.id} keyExtractor={(item) => item?.id}
/> />
<AddComment addComment={addComment} productId={productId} theme={theme} mobile={mobile} /> <AddComment addComment={addComment} productId={productId} theme={theme} />
</View> </View>
); );
} }
@ -125,7 +124,7 @@ const Comment = ({ comment, theme }) => {
); );
}; };
const AddComment = ({ addComment, productId, theme, mobile, ...props }) => { const AddComment = ({ addComment, productId, theme, ...props }) => {
const [commentForm, setCommentForm] = React.useState({ const [commentForm, setCommentForm] = React.useState({
title: "", title: "",
text: "", text: "",
@ -133,12 +132,16 @@ const AddComment = ({ addComment, productId, theme, mobile, ...props }) => {
productId: null, productId: null,
}); });
const colorScheme = React.useMemo(() => {
return Appearance.getColorScheme();
}, [props.useless]);
return ( return (
<KeyboardAvoidingView <KeyboardAvoidingView
behavior={ios ? "padding" : "height"} behavior={ios ? "padding" : "height"}
style={[tw("flex items-end")]} style={[tw("flex items-end")]}
> >
<Avatar source={null} size={mobile ? width / 5.5 : width / 7} /> <Avatar source={null} size={width / 5.5} />
<TextInput <TextInput
style={[ style={[
tw("w-full mt-4 px-2 rounded-md"), tw("w-full mt-4 px-2 rounded-md"),
@ -214,7 +217,6 @@ const AddComment = ({ addComment, productId, theme, mobile, ...props }) => {
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
orderFullList: state.userFactor.fullList, orderFullList: state.userFactor.fullList,
theme: state.publicApi.theme, theme: state.publicApi.theme,
mobile: state.publicApi.mobile,
}); });
const mapDispatchToProps = { const mapDispatchToProps = {

2
src/screens/Product/components/LinkBox.js
Unescape View File

@ -30,7 +30,7 @@ function Description({ title, onPress, mobile, theme }) {
<Text <Text
style={[ style={[
{ {
fontSize: mobile ? fontSize.sm : fontSize.sm, fontSize: mobile ? fontSize.sm : fontSize.lg,
color: color:
theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, theme === "light" ? Colors.theme1.green79 : Colors.theme1.white,
fontFamily: "demi", fontFamily: "demi",

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

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

8
src/screens/Profile/components/ProfileAddress/index.js
Unescape View File

@ -161,7 +161,7 @@ const ProfileAddress = ({
style={[ style={[
{ {
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.tiny, fontSize: mobile ? fontSize.sm : fontSize.lg,
lineHeight: 22, lineHeight: 22,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
color: color:
@ -180,7 +180,7 @@ const ProfileAddress = ({
{ {
marginTop: mobile ? 4 : 8, marginTop: mobile ? 4 : 8,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.tiny, fontSize: mobile ? fontSize.sm : fontSize.lg,
lineHeight: 22, lineHeight: 22,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
color: color:
@ -199,7 +199,7 @@ const ProfileAddress = ({
{ {
marginTop: mobile ? 4 : 8, marginTop: mobile ? 4 : 8,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.tiny, fontSize: mobile ? fontSize.sm : fontSize.lg,
lineHeight: 22, lineHeight: 22,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
color: color:
@ -218,7 +218,7 @@ const ProfileAddress = ({
{ {
marginTop: mobile ? 4 : 8, marginTop: mobile ? 4 : 8,
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.tiny, fontSize: mobile ? fontSize.sm : fontSize.lg,
lineHeight: 22, lineHeight: 22,
textAlign: ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
color: color:

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

@ -1,6 +1,9 @@
import { View, Text, Platform, Pressable, Dimensions } from "react-native"; import { View, Text, Platform, Pressable, Dimensions } from "react-native";
import React from "react"; import React from "react";
import { connect } from "react-redux"; 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"; import { useNavigation } from "@react-navigation/native";
//components //components
@ -34,11 +37,11 @@ const User = ({ user, mobile, theme }) => {
onPress={() => setDropdown(!dropdown)} onPress={() => setDropdown(!dropdown)}
> >
<View style={tw(`flex items-center flex-row-reverse`)}> <View style={tw(`flex items-center flex-row-reverse`)}>
<Avatar source={user?.picFileIds} size={mobile ? width / 5.5 : width / 7} /> <Avatar source={user?.picFileIds} size={width / 5.5} />
<View style={tw(`flex mr-2 ${ios ? "items-end" : ""}`)}> <View style={tw(`flex mr-2 ${ios ? "items-end" : ""}`)}>
<Text <Text
style={{ style={{
fontSize: mobile ? fontSize.lg : fontSize.xl, fontSize: mobile ? fontSize.lg : fontSize.xl5,
color: color:
theme === "light" theme === "light"
? Colors.theme1.gray20 ? Colors.theme1.gray20
@ -50,7 +53,7 @@ const User = ({ user, mobile, theme }) => {
</Text> </Text>
<Text <Text
style={{ style={{
fontSize: mobile ? fontSize.tiny : fontSize.base, fontSize: mobile ? fontSize.tiny : fontSize.xl2,
color: color:
theme === "light" theme === "light"
? Colors.theme1.gray20 ? Colors.theme1.gray20

2
src/screens/Profile/index.js
Unescape View File

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

7
src/screens/QR/layouts/Scan/index.js
Unescape View File

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

8
src/screens/ShoppingCart/components/Product.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save