From 735ded6a5bf6c7eaa6ceee944d43a15b5603b917 Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Thu, 5 Oct 2023 01:48:28 +0800 Subject: [PATCH] =?UTF-8?q?pref:=20Pad=20=E5=8A=A0=E8=BD=BD=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tieba/post/ui/widgets/compose/Errors.kt | 5 ++++- .../post/ui/widgets/compose/states/States.kt | 18 +++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Errors.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Errors.kt index 075d6f7a..11325ef5 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Errors.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Errors.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.requiredWidthIn import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.MaterialTheme @@ -59,7 +60,9 @@ fun TipScreen( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp, alignment = Alignment.CenterVertically) ) { - image() + Column(modifier = Modifier.requiredWidthIn(max = 400.dp)) { + image() + } ProvideTextStyle( value = MaterialTheme.typography.h6.copy( color = ExtendedTheme.colors.text, diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/states/States.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/states/States.kt index 4edfd5ca..9ea43ce9 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/states/States.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/states/States.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.requiredWidthIn import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.runtime.Composable @@ -13,6 +14,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import com.airbnb.lottie.compose.LottieAnimation import com.airbnb.lottie.compose.LottieCompositionSpec import com.airbnb.lottie.compose.LottieConstants @@ -24,13 +26,15 @@ import com.huanchengfly.tieba.post.ui.widgets.compose.TipScreen val DefaultLoadingScreen: @Composable StateScreenScope.() -> Unit = { val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.lottie_loading_paperplane)) - LottieAnimation( - composition = composition, - iterations = LottieConstants.IterateForever, - modifier = Modifier - .fillMaxWidth() - .aspectRatio(2f) - ) + Box(modifier = Modifier.requiredWidthIn(max = 500.dp)) { + LottieAnimation( + composition = composition, + iterations = LottieConstants.IterateForever, + modifier = Modifier + .fillMaxWidth() + .aspectRatio(2f) + ) + } // CircularProgressIndicator(modifier = Modifier.size(48.dp), color = MaterialTheme.colors.primary) }