diff --git a/src/components/Post/KnownLikers.tsx b/src/components/Post/KnownLikers.tsx index 0f0ded9ede..87449008ba 100644 --- a/src/components/Post/KnownLikers.tsx +++ b/src/components/Post/KnownLikers.tsx @@ -1,4 +1,5 @@ -import {View} from 'react-native' +import {type ViewStyle} from 'react-native' +import {StyleProp} from 'react-native' import {AtUri} from '@atproto/syntax' import {moderateProfile} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' @@ -22,11 +23,11 @@ import {type app} from '#/lexicons' export function KnownLikers({ post, feature, - variant = 'thread', + outerStyle, }: { post: app.bsky.feed.defs.PostView feature: Features - variant?: 'feed' | 'thread' + outerStyle?: StyleProp }) { const t = useTheme() const {t: l} = useLingui() @@ -61,7 +62,6 @@ export function KnownLikers({ moderation.ui('displayName'), ), })) - const isFeed = variant === 'feed' const rowLabel = names.length >= 2 ? l`Liked by ${names[0].displayName} and ${names[1].displayName}` @@ -83,31 +83,36 @@ export function KnownLikers({ ) return ( - - ax.metric('post:likedBy:click', {})}> - - - {names.length >= 2 ? ( - - Liked by {nameLink(names[0])} and {nameLink(names[1])} - - ) : ( - - Liked by {nameLink(names[0])} - - )} - - - + ax.metric('post:likedBy:click', {})}> + + + {names.length >= 2 ? ( + + Liked by {nameLink(names[0])} and {nameLink(names[1])} + + ) : ( + + Liked by {nameLink(names[0])} + + )} + + ) } diff --git a/src/components/WhoCanReply.tsx b/src/components/WhoCanReply.tsx index 5f5480d9fc..280cbd0cbb 100644 --- a/src/components/WhoCanReply.tsx +++ b/src/components/WhoCanReply.tsx @@ -114,7 +114,7 @@ export function WhoCanReply({post, isThreadAuthor, style}: WhoCanReplyProps) { style={[ a.flex_row, a.align_center, - {gap: 3}, + a.gap_xs, (hovered || focused || pressed) && native({opacity: 0.5}), style, ]}> @@ -122,16 +122,16 @@ export function WhoCanReply({post, isThreadAuthor, style}: WhoCanReplyProps) { color={ isThreadAuthor ? t.palette.primary_500 : t.palette.contrast_400 } - width={12} + width={16} settings={settings} /> {description} diff --git a/src/screens/PostThread/components/LikesStat.tsx b/src/screens/PostThread/components/LikesStat.tsx index 28d1f95735..0b2fa30b53 100644 --- a/src/screens/PostThread/components/LikesStat.tsx +++ b/src/screens/PostThread/components/LikesStat.tsx @@ -32,9 +32,9 @@ export function LikesStat({post}: {post: app.bsky.feed.defs.PostView}) { onPress={() => ax.metric('post:likedBy:click', {})}> + style={[a.text_md, t.atoms.text_contrast_medium]}> - + {formatPostStatCount(likeCount)} {' '} diff --git a/src/screens/PostThread/components/ThreadItemAnchor.tsx b/src/screens/PostThread/components/ThreadItemAnchor.tsx index 350e71d210..23deaf4835 100644 --- a/src/screens/PostThread/components/ThreadItemAnchor.tsx +++ b/src/screens/PostThread/components/ThreadItemAnchor.tsx @@ -453,17 +453,17 @@ const ThreadItemAnchorInner = memo(function ThreadItemAnchorInner({ }, a.border_t, a.mt_md, - a.py_md, + a.py_sm, t.atoms.border_contrast_low, ]}> {post.repostCount != null && post.repostCount !== 0 ? ( + style={[a.text_md, t.atoms.text_contrast_medium]}> + style={[a.text_md, a.font_semi_bold, t.atoms.text]}> {formatPostStatCount(post.repostCount)} {' '} + style={[a.text_md, t.atoms.text_contrast_medium]}> + style={[a.text_md, a.font_semi_bold, t.atoms.text]}> {formatPostStatCount(post.quoteCount)} {' '} + style={[a.text_md, t.atoms.text_contrast_medium]}> - + {formatPostStatCount(post.bookmarkCount)} {' '} - + {niceDate(i18n, post.indexedAt, 'dot separated')} {isRootPost && ( diff --git a/src/view/com/posts/PostFeedItem.tsx b/src/view/com/posts/PostFeedItem.tsx index a5c16d5a94..814148f330 100644 --- a/src/view/com/posts/PostFeedItem.tsx +++ b/src/view/com/posts/PostFeedItem.tsx @@ -460,7 +460,7 @@ let FeedItemInner = ({