From a2721d21c00fb3a4dcd501679f7b8f772000cf56 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Wed, 10 Aug 2022 00:46:43 +0200
Subject: [PATCH] Fixed #359

---
 src/components/Parse/HTML.tsx             | 63 +++++++++++++++--------
 src/components/Timeline/Default.tsx       |  1 +
 src/components/Timeline/Notifications.tsx |  1 +
 src/i18n/en/components/parse.json         |  8 +--
 src/i18n/en/components/timeline.json      |  2 +-
 5 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/components/Parse/HTML.tsx b/src/components/Parse/HTML.tsx
index 51aab5c7..5a112634 100644
--- a/src/components/Parse/HTML.tsx
+++ b/src/components/Parse/HTML.tsx
@@ -249,37 +249,23 @@ const ParseHTML = React.memo(
       ({ children }: any) => {
         const { t } = useTranslation('componentParse')
 
-        const [expandAllow, setExpandAllow] = useState(false)
+        const [totalLines, setTotalLines] = useState<number>()
         const [expanded, setExpanded] = useState(highlighted)
 
         return (
           <View style={{ overflow: 'hidden' }}>
-            <CustomText
-              children={children}
-              onTextLayout={({ nativeEvent }) => {
-                if (
-                  numberOfLines === 1 ||
-                  nativeEvent.lines.length >= numberOfLines + 5
-                ) {
-                  setExpandAllow(true)
-                }
-              }}
-              numberOfLines={
-                expandAllow ? (expanded ? 999 : numberOfLines) : undefined
-              }
-              selectable={selectable}
-            />
-            {expandAllow ? (
+            {typeof totalLines === 'number' ? (
               <Pressable
-                accessibilityLabel=''
+                accessibilityLabel={t('HTML.accessibilityHint')}
                 onPress={() => {
-                  analytics('status_readmore', { allow: expandAllow, expanded })
+                  analytics('status_readmore', { totalLines, expanded })
                   layoutAnimation()
                   setExpanded(!expanded)
                 }}
                 style={{
+                  flexDirection: 'row',
                   justifyContent: 'center',
-                  marginTop: expanded ? 0 : -adaptedLineheight,
+                  alignItems: 'center',
                   minHeight: 44,
                   backgroundColor: colors.backgroundDefault
                 }}
@@ -288,14 +274,47 @@ const ParseHTML = React.memo(
                   style={{
                     textAlign: 'center',
                     ...StyleConstants.FontStyle.S,
-                    color: colors.primaryDefault
+                    color: colors.primaryDefault,
+                    marginRight: StyleConstants.Spacing.S
                   }}
                   children={t(`HTML.expanded.${expanded.toString()}`, {
-                    hint: expandHint
+                    hint: expandHint,
+                    totalLines:
+                      numberOfLines > 1 && typeof totalLines === 'number'
+                        ? t('HTML.totalLines', { count: totalLines })
+                        : ''
                   })}
                 />
+                <Icon
+                  name={expanded ? 'Minimize2' : 'Maximize2'}
+                  color={colors.primaryDefault}
+                  strokeWidth={2}
+                  size={StyleConstants.Font.Size[size]}
+                />
               </Pressable>
             ) : null}
+            <CustomText
+              children={children}
+              onTextLayout={({ nativeEvent }) => {
+                if (
+                  numberOfLines === 1 ||
+                  nativeEvent.lines.length >= numberOfLines + 5
+                ) {
+                  setTotalLines(nativeEvent.lines.length)
+                }
+              }}
+              style={{
+                height: numberOfLines === 1 && !expanded ? 0 : undefined
+              }}
+              numberOfLines={
+                typeof totalLines === 'number'
+                  ? expanded
+                    ? 999
+                    : numberOfLines
+                  : undefined
+              }
+              selectable={selectable}
+            />
           </View>
         )
       },
diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx
index c2cd3427..ed3a344f 100644
--- a/src/components/Timeline/Default.tsx
+++ b/src/components/Timeline/Default.tsx
@@ -5,6 +5,7 @@ import TimelineAttachment from '@components/Timeline/Shared/Attachment'
 import TimelineAvatar from '@components/Timeline/Shared/Avatar'
 import TimelineCard from '@components/Timeline/Shared/Card'
 import TimelineContent from '@components/Timeline/Shared/Content'
+// @ts-ignore
 import TimelineHeaderDefault from '@components/Timeline/Shared/HeaderDefault'
 import TimelinePoll from '@components/Timeline/Shared/Poll'
 import { useNavigation } from '@react-navigation/native'
diff --git a/src/components/Timeline/Notifications.tsx b/src/components/Timeline/Notifications.tsx
index dfa1ab96..4559eee7 100644
--- a/src/components/Timeline/Notifications.tsx
+++ b/src/components/Timeline/Notifications.tsx
@@ -5,6 +5,7 @@ import TimelineAttachment from '@components/Timeline/Shared/Attachment'
 import TimelineAvatar from '@components/Timeline/Shared/Avatar'
 import TimelineCard from '@components/Timeline/Shared/Card'
 import TimelineContent from '@components/Timeline/Shared/Content'
+// @ts-ignore
 import TimelineHeaderNotification from '@components/Timeline/Shared/HeaderNotification'
 import TimelinePoll from '@components/Timeline/Shared/Poll'
 import { useNavigation } from '@react-navigation/native'
diff --git a/src/i18n/en/components/parse.json b/src/i18n/en/components/parse.json
index 9932ccc2..7d27c1d0 100644
--- a/src/i18n/en/components/parse.json
+++ b/src/i18n/en/components/parse.json
@@ -1,9 +1,11 @@
 {
   "HTML": {
+    "accessibilityHint": "Tap to expand or collapse content",
     "expanded": {
-      "true": "Fold {{hint}}",
-      "false": "Expand {{hint}}"
+      "true": "{{hint}}{{totalLines}}",
+      "false": "{{hint}}{{totalLines}}"
     },
-    "defaultHint": "article"
+    "totalLines": " ({{count}} lines)",
+    "defaultHint": "Long toot"
   }
 }
\ No newline at end of file
diff --git a/src/i18n/en/components/timeline.json b/src/i18n/en/components/timeline.json
index f622a093..066eade6 100644
--- a/src/i18n/en/components/timeline.json
+++ b/src/i18n/en/components/timeline.json
@@ -81,7 +81,7 @@
       "accessibilityHint": "Tap to go to {{name}}'s page"
     },
     "content": {
-      "expandHint": "hidden content"
+      "expandHint": "Hidden content"
     },
     "filtered": "Filtered",
     "fullConversation": "Read conversations",