Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pref: 平板模式下图片/视频宽度

This commit is contained in:
HuanCheng65 2023-07-22 15:42:25 +08:00
parent cf330a4113
commit 3fe7aee173
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt
View File

@ -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.ThreadInfo
import com.huanchengfly.tieba.post.api.models.protos.User import com.huanchengfly.tieba.post.api.models.protos.User
import com.huanchengfly.tieba.post.api.models.protos.abstractText 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.ImmutableHolder
import com.huanchengfly.tieba.post.arch.wrapImmutable import com.huanchengfly.tieba.post.arch.wrapImmutable
import com.huanchengfly.tieba.post.findActivity import com.huanchengfly.tieba.post.findActivity
import com.huanchengfly.tieba.post.ui.common.theme.compose.ExtendedTheme 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.utils.getImmutablePhotoViewData
import com.huanchengfly.tieba.post.ui.widgets.compose.video.DefaultVideoPlayerController import com.huanchengfly.tieba.post.ui.widgets.compose.video.DefaultVideoPlayerController
import com.huanchengfly.tieba.post.ui.widgets.compose.video.OnFullScreenModeChangedListener import com.huanchengfly.tieba.post.ui.widgets.compose.video.OnFullScreenModeChangedListener
@ -327,6 +329,11 @@ private fun ThreadMedia(
val medias = remember(item) { val medias = remember(item) {
item.getImmutableList { media } item.getImmutableList { media }
} }
val singleMediaFraction =
if (LocalWindowSizeClass.current.widthSizeClass == WindowWidthSizeClass.Compact)
1f
else 0.6f
if (isVideo) { if (isVideo) {
val videoInfo = item.getImmutable { videoInfo!! } val videoInfo = item.getImmutable { videoInfo!! }
@ -334,7 +341,7 @@ private fun ThreadMedia(
videoUrl = videoInfo.get { videoUrl }, videoUrl = videoInfo.get { videoUrl },
thumbnailUrl = videoInfo.get { thumbnailUrl }, thumbnailUrl = videoInfo.get { thumbnailUrl },
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth(singleMediaFraction)
.aspectRatio( .aspectRatio(
max( max(
videoInfo videoInfo
@ -349,7 +356,7 @@ private fun ThreadMedia(
Box { Box {
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth(if (medias.size == 1) singleMediaFraction else 1f)
.aspectRatio(if (medias.size == 1) 2f else 3f) .aspectRatio(if (medias.size == 1) 2f else 3f)
.clip(RoundedCornerShape(8.dp)), .clip(RoundedCornerShape(8.dp)),
horizontalArrangement = Arrangement.spacedBy(4.dp) horizontalArrangement = Arrangement.spacedBy(4.dp)