Tune post-thread expanded view: add reply prompt, fix spacing and sizing

src/view/com/composer/Prompt.tsx

@@ -1,17 +1,29 @@
 import React from 'react'
 import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
-import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {colors} from '../../lib/styles'
 import {useStores} from '../../../state'
 import {UserAvatar} from '../util/UserAvatar'
 
-export function ComposePrompt({onPressCompose}: {onPressCompose: () => void}) {
+export function ComposePrompt({
+  noAvi = false,
+  text = "What's up?",
+  btn = 'Post',
+  onPressCompose,
+}: {
+  noAvi?: boolean
+  text?: string
+  btn?: string
+  onPressCompose: () => void
+}) {
   const store = useStores()
   const onPressAvatar = () => {
     store.nav.navigate(`/profile/${store.me.handle}`)
   }
   return (
-    <TouchableOpacity style={styles.container} onPress={onPressCompose}>
+    <TouchableOpacity
+      style={[styles.container, noAvi ? styles.noAviContainer : undefined]}
+      onPress={onPressCompose}>
+      {!noAvi ? (
         <TouchableOpacity style={styles.avatar} onPress={onPressAvatar}>
           <UserAvatar
             size={50}
@@ -19,11 +31,12 @@ export function ComposePrompt({onPressCompose}: {onPressCompose: () => void}) {
             displayName={store.me.displayName}
           />
         </TouchableOpacity>
+      ) : undefined}
       <View style={styles.textContainer}>
-        <Text style={styles.text}>What's up?</Text>
+        <Text style={styles.text}>{text}</Text>
       </View>
       <View style={styles.btn}>
-        <Text style={styles.btnText}>Post</Text>
+        <Text style={styles.btnText}>{btn}</Text>
       </View>
     </TouchableOpacity>
   )
@@ -40,6 +53,9 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     backgroundColor: colors.white,
   },
+  noAviContainer: {
+    paddingVertical: 14,
+  },
   avatar: {
     width: 50,
   },

src/view/com/post-thread/PostThreadItem.tsx

@@ -16,6 +16,7 @@ import {useStores} from '../../../state'
 import {PostMeta} from '../util/PostMeta'
 import {PostEmbeds} from '../util/PostEmbeds'
 import {PostCtrls} from '../util/PostCtrls'
+import {ComposePrompt} from '../composer/Prompt'
 
 const PARENT_REPLY_LINE_LENGTH = 8
 const REPLYING_TO_LINE_LENGTH = 6
@@ -93,6 +94,7 @@ export const PostThreadItem = observer(function PostThreadItem({
 
   if (item._isHighlightedPost) {
     return (
+      <>
         <View style={styles.outer}>
           <View style={styles.layout}>
             <View style={styles.layoutAvi}>
@@ -152,7 +154,7 @@ export const PostThreadItem = observer(function PostThreadItem({
                 style={[styles.postText, styles.postTextLarge]}
               />
             </View>
-          <PostEmbeds entities={record.entities} />
+            <PostEmbeds entities={record.entities} style={s.mb10} />
             {item._isHighlightedPost && hasEngagement ? (
               <View style={styles.expandedInfo}>
                 {item.repostCount ? (
@@ -160,8 +162,8 @@ export const PostThreadItem = observer(function PostThreadItem({
                     style={styles.expandedInfoItem}
                     href={repostsHref}
                     title={repostsTitle}>
-                  <Text style={[s.gray5, s.semiBold, s.f18]}>
+                    <Text style={[s.gray5, s.semiBold, s.f17]}>
-                    <Text style={[s.bold, s.black, s.f18]}>
+                      <Text style={[s.bold, s.black, s.f17]}>
                         {item.repostCount}
                       </Text>{' '}
                       {pluralize(item.repostCount, 'repost')}
@@ -175,8 +177,8 @@ export const PostThreadItem = observer(function PostThreadItem({
                     style={styles.expandedInfoItem}
                     href={upvotesHref}
                     title={upvotesTitle}>
-                  <Text style={[s.gray5, s.semiBold, s.f18]}>
+                    <Text style={[s.gray5, s.semiBold, s.f17]}>
-                    <Text style={[s.bold, s.black, s.f18]}>
+                      <Text style={[s.bold, s.black, s.f17]}>
                         {item.upvoteCount}
                       </Text>{' '}
                       {pluralize(item.upvoteCount, 'upvote')}
@@ -189,11 +191,9 @@ export const PostThreadItem = observer(function PostThreadItem({
             ) : (
               <></>
             )}
-          <View style={[s.pl10]}>
+            <View style={[s.pl10, s.pb5]}>
               <PostCtrls
-              replyCount={item.replyCount}
+                big
-              repostCount={item.repostCount}
-              upvoteCount={item.upvoteCount}
                 isReposted={!!item.myState.repost}
                 isUpvoted={!!item.myState.upvote}
                 onPressReply={onPressReply}
@@ -203,6 +203,13 @@ export const PostThreadItem = observer(function PostThreadItem({
             </View>
           </View>
         </View>
+        <ComposePrompt
+          noAvi
+          text="Write your reply"
+          btn="Reply"
+          onPressCompose={onPressReply}
+        />
+      </>
     )
   } else {
     return (
@@ -371,7 +378,7 @@ const styles = StyleSheet.create({
     borderTopWidth: 1,
     borderBottomWidth: 1,
     marginTop: 5,
-    marginBottom: 10,
+    marginBottom: 15,
   },
   expandedInfoItem: {
     marginRight: 10,

src/view/com/util/PostCtrls.tsx

@@ -12,9 +12,10 @@ import {UpIcon, UpIconSolid} from '../../lib/icons'
 import {s, colors} from '../../lib/styles'
 
 interface PostCtrlsOpts {
-  replyCount: number
+  big?: boolean
-  repostCount: number
+  replyCount?: number
-  upvoteCount: number
+  repostCount?: number
+  upvoteCount?: number
   isReposted: boolean
   isUpvoted: boolean
   onPressReply: () => void
@@ -62,9 +63,11 @@ export function PostCtrls(opts: PostCtrlsOpts) {
           <FontAwesomeIcon
             style={styles.ctrlIcon}
             icon={['far', 'comment']}
-            size={14}
+            size={opts.big ? 20 : 14}
           />
+          {typeof opts.replyCount !== 'undefined' ? (
             <Text style={[sRedgray, s.ml5, s.f16]}>{opts.replyCount}</Text>
+          ) : undefined}
         </TouchableOpacity>
       </View>
       <View style={s.flex1}>
@@ -77,9 +80,10 @@ export function PostCtrls(opts: PostCtrlsOpts) {
                 opts.isReposted ? styles.ctrlIconReposted : styles.ctrlIcon
               }
               icon="retweet"
-              size={18}
+              size={opts.big ? 22 : 18}
             />
           </Animated.View>
+          {typeof opts.repostCount !== 'undefined' ? (
             <Text
               style={
                 opts.isReposted
@@ -88,6 +92,7 @@ export function PostCtrls(opts: PostCtrlsOpts) {
               }>
               {opts.repostCount}
             </Text>
+          ) : undefined}
         </TouchableOpacity>
       </View>
       <View style={s.flex1}>
@@ -96,11 +101,19 @@ export function PostCtrls(opts: PostCtrlsOpts) {
           onPress={onPressToggleUpvoteWrapper}>
           <Animated.View style={anim2Style}>
             {opts.isUpvoted ? (
-              <UpIconSolid style={[styles.ctrlIconUpvoted]} size={18} />
+              <UpIconSolid
+                style={[styles.ctrlIconUpvoted]}
+                size={opts.big ? 22 : 18}
+              />
             ) : (
-              <UpIcon style={[styles.ctrlIcon]} size={18} strokeWidth={1.5} />
+              <UpIcon
+                style={[styles.ctrlIcon]}
+                size={opts.big ? 22 : 18}
+                strokeWidth={1.5}
+              />
             )}
           </Animated.View>
+          {typeof opts.upvoteCount !== 'undefined' ? (
             <Text
               style={
                 opts.isUpvoted
@@ -109,6 +122,7 @@ export function PostCtrls(opts: PostCtrlsOpts) {
               }>
               {opts.upvoteCount}
             </Text>
+          ) : undefined}
         </TouchableOpacity>
       </View>
       <View style={s.flex1}></View>