From 641564900076cd184135d7406ed153a4c4713e07 Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Mon, 2 May 2022 12:34:01 +0430 Subject: [PATCH] reza added some change --- bottomNavigation.json | 24 ++++++++++++++++++++++ filters.json | 10 +++++++++ navigation/index.js | 2 +- src/screens/Product/components/Comments.js | 7 ++++--- 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 bottomNavigation.json create mode 100644 filters.json diff --git a/bottomNavigation.json b/bottomNavigation.json new file mode 100644 index 0000000..2ea77e8 --- /dev/null +++ b/bottomNavigation.json @@ -0,0 +1,24 @@ +{ + "bottomNavigationList": { + "home": { + "label": "خانه", + "isActive": true + }, + "products": { + "label": "کتاب‌ها", + "isActive": true + }, + "vod": { + "label": "ویدئوها", + "isActive": true + }, + "cart": { + "label": "سبد خرید", + "isActive": true + }, + "profile": { + "label": "پروفایل", + "isActive": true + } + } +} diff --git a/filters.json b/filters.json new file mode 100644 index 0000000..8ce4df9 --- /dev/null +++ b/filters.json @@ -0,0 +1,10 @@ +{ + "sort": ["مرتب سازی", "مرتب سازی", "محبوب ترین", "جدیدترین"], + "productTypes" : [ + "نوع محصول", + "کتاب فیزیکی", + "کتاب دیجیتال", + "دوره ویدئویی", + "بسته های آموزشی" + ] +} diff --git a/navigation/index.js b/navigation/index.js index ad58ddc..083a22b 100644 --- a/navigation/index.js +++ b/navigation/index.js @@ -313,7 +313,7 @@ const BottomTabNavigator = ({ theme, userProducts }) => { backgroundColor: theme === "light" ? Colors.theme1.greenCF : Colors.theme1.greenCF, fontSize: fontSize.sm, - paddingTop: fontSize.sm / 4, + paddingTop: 2, color: theme === "light" ? Colors.theme1.white : Colors.theme1.dark, borderWidth: 1, borderColor: diff --git a/src/screens/Product/components/Comments.js b/src/screens/Product/components/Comments.js index 94039d3..096e42e 100644 --- a/src/screens/Product/components/Comments.js +++ b/src/screens/Product/components/Comments.js @@ -163,7 +163,7 @@ const AddComment = ({ addComment, productId, theme, ...props }) => { value={comment.title} placeholder="عنوان نظر ..." onChangeText={(text) => setCommentForm({...commentForm, title : text})} - placeholderTextColor={theme === 'light' ? "auto" : Colors.theme1.white + 'aa'} + placeholderTextColor={theme === 'light' ? Colors.theme1.gray2077 : Colors.theme1.white + 'aa'} /> { textAlign: "right", fontFamily: "light", borderWidth: 1, + borderColor: theme === 'light' ? Colors.theme1.grayE3 : Colors.theme1.white + '55', }, @@ -184,7 +185,7 @@ const AddComment = ({ addComment, productId, theme, ...props }) => { textAlignVertical="top" placeholder="متن نظر ..." onChangeText={(text) => setCommentForm({...commentForm, text})} - placeholderTextColor={theme === 'light' ? "auto" : Colors.theme1.white + 'aa'} + placeholderTextColor={theme === 'light' ? Colors.theme1.gray2077 : Colors.theme1.white + 'aa'} /> { const mapStateToProps = (state) => ({ orderFullList: state.userFactor.fullList, - theme1: state.publicApi.theme1, + theme: state.publicApi.theme, }); const mapDispatchToProps = {