zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Use consistent rendering of avis and post metas in threads

zio/stable
Paul Frazee 2022-12-20 10:33:56 -06:00
parent 99a28c0aae
commit 74d76fbc6a
1 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/view/com/posts/FeedItem.tsx
View File

@ -114,22 +114,8 @@ export const FeedItem = observer(function FeedItem({
/>
) : undefined}
<Link style={outerStyles} href={itemHref} title={itemTitle} noFeedback>
{isChild && (
<View
style={[
styles.topReplyLine,
item._isThreadChild ? styles.topReplyLineSmallAvi : undefined,
]}
/>
)}
{item._isThreadParent && (
<View
style={[
styles.bottomReplyLine,
item._isThreadChild ? styles.bottomReplyLineSmallAvi : undefined,
]}
/>
)}
{isChild && <View style={[styles.topReplyLine]} />}
{item._isThreadParent && <View style={[styles.bottomReplyLine]} />}
{item.repostedBy && (
<Link
style={styles.includeReason}
@ -159,12 +145,9 @@ export const FeedItem = observer(function FeedItem({
)}
<View style={styles.layout}>
<View style={styles.layoutAvi}>
<Link
href={authorHref}
title={item.author.handle}
style={item._isThreadChild ? {marginLeft: 10} : undefined}>
<Link href={authorHref} title={item.author.handle}>
<UserAvatar
size={item._isThreadChild ? 30 : 52}
size={52}
displayName={item.author.displayName}
handle={item.author.handle}
avatar={item.author.avatar}
@ -172,19 +155,17 @@ export const FeedItem = observer(function FeedItem({
</Link>
</View>
<View style={styles.layoutContent}>
{!item._isThreadChild ? (
<PostMeta
itemHref={itemHref}
itemTitle={itemTitle}
authorHref={authorHref}
authorHandle={item.author.handle}
authorDisplayName={item.author.displayName}
timestamp={item.indexedAt}
isAuthor={item.author.did === store.me.did}
onCopyPostText={onCopyPostText}
onDeletePost={onDeletePost}
/>
) : undefined}
<PostMeta
itemHref={itemHref}
itemTitle={itemTitle}
authorHref={authorHref}
authorHandle={item.author.handle}
authorDisplayName={item.author.displayName}
timestamp={item.indexedAt}
isAuthor={item.author.did === store.me.did}
onCopyPostText={onCopyPostText}
onDeletePost={onDeletePost}
/>
{!isChild && replyHref !== '' && (
<View style={[s.flexRow, s.mb2, {alignItems: 'center'}]}>
<FontAwesomeIcon
@ -289,9 +270,6 @@ const styles = StyleSheet.create({
borderLeftWidth: 2,
borderLeftColor: colors.gray2,
},
topReplyLineSmallAvi: {
height: TOP_REPLY_LINE_LENGTH + 10,
},
bottomReplyLine: {
position: 'absolute',
left: 34,
@ -300,9 +278,6 @@ const styles = StyleSheet.create({
borderLeftWidth: 2,
borderLeftColor: colors.gray2,
},
bottomReplyLineSmallAvi: {
top: 50,
},
includeReason: {
flexDirection: 'row',
paddingLeft: 60,