diff --git a/src/components/basicUIElements/view/textWithIcon/textWithIconView.js b/src/components/basicUIElements/view/textWithIcon/textWithIconView.js index 9fb846dd4..c6fe97bc9 100644 --- a/src/components/basicUIElements/view/textWithIcon/textWithIconView.js +++ b/src/components/basicUIElements/view/textWithIcon/textWithIconView.js @@ -4,12 +4,20 @@ import { Icon } from '../../../icon'; import styles from './textWithIconStyles'; const TextWithIcon = ({ - iconName, text, isClickable, onPress, iconStyle, iconType, iconSize, + iconName, + text, + isClickable, + onPress, + iconStyle, + iconType, + iconSize, + wrapperStyle, + textStyle, }) => ( {isClickable || onPress ? ( onPress && onPress()} > @@ -19,7 +27,7 @@ const TextWithIcon = ({ name={iconName} iconType={iconType} /> - {text} + {text} ) : ( diff --git a/src/components/comment/view/commentStyles.js b/src/components/comment/view/commentStyles.js index 018086f40..cde0f67a9 100644 --- a/src/components/comment/view/commentStyles.js +++ b/src/components/comment/view/commentStyles.js @@ -8,23 +8,32 @@ export default EStyleSheet.create({ marginLeft: 10, }, rightButton: { - flexGrow: 1, - alignSelf: 'flex-end', - position: 'absolute', - right: 10, backgroundColor: '$iconColor', - height: 15, - width: 25, + height: 18, + flexDirection: 'row-reverse', + borderRadius: 20, }, - moreIcon: { + moreText: { color: '$white', - marginTop: -1, + fontSize: 10, + marginLeft: 12, + marginRight: 2, }, bodyWrapper: { marginTop: -10, }, + iconStyle: { + color: '$white', + marginRight: 12, + marginTop: 1, + }, footerWrapper: { flex: 1, flexDirection: 'row', }, + rightButtonWrapper: { + alignSelf: 'flex-end', + position: 'absolute', + right: 0, + }, }); diff --git a/src/components/comment/view/commentView.js b/src/components/comment/view/commentView.js index d4f6f9175..06a8ba178 100644 --- a/src/components/comment/view/commentView.js +++ b/src/components/comment/view/commentView.js @@ -9,6 +9,7 @@ import { PostBody, PostHeaderDescription } from '../../postElements'; import { Upvote } from '../../upvote'; import { IconButton } from '../../iconButton'; import { Comments } from '../../comments'; +import { TextWithIcon } from '../../basicUIElements'; // Styles import styles from './commentStyles'; @@ -88,14 +89,19 @@ class CommentView extends PureComponent { )} {isShowMoreButton && ( - this._showSubCommentsToggle()} - iconType="MaterialIcons" - /> + + this._showSubCommentsToggle()} + text={`${comment.children} more replies`} + /> + )} {isShowSubComments && commentNumber > 0 && (