diff options
-rw-r--r-- | src/components/comments/CommentTile.tsx | 63 | ||||
-rw-r--r-- | src/components/comments/CommentsContainer.tsx | 1 | ||||
-rw-r--r-- | src/screens/profile/MomentCommentsScreen.tsx | 2 |
3 files changed, 30 insertions, 36 deletions
diff --git a/src/components/comments/CommentTile.tsx b/src/components/comments/CommentTile.tsx index f793cdbe..cc847885 100644 --- a/src/components/comments/CommentTile.tsx +++ b/src/components/comments/CommentTile.tsx @@ -19,12 +19,7 @@ import { ScreenType, UserType, } from '../../types'; -import { - getTimePosted, - navigateToProfile, - normalize, - SCREEN_WIDTH, -} from '../../utils'; +import {getTimePosted, navigateToProfile, normalize} from '../../utils'; import {mentionPartTypes, renderTextWithMentions} from '../../utils/comments'; import {LikeButton} from '../common'; import {ProfilePreview} from '../profile'; @@ -101,7 +96,7 @@ const CommentTile: React.FC<CommentTileProps> = ({ showReplies ? 'Hide' : comment.replies_count > 0 - ? `Replies (${comment.replies_count})` + ? `Replies (${comment.replies_count}) ` : 'Replies'; const renderRightAction = (text: string, color: string) => { @@ -166,32 +161,31 @@ const CommentTile: React.FC<CommentTileProps> = ({ <Text style={styles.date_time}>{' ' + timePosted}</Text> </View> <View style={styles.row}> - <Text style={[styles.date_time, styles.likeCount]}>5</Text> - <Text style={styles.date_time}>Likes</Text> - </View> - {/* Show replies text only if there are some replies present */} - {!isThread && (commentObject as CommentType).replies_count > 0 ? ( - <TouchableOpacity - style={styles.repliesTextAndIconContainer} - onPress={toggleReplies}> - <Text style={styles.repliesText}> - {getRepliesText(commentObject as CommentType)} - </Text> - <Arrow - width={12} - height={11} - color={TAGG_LIGHT_BLUE} - style={ - !showReplies - ? styles.repliesDownArrow - : styles.repliesUpArrow - } - /> + <TouchableOpacity style={styles.row} onPress={() => {}}> + <Text style={[styles.date_time, styles.likeCount]}>999</Text> + <Text style={styles.date_time}>Likes</Text> </TouchableOpacity> - ) : ( - // empty view for justify content's space-between - <View /> - )} + {/* Show replies text only if there are some replies present */} + {!isThread && (commentObject as CommentType).replies_count > 0 && ( + <TouchableOpacity + style={styles.repliesTextAndIconContainer} + onPress={toggleReplies}> + <Text style={styles.repliesText}> + {getRepliesText(commentObject as CommentType)} + </Text> + <Arrow + width={12} + height={11} + color={TAGG_LIGHT_BLUE} + style={ + !showReplies + ? styles.repliesDownArrow + : styles.repliesUpArrow + } + /> + </TouchableOpacity> + )} + </View> </View> </TouchableOpacity> </View> @@ -219,8 +213,8 @@ const styles = StyleSheet.create({ flexDirection: 'column', flex: 1, paddingTop: '3%', - marginLeft: '7%', - paddingBottom: 5, + marginLeft: '5%', + paddingBottom: '2%', }, swipeActions: { flexDirection: 'row', @@ -268,6 +262,7 @@ const styles = StyleSheet.create({ repliesTextAndIconContainer: { flexDirection: 'row', alignItems: 'center', + paddingLeft: 10, }, repliesText: { color: TAGG_LIGHT_BLUE, diff --git a/src/components/comments/CommentsContainer.tsx b/src/components/comments/CommentsContainer.tsx index cd9ecb02..bd8d5c49 100644 --- a/src/components/comments/CommentsContainer.tsx +++ b/src/components/comments/CommentsContainer.tsx @@ -125,7 +125,6 @@ const CommentsContainer: React.FC<CommentsContainerProps> = ({ }; const styles = StyleSheet.create({ - scrollView: {}, scrollViewContent: { justifyContent: 'center', }, diff --git a/src/screens/profile/MomentCommentsScreen.tsx b/src/screens/profile/MomentCommentsScreen.tsx index 1a913e58..ffe21f4c 100644 --- a/src/screens/profile/MomentCommentsScreen.tsx +++ b/src/screens/profile/MomentCommentsScreen.tsx @@ -105,7 +105,7 @@ const styles = StyleSheet.create({ }, body: { marginTop: HeaderHeight, - width: SCREEN_WIDTH * 0.9, + width: SCREEN_WIDTH * 0.95, height: SCREEN_HEIGHT * 0.8, paddingTop: '3%', }, |