From 59608e9acc657255d9739ba0ee1c590ab09e2715 Mon Sep 17 00:00:00 2001
From: David Kaspar <david.kaspar@gmail.com>
Date: Thu, 21 Sep 2023 08:27:16 +0200
Subject: [PATCH] Combine new line limit with previous character checking (use
 the smallest)

---
 .../amethyst/ui/components/ExpandableRichTextViewer.kt   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt
index 3d24290b2..97eb86073 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt
@@ -53,17 +53,18 @@ fun ExpandableRichTextViewer(
         // or after SHORTEN_AFTER_LINES lines
         val numberOfLines = content.count { it == '\n' }
 
+        var charactersInLines = minOf(firstSpaceAfterCut, firstNewLineAfterCut)
+
         if (numberOfLines > SHORTEN_AFTER_LINES) {
             val shortContent = content.lines().take(SHORTEN_AFTER_LINES)
-            var charactersInLines = 0
+            charactersInLines = 0
             for (line in shortContent) {
                 // +1 because new line character is omitted from .lines
                 charactersInLines += (line.length + 1)
             }
-            charactersInLines
-        } else {
-            minOf(firstSpaceAfterCut, firstNewLineAfterCut)
         }
+
+        minOf(firstSpaceAfterCut, firstNewLineAfterCut, charactersInLines)
     }
 
     val text by remember(content) {