From fd7f273277e0dcfba92b51f68a8584b43c604c2c Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Thu, 5 Oct 2023 17:48:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B4=B4=E5=AD=90=E4=B8=80=E6=A5=BC?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB=E6=89=93?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/api/models/protos/Extensions.kt  | 17 +++++++++--------
 .../post/ui/page/thread/ThreadViewModel.kt      |  6 +++---
 .../tieba/post/ui/widgets/compose/Images.kt     |  7 ++-----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/models/protos/Extensions.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/models/protos/Extensions.kt
index 3f34aa4a..f0eb4ae2 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/api/models/protos/Extensions.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/api/models/protos/Extensions.kt
@@ -308,15 +308,16 @@ val Post.contentRenders: ImmutableList<PbContentRender>
 
         return renders.map {
             if (it is PicContentRender) {
-                val data = getPhotoViewData(
-                    this,
-                    it.picId,
-                    it.picUrl,
-                    it.originUrl,
-                    it.showOriginBtn,
-                    it.originSize
+                it.copy(
+                    photoViewData = getPhotoViewData(
+                        this,
+                        it.picId,
+                        it.picUrl,
+                        it.originUrl,
+                        it.showOriginBtn,
+                        it.originSize
+                    )
                 )
-                if (data != null) it.copy(photoViewData = data) else it
             } else it
         }.toImmutableList()
     }
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadViewModel.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadViewModel.kt
index 4f50568b..75712e72 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadViewModel.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadViewModel.kt
@@ -1114,9 +1114,9 @@ data class ThreadUiState(
 ) : UiState
 
 sealed interface ThreadUiEvent : UiEvent {
-    object ScrollToFirstReply : ThreadUiEvent
+    data object ScrollToFirstReply : ThreadUiEvent
 
-    object ScrollToLatestReply : ThreadUiEvent
+    data object ScrollToLatestReply : ThreadUiEvent
 
     data class LoadSuccess(
         val page: Int
@@ -1124,7 +1124,7 @@ sealed interface ThreadUiEvent : UiEvent {
 
     data class AddFavoriteSuccess(val floor: Int) : ThreadUiEvent
 
-    object RemoveFavoriteSuccess : ThreadUiEvent
+    data object RemoveFavoriteSuccess : ThreadUiEvent
 }
 
 object ThreadSortType {
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Images.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Images.kt
index b71c8ed4..8123dc4a 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Images.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Images.kt
@@ -276,20 +276,17 @@ fun NetworkImage(
 
     Box(
         modifier = Modifier
-            .pointerInput(Unit) {
+            .pointerInput(enableClick) {
                 if (enableClick) {
                     detectTapGestures(
                         onLongPress = {
                             isLongPressing = true
                         },
                         onPress = {
-                            awaitRelease()
+                            tryAwaitRelease()
                             isLongPressing = false
                         },
                         onTap = {
-                            if (isLongPressing) {
-                                return@detectTapGestures
-                            }
                             if (!shouldLoad) {
                                 shouldLoad = true
                             } else if (photoViewData != null) {