From 3fe7aee173e5098ff13adde5045a5db33f7ad1cb Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Sat, 22 Jul 2023 15:42:25 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E5=B9=B3=E6=9D=BF=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=E5=9B=BE=E7=89=87/=E8=A7=86=E9=A2=91=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/ui/widgets/compose/FeedCard.kt         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt
index 0410115c..b23bc568 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt
@@ -65,10 +65,12 @@ import com.huanchengfly.tieba.post.api.models.protos.SimpleForum
 import com.huanchengfly.tieba.post.api.models.protos.ThreadInfo
 import com.huanchengfly.tieba.post.api.models.protos.User
 import com.huanchengfly.tieba.post.api.models.protos.abstractText
+import com.huanchengfly.tieba.post.arch.BaseComposeActivity.Companion.LocalWindowSizeClass
 import com.huanchengfly.tieba.post.arch.ImmutableHolder
 import com.huanchengfly.tieba.post.arch.wrapImmutable
 import com.huanchengfly.tieba.post.findActivity
 import com.huanchengfly.tieba.post.ui.common.theme.compose.ExtendedTheme
+import com.huanchengfly.tieba.post.ui.common.windowsizeclass.WindowWidthSizeClass
 import com.huanchengfly.tieba.post.ui.utils.getImmutablePhotoViewData
 import com.huanchengfly.tieba.post.ui.widgets.compose.video.DefaultVideoPlayerController
 import com.huanchengfly.tieba.post.ui.widgets.compose.video.OnFullScreenModeChangedListener
@@ -327,6 +329,11 @@ private fun ThreadMedia(
     val medias = remember(item) {
         item.getImmutableList { media }
     }
+    val singleMediaFraction =
+        if (LocalWindowSizeClass.current.widthSizeClass == WindowWidthSizeClass.Compact)
+            1f
+        else 0.6f
+
 
     if (isVideo) {
         val videoInfo = item.getImmutable { videoInfo!! }
@@ -334,7 +341,7 @@ private fun ThreadMedia(
             videoUrl = videoInfo.get { videoUrl },
             thumbnailUrl = videoInfo.get { thumbnailUrl },
             modifier = Modifier
-                .fillMaxWidth()
+                .fillMaxWidth(singleMediaFraction)
                 .aspectRatio(
                     max(
                         videoInfo
@@ -349,7 +356,7 @@ private fun ThreadMedia(
         Box {
             Row(
                 modifier = Modifier
-                    .fillMaxWidth()
+                    .fillMaxWidth(if (medias.size == 1) singleMediaFraction else 1f)
                     .aspectRatio(if (medias.size == 1) 2f else 3f)
                     .clip(RoundedCornerShape(8.dp)),
                 horizontalArrangement = Arrangement.spacedBy(4.dp)