From fe24fe1aca68d1f48f36114fee6df8b887a55855 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Thu, 5 Oct 2023 17:24:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A8=E6=83=85=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8E=E5=AE=9E=E9=99=85=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E4=B8=8D=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/ui/page/reply/ReplyPage.kt      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/reply/ReplyPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/reply/ReplyPage.kt
index a7b5adeb..ab657d07 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/reply/ReplyPage.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/reply/ReplyPage.kt
@@ -6,6 +6,7 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.util.Log
 import android.view.View
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -80,6 +81,7 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.widget.addTextChangedListener
 import com.effective.android.panel.utils.PanelUtil
 import com.github.panpf.sketch.compose.AsyncImage
+import com.google.accompanist.drawablepainter.rememberDrawablePainter
 import com.huanchengfly.tieba.post.R
 import com.huanchengfly.tieba.post.arch.GlobalEvent
 import com.huanchengfly.tieba.post.arch.collectPartialAsState
@@ -691,7 +693,10 @@ private fun EmoticonPanel(
     modifier: Modifier = Modifier,
     onEmoticonClick: (Emoticon) -> Unit,
 ) {
-    val emoticons = remember { EmoticonManager.getAllEmoticon() }
+    val emoticons = remember {
+        EmoticonManager.getAllEmoticon()
+            .filter { it.name.isNotEmpty() }
+    }
 
     Column(
         modifier = modifier
@@ -703,13 +708,18 @@ private fun EmoticonPanel(
                 .padding(top = 16.dp)
         ) {
             items(emoticons) { emoticon ->
-                AsyncImage(
-                    imageUri = EmoticonManager.rememberEmoticonUri(id = emoticon.id),
+                Image(
+                    painter = rememberDrawablePainter(
+                        drawable = EmoticonManager.getEmoticonDrawable(
+                            LocalContext.current,
+                            emoticon.id
+                        )
+                    ),
                     contentDescription = stringResource(
                         id = R.string.emoticon,
                         emoticon.name
                     ),
-                    contentScale = ContentScale.Crop,
+                    contentScale = ContentScale.Fit,
                     modifier = Modifier
                         .size(48.dp)
                         .padding(8.dp)