From c1a56240517d7e5d2d187bc8c3af57b5e7aff400 Mon Sep 17 00:00:00 2001 From: u-e Date: Thu, 6 Dec 2018 18:21:52 +0300 Subject: [PATCH 1/5] bugfix #178 --- src/components/basicUIElements/view/tag/tagStyles.js | 5 ++++- src/components/basicUIElements/view/tag/tagView.js | 8 ++++++-- .../headerDescription/view/postHeaderDescription.js | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/components/basicUIElements/view/tag/tagStyles.js b/src/components/basicUIElements/view/tag/tagStyles.js index 61b8dcadd..f5859850b 100644 --- a/src/components/basicUIElements/view/tag/tagStyles.js +++ b/src/components/basicUIElements/view/tag/tagStyles.js @@ -8,11 +8,14 @@ export default EStyleSheet.create({ isPin: { backgroundColor: '$primaryBlue', }, + isPostCardTag: { + backgroundColor: '$iconColor', + }, textWrapper: { paddingHorizontal: 10, justifyContent: 'center', marginRight: 8, - height: 15, + height: 20, backgroundColor: '$iconColor', borderRadius: 50, }, diff --git a/src/components/basicUIElements/view/tag/tagView.js b/src/components/basicUIElements/view/tag/tagView.js index 2aff6106e..53fe998a9 100644 --- a/src/components/basicUIElements/view/tag/tagView.js +++ b/src/components/basicUIElements/view/tag/tagView.js @@ -2,10 +2,14 @@ import React, { Fragment } from 'react'; import { Text, View, TouchableOpacity } from 'react-native'; import styles from './tagStyles'; -const Tag = ({ onPress, isPin, value }) => ( +const Tag = ({ + onPress, isPin, value, isPostCardTag, +}) => ( onPress && onPress(value)}> - + {value} diff --git a/src/components/postElements/headerDescription/view/postHeaderDescription.js b/src/components/postElements/headerDescription/view/postHeaderDescription.js index ae0754cf1..ffe264b40 100644 --- a/src/components/postElements/headerDescription/view/postHeaderDescription.js +++ b/src/components/postElements/headerDescription/view/postHeaderDescription.js @@ -77,7 +77,7 @@ class PostHeaderDescription extends Component { {tag && ( tagOnPress && tagOnPress()}> - + )} {date} From 1e440f87f0a09cf2eeda3029087a0ab3b08fdcee Mon Sep 17 00:00:00 2001 From: u-e Date: Thu, 6 Dec 2018 18:26:02 +0300 Subject: [PATCH 2/5] bugfix #179 --- .../basicUIElements/view/userListItem/userListItem.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index e374418f5..d0f7c493d 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -22,7 +22,12 @@ const UserListItem = ({ {username} - {reputation && {reputation}} + {reputation && ( + + {' '} + {reputation} + + )} {description && {description}} From 5e9516780f25a99d9ae2b9e2b902a68083f0cb58 Mon Sep 17 00:00:00 2001 From: u-e Date: Fri, 7 Dec 2018 00:24:06 +0300 Subject: [PATCH 3/5] quick fix --- src/screens/profile/screen/profileScreen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/profile/screen/profileScreen.js b/src/screens/profile/screen/profileScreen.js index b5d77691d..45c112a65 100644 --- a/src/screens/profile/screen/profileScreen.js +++ b/src/screens/profile/screen/profileScreen.js @@ -69,7 +69,7 @@ class ProfileScreen extends Component { } return ( -
+
{!isReady ? ( From 4638eb482278bd1c82a6bbc7d74696b3d61afad5 Mon Sep 17 00:00:00 2001 From: u-e Date: Fri, 7 Dec 2018 00:26:18 +0300 Subject: [PATCH 4/5] removed reputation from voters screen --- .../basicUIElements/view/userListItem/userListItem.js | 11 +---------- .../votersDisplay/view/votersDisplayView.js | 8 +++----- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index d0f7c493d..8e5270a1f 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -5,7 +5,6 @@ import styles from './userListItemStyles'; const UserListItem = ({ avatar, - reputation, rightText, description, username, @@ -20,15 +19,7 @@ const UserListItem = ({ - - {username} - {reputation && ( - - {' '} - {reputation} - - )} - + {username} {description && {description}} {isHasRightItem && ( diff --git a/src/components/votersDisplay/view/votersDisplayView.js b/src/components/votersDisplay/view/votersDisplayView.js index 187db8236..f63d39d57 100644 --- a/src/components/votersDisplay/view/votersDisplayView.js +++ b/src/components/votersDisplay/view/votersDisplayView.js @@ -11,14 +11,13 @@ import styles from './votersDisplayStyles'; class VotersDisplayView extends PureComponent { /* Props - * ------------------------------------------------ - * @prop { type } name - Description.... - */ + * ------------------------------------------------ + * @prop { type } name - Description.... + */ // Component Functions _renderItem = (item, index) => { const { handleOnUserPress } = this.props; - const reputation = `(${item.reputation})`; const value = `$ ${item.value}`; const percent = `${item.percent}%`; @@ -28,7 +27,6 @@ class VotersDisplayView extends PureComponent { avatar={item.avatar} index={index} username={item.voter} - reputation={reputation} description={item.created} isHasRightItem isRightColor={item.is_down_vote} From 896bdf273cd943be935c1d49e09136dd29e5d6f8 Mon Sep 17 00:00:00 2001 From: u-e Date: Fri, 7 Dec 2018 00:31:35 +0300 Subject: [PATCH 5/5] fixed status bar blue color --- src/components/searchModal/view/searchModalView.js | 1 + src/components/walletDetails/view/walletDetailsView.js | 2 +- src/screens/application/screen/applicationScreen.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/searchModal/view/searchModalView.js b/src/components/searchModal/view/searchModalView.js index 989cb51c5..561793144 100644 --- a/src/components/searchModal/view/searchModalView.js +++ b/src/components/searchModal/view/searchModalView.js @@ -52,6 +52,7 @@ class SearchModalView extends Component { placeholder={placeholder} placeholderTextColor="#c1c5c7" autoCapitalize="none" + autoFocus /> {walletData.showPowerDown && ( diff --git a/src/screens/application/screen/applicationScreen.js b/src/screens/application/screen/applicationScreen.js index 02eddf95b..8646b4db1 100644 --- a/src/screens/application/screen/applicationScreen.js +++ b/src/screens/application/screen/applicationScreen.js @@ -27,7 +27,7 @@ class ApplicationScreen extends Component { return ( - +