From 2c5acc64f8c19775d105ce8af424a6e679f6e517 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 6 Mar 2023 03:16:01 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=97=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=88?=
 =?UTF-8?q?=E3=83=AB=E3=81=AA=E3=81=A9=E3=81=AE=E6=96=87=E5=AD=97=E6=95=B0?=
 =?UTF-8?q?=E3=82=92=E5=88=B6=E9=99=90=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ItemViewHolderPreviewCard.kt              | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderPreviewCard.kt b/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderPreviewCard.kt
index 75d14da6..cb17bb30 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderPreviewCard.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderPreviewCard.kt
@@ -6,11 +6,12 @@ import jp.juggler.subwaytooter.api.entity.TootStatus
 import jp.juggler.subwaytooter.column.isConversation
 import jp.juggler.subwaytooter.pref.PrefB
 import jp.juggler.subwaytooter.pref.PrefS
-import jp.juggler.subwaytooter.util.emojiSizeMode
 import jp.juggler.subwaytooter.table.daoMediaShown
 import jp.juggler.subwaytooter.util.DecodeOptions
 import jp.juggler.subwaytooter.util.HTMLDecoder
+import jp.juggler.subwaytooter.util.emojiSizeMode
 import jp.juggler.util.data.ellipsize
+import jp.juggler.util.data.ellipsizeDot3
 import jp.juggler.util.ui.textOrGone
 import jp.juggler.util.ui.vg
 
@@ -63,6 +64,8 @@ fun ItemViewHolder.showPreviewCard(status: TootStatus) {
 
     var bShowOuter = false
 
+    val limit = PrefS.spCardDescriptionLength.toInt().takeIf { it > 0 } ?: 64
+
     val sb = StringBuilder()
     fun showString() {
         if (sb.isNotEmpty()) {
@@ -70,7 +73,7 @@ fun ItemViewHolder.showPreviewCard(status: TootStatus) {
                 activity, accessInfo,
                 forceHtml = true,
                 authorDomain = status.account,
-                emojiSizeMode =  accessInfo.emojiSizeMode(),
+                emojiSizeMode = accessInfo.emojiSizeMode(),
             ).decodeHTML(sb.toString())
 
             if (text.isNotEmpty()) {
@@ -93,37 +96,27 @@ fun ItemViewHolder.showPreviewCard(status: TootStatus) {
             sb,
             activity.getString(R.string.card_header_card),
             card.url,
-            card.title
+            card.title?.ellipsizeDot3(limit)
         )
 
         addLinkAndCaption(
             sb,
             activity.getString(R.string.card_header_author),
             card.author_url,
-            card.author_name
+            card.author_name?.ellipsizeDot3(limit)
         )
 
         addLinkAndCaption(
             sb,
             activity.getString(R.string.card_header_provider),
             card.provider_url,
-            card.provider_name
+            card.provider_name?.ellipsizeDot3(limit)
         )
 
         val description = card.description
         if (description != null && description.isNotEmpty()) {
             if (sb.isNotEmpty()) sb.append("<br>")
-
-            val limit = PrefS.spCardDescriptionLength.toInt()
-
-            sb.append(
-                HTMLDecoder.encodeEntity(
-                    ellipsize(
-                        description,
-                        if (limit <= 0) 64 else limit
-                    )
-                )
-            )
+            sb.append(HTMLDecoder.encodeEntity(ellipsize(description, limit)))
         }
 
         showString()