From 6c201d9097d2f369e42da0d5425337e8c6e3441a Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Sun, 23 Jan 2022 11:24:37 +0330 Subject: [PATCH] reza added some change --- app.json | 2 +- navigation/assets/book-active.png | Bin 0 -> 626 bytes navigation/assets/profile-active.png | Bin 0 -> 592 bytes navigation/assets/profile-deactive.png | Bin 0 -> 785 bytes navigation/assets/test-active.png | Bin 0 -> 775 bytes navigation/index.js | 79 ++++++----- .../BottomSheetComponents/ProductQuestion.js | 127 ++++++++++-------- .../BottomSheetComponents/ProductReview.js | 93 +++++++------ src/screens/Splash/index.js | 3 +- src/screens/Tests/index.js | 18 +-- src/screens/Video/index.js | 7 +- 11 files changed, 163 insertions(+), 166 deletions(-) create mode 100644 navigation/assets/book-active.png create mode 100644 navigation/assets/profile-active.png create mode 100644 navigation/assets/profile-deactive.png create mode 100644 navigation/assets/test-active.png diff --git a/app.json b/app.json index a630017..1cc1a97 100644 --- a/app.json +++ b/app.json @@ -4,7 +4,7 @@ "slug": "RnDanovinExpo", "version": "1.0.0", "orientation": "portrait", - "icon": "", + "icon": "./src/assets/icons/logo.png", "splash": { "image": "", "resizeMode": "contain", diff --git a/navigation/assets/book-active.png b/navigation/assets/book-active.png new file mode 100644 index 0000000000000000000000000000000000000000..43988f201c1af92e18845673248c2cf5c6fe239c GIT binary patch literal 626 zcmV-&0*(ENP)%5k&hBtl$sOs~7)D zJ$tZt5$eHKFQU>`K@q%I@TA}e3Tjg`&ZaabwN2J4v_ckINOm%L_RVDT4nl(sY%m`1 zfZU#lU7@{9hhL*DJ~?SzNN~-6SwbbrM=5Pu&AKK0Houbz_?ut>NuMOd0Ot-BQv>J1 zrShCMAb%pA&f9>R6KRf-8yv{0 z;i_$g28h0nfKjvo5Y?pwbNqC`N!W1d9Fyq;$QG7%ohyq9ly*YoK;t6YP!* z!18$x&YoXog)!s)9B90=)c~40xq|(N7Z2#00x}AT81X9&@o2a2o{Yn~JhIJDKg@Tx zn?Sj@JPaP3*AK|4uI!0GdU16!eQHTgmwV7eV^jCC@Q0zM5jz+%>s#YNO?!%fDJv!IZ5jlEzxwv`P*Bl#2iTpJwB$2n~5D&;rx`tEe6Nhk$Gm@(-g8%>k M07*qoM6N<$g6U}w+yDRo literal 0 HcmV?d00001 diff --git a/navigation/assets/profile-active.png b/navigation/assets/profile-active.png new file mode 100644 index 0000000000000000000000000000000000000000..4c150feadf7e176121e6501b420ec5256194f0d8 GIT binary patch literal 592 zcmV-W0-6?s6ebh-yHA( z8i2zN=sB1aVI})h(EBH{s z{S=Ad#x(YuTIY73T7iYpcO`Oa@yX-Gf9&`%2W-DKk~<&gr2u>#Nc+7NkPP~+|1p63 zbSJ9VyU+JHeRfu&C7J>RQ`1Opd{j^=z}e3Z>54bkB;#DI=7`wILg;Gxfe0Wyy&@pn znpveYbCmFJ@#h4n^wX0H(ybJA;X1)Ai!pI2;RN6TWXc1`ZfO8MC{;!$fKLM|yb7T@ zx)m6V=Lop*6$OCkGHX=ZMK+`>aL#}lFak_miRgX>JPAb^jY{W%5WTJ!d_Z(u)9|_y zb|&DW)Z)l{l1gG7Snh(DQxlL*it@sCMF^;8!l0)qLOKOL3xP{=7{W>^)()ZT=F|#E eQkGr+2Y3UYNWmeB=pLs40000zzQ(XlG#QdG?eROk(&_Q5UzWCGy>*e$aR24|8%;u{y8y1OIm6-25PjOqf$|tHwoB@^)L>WMy z3(Zm;J(K~DsV#cM)i=M0A%bUh!p@q6yf-t>FgK!fuhKT zVz$~q0q)bU24(}QNQB6K;Tp|G0M#5Rn4<9wazAoC+j?%zTvm`$Geqh2nV+!9OLn2>*|;Q zGCad~uDQOhcxm4NsLTcvfcAb9y-gW}6JA`o2^AM_&wsC|1Xv^>hKLR~fl%)SSlhF$ zH6FuNh(!t-4d$s~*_taotVX1ZQVs{48%&vk_&#BW`x6q|B=HPhXLnr%`Ag)Aa9H26TgdxWDcOuqm4FTkl zC|TCDxpE}%P^Hrn#2rt?0P*VII#=yusHE<~(-02i&1;%KT#3{y0?zarqNc|%S%wLl zVGJO090-)@7erl`=vr|q7;E%n1c|5T5aC?EK_qYV=)|xZB$3MVv3UCpBKj4?a48Z< z)_nbm$fJzk?V$I)gz!2YaQnb0+*)3Rr(eGtqzUPg9tqAifjAd4A&qFMS0DnhcxWH^ zJ#IMs{59l$6^+uSJgG-S1#)HYPB=2WMalP!zx4XskM;K#Mz+BSJ0Ba`43oSs^5RWX zG^&fc1rgyB+kHxq`zxQ}!OEBV`?I^Y!W}*ivGcEThIfr3oUl(gVMBdAnj8Cf!^>|! zln~W`Yy?OrdG;T~9HoCZB65osRtr!lm5l{$Ba>BX(B(Zl;7s-%EPN{1135V40jZKI zTmD%zRL#*%Zt%JsT+lq#dLlJO>Pd5s&`muWyx4IakurU>O=XoYl`pQD)DSriAH&Q4 zMJj7cQ&rY>y+}I{^UqA8_n6_ujxmHeH|kI-5Lw_(r1@6ax7txEA=rhw4G@rcdY&8Q zllD=p6^bq#ZfqCLt>QGdig&GL?5!Yzd-~MGbfZd(<~g0@hm-bPsdp0)-(xMLM+4cm zAi%?vt4K-iUArErtl$NLP&?JwA~s!Lv&iq+M#8t=T-dN`6bR?_3dU5EpXJE8KJmdg zQpMjb3u%xi(6S{bWLphY?T@BgZ#`OX8Id0Ov6LAYkTvg>K`{ { tabBarLabelStyle: { fontSize: width / 34, fontFamily: "regular", - transform: [{translateY : -7}] + transform: [{ translateY: -7 }], }, tabBarShowLabel: true, // tabBarLabel : 'reza' }} > ( - - ), + title: "پروفایل", + tabBarIcon: ({ focused, color }) => + focused ? ( + + ) : ( + + ), }} /> ( focused ? - : - + focused ? ( + + ) : ( + - ), + ), }} /> focused ? ( { name="ProductsTab" component={ProductsStackScreen} options={{ - title : 'کتاب‌ها', - tabBarIcon: ({ focused, color }) => ( focused ? - : - + focused ? ( + + ) : ( + - ), + ), }} /> focused ? ( { - const Property = ({ prop }) => { + const Question = ({ question }) => { return ( - - + - - {persian[prop]} - - - + - + {question.answer && ( + <> + - {list[prop]} - - + color: "#196EC0", + fontSize: fontSize.base, + marginTop: 10, + }} + > + پاسخ + + + {question.question} + + + )} + {/* */} + ); }; @@ -73,12 +79,12 @@ const ProductQuestion = ({ list }) => { }, ]} > - مشخصات محصول + پرسش و پاسخ - {Object?.keys(list)?.map((prop, index) => ( - + {list.map((question, index) => ( + ))} @@ -88,23 +94,26 @@ const ProductQuestion = ({ list }) => { export default ProductQuestion; ProductQuestion.defaultProps = { - list: { - display: "IPS LCD 4K Samsung backlight", - weight: "2 کیلوگرم", - proccessor: "Intel core I7 11700H", - graphic: "Nvidia 3090TI 6GB", - audio: "Sonic master", - keyboard: "جزیره ای", - accessories: "کیف + کابل تبدیل برق شهری", - }, -}; - -const persian = { - display: "صفحه نمایش", - weight: "وزن", - proccessor: "پردازنده", - graphic: "پردازنده گرافیکی", - audio: "کارت صدا", - keyboard: "کیبرد", - accessories: "متعلقات جعبه", + list: [ + { + question: + "خالد حسینی تو رمان باد بادک باز مینویسه : ﻣﺮﺩ ﺁﻫﺴﺘﻪ ﺩﺭ ﮔﻮﺵ ﻓﺮﺯﻧﺪ ﺗﺎﺯﻩ ﺑﻪ ﺑﻠﻮﻍ ﺭﺳﯿﺪﻩ ﺍﺵ ﺑﺮﺍﯼ ﭘﻨﺪ ﭼﻨﯿﻦ ﻧﺠﻮﺍ ﮐﺮﺩ؟", + answer: + "خالد حسینی تو رمان باد بادک باز مینویسه : ﻣﺮﺩ ﺁﻫﺴﺘﻪ ﺩﺭ ﮔﻮﺵ ﻓﺮﺯﻧﺪ ﺗﺎﺯﻩ ﺑﻪ ﺑﻠﻮﻍ ﺭﺳﯿﺪﻩ ﺍﺵ ﺑﺮﺍﯼ ﭘﻨﺪ ﭼﻨﯿﻦ ﻧﺠﻮﺍ ﮐﺮﺩ : ” ﭘﺴﺮﻡ ﺩﺭ ﺯﻧﺪﮔﯽ ﻫﺮﮔﺰ ﺩﺯﺩﯼ ﻧﮑﻦ ” ﭘﺴﺮ ﻣﺘﻌﺠﺐ ﻭ ﻣﺒﻬﻮﺕ ﺑﻪ ﭘﺪﺭ ﻧﮕﺎﻩ ﮐﺮﺩ ﺑﺪﯾﻦ ﻣﻌﻨﺎ ﮐﻪ ﺍﻭ ﻫﺮﮔﺰ ﺩﺳﺖ ﮐﺞ ﻧﺪﺍﺷﺘﻪ ﭘﺪﺭ ﺑﻪ ﻧﮕﺎﻩ ﻣﺘﻌﺠﺐ ﻓﺮﺯﻧﺪ ﻟﺒﺨﻨﺪﯼ ﺯﺩ ﻭ ﺍﺩﺍﻣﻪ ", + like: 10, + }, + { + question: + "خالد حسینی تو رمان باد بادک باز مینویسه : ﻣﺮﺩ ﺁﻫﺴﺘﻪ ﺩﺭ ﮔﻮﺵ ﻓﺮﺯﻧﺪ ﺗﺎﺯﻩ ﺑﻪ ﺑﻠﻮﻍ ﺭﺳﯿﺪﻩ ﺍﺵ ﺑﺮﺍﯼ ﭘﻨﺪ ﭼﻨﯿﻦ ﻧﺠﻮﺍ ﮐﺮﺩ؟", + answer: null, + like: 0, + }, + { + question: + "خالد حسینی تو رمان باد بادک باز مینویسه : ﻣﺮﺩ ﺁﻫﺴﺘﻪ ﺩﺭ ﮔﻮﺵ ﻓﺮﺯﻧﺪ ﺗﺎﺯﻩ ﺑﻪ ﺑﻠﻮﻍ ﺭﺳﯿﺪﻩ ﺍﺵ ﺑﺮﺍﯼ ﭘﻨﺪ ﭼﻨﯿﻦ ﻧﺠﻮﺍ ﮐﺮﺩ؟", + answer: + "خالد حسینی تو رمان باد بادک باز مینویسه : ﻣﺮﺩ ﺁﻫﺴﺘﻪ ﺩﺭ ﮔﻮﺵ ﻓﺮﺯﻧﺪ ﺗﺎﺯﻩ ﺑﻪ ﺑﻠﻮﻍ ﺭﺳﯿﺪﻩ ﺍﺵ ﺑﺮﺍﯼ ﭘﻨﺪ ﭼﻨﯿﻦ ﻧﺠﻮﺍ ﮐﺮﺩ : ” ﭘﺴﺮﻡ ﺩﺭ ﺯﻧﺪﮔﯽ ﻫﺮﮔﺰ ﺩﺯﺩﯼ ﻧﮑﻦ ” ﭘﺴﺮ ﻣﺘﻌﺠﺐ ﻭ ﻣﺒﻬﻮﺕ ﺑﻪ ﭘﺪﺭ ﻧﮕﺎﻩ ﮐﺮﺩ ﺑﺪﯾﻦ ﻣﻌﻨﺎ ﮐﻪ ﺍﻭ ﻫﺮﮔﺰ ﺩﺳﺖ ﮐﺞ ﻧﺪﺍﺷﺘﻪ ﭘﺪﺭ ﺑﻪ ﻧﮕﺎﻩ ﻣﺘﻌﺠﺐ ﻓﺮﺯﻧﺪ ﻟﺒﺨﻨﺪﯼ ﺯﺩ ﻭ ﺍﺩﺍﻣﻪ ", + like: 10, + }, + ], }; diff --git a/src/components/BottomSheetComponents/ProductReview.js b/src/components/BottomSheetComponents/ProductReview.js index 9e7d382..48f7d25 100644 --- a/src/components/BottomSheetComponents/ProductReview.js +++ b/src/components/BottomSheetComponents/ProductReview.js @@ -7,46 +7,56 @@ import tw from "tailwind-rn"; const { width } = Dimensions.get("window"); const ProductReviews = ({ list }) => { - const Property = ({ prop }) => { + const Property = ({ question }) => { return ( - + refRBSheet.current.open()} style={[ - tw("rounded-md rounded-md"), - { backgroundColor: "#f8f8f8", width: width / 3.5 }, + tw( + "flex flex-row-reverse justify-between items-center mt-3 rounded-md px-2 py-3 mb-4" + ), + { + backgroundColor: "#ECFDFF", + }, ]} > - {persian[prop]} + {question.title} - - - {list[prop]} - + {question.text} + + + {question.images.map((image, index) => ( + + Pic + + ))} ); @@ -57,7 +67,7 @@ const ProductReviews = ({ list }) => { onPress={() => refRBSheet.current.open()} style={[ tw( - "flex flex-row-reverse justify-between items-center mt-3 rounded-md px-2 py-3 mb-4" + "flex flex-row-reverse justify-between items-center mt-3 rounded-md px-2 py-3 mb-2" ), { backgroundColor: "#50A9FF33", @@ -73,12 +83,12 @@ const ProductReviews = ({ list }) => { }, ]} > - مشخصات محصول + نقد بررسی و توضیحات تکمیلی محصول - {Object?.keys(list)?.map((prop, index) => ( - + {list?.map((question, index) => ( + ))} @@ -88,23 +98,12 @@ const ProductReviews = ({ list }) => { export default ProductReviews; ProductReviews.defaultProps = { - list: { - display: "IPS LCD 4K Samsung backlight", - weight: "2 کیلوگرم", - proccessor: "Intel core I7 11700H", - graphic: "Nvidia 3090TI 6GB", - audio: "Sonic master", - keyboard: "جزیره ای", - accessories: "کیف + کابل تبدیل برق شهری", - }, + list: [ + { + title: "آیا ارزش خرید دارد یا خیر؟", + text: "هر نفسی که فرو می‌ بریم، مرگی را که مدام به ما دست‌ اندازی می‌کند پس می‌زند... در نهایت این مرگ است که باید پیروز شود، زیرا از هنگام تولد بخشی از سرنوشت ما شده و فقط مدت کوتاهی پیش از بلعیدن طعمه اش، با آن بازی می کند. با این همه، ما تا آنجا که ممکن است، با علاقه فراوان و دلواپسی زیاد به زندگی ادامه می دهیم، همان‌ طور که تا آنجا که ممکن است طولانی‌ تر در یک حباب صابون می‌ دمیم تا بزرگتر شود، گر چه با قطعیتی تمام می‌ دانیم که خواهد ترکید و ", + images: [0, 1], + }, + ], }; -const persian = { - display: "صفحه نمایش", - weight: "وزن", - proccessor: "پردازنده", - graphic: "پردازنده گرافیکی", - audio: "کارت صدا", - keyboard: "کیبرد", - accessories: "متعلقات جعبه", -}; diff --git a/src/screens/Splash/index.js b/src/screens/Splash/index.js index ea40497..822a07b 100644 --- a/src/screens/Splash/index.js +++ b/src/screens/Splash/index.js @@ -10,8 +10,7 @@ function Splash({ navigation, isLogin }) { useEffect(() => { if (isLogin !== null) { setTimeout(() => { - // isLogin === false - 0 + isLogin === false ? navigation.navigate("Login") : navigation.navigate("Root"); }, 3000); diff --git a/src/screens/Tests/index.js b/src/screens/Tests/index.js index 3033e04..2b7e245 100644 --- a/src/screens/Tests/index.js +++ b/src/screens/Tests/index.js @@ -1,6 +1,5 @@ import { View, Text, Button } from "react-native"; import React, {useRef} from "react"; -import RBSheet from "react-native-raw-bottom-sheet"; export default function Test() { const refRBSheet = useRef(); @@ -13,22 +12,7 @@ export default function Test() { backgroundColor: "#fff" }} > -