From 70c6452367f1bc000340258a1c1daec747db353d Mon Sep 17 00:00:00 2001 From: student-i-nikolaevskiy Date: Wed, 25 Feb 2026 13:51:33 +0300 Subject: [PATCH] ui changes tablet --- .../work/ui/screen/auth/AuthScreen.kt | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthScreen.kt b/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthScreen.kt index 5b2ec53..f9494e5 100644 --- a/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthScreen.kt +++ b/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthScreen.kt @@ -1,6 +1,7 @@ package ru.myitschool.work.ui.screen.auth import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.Spacer @@ -59,22 +60,24 @@ fun AuthScreen( } } - Column( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 48.dp) - .verticalScroll(rememberScrollState()) - .imePadding() - .imeNestedScroll(), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center - ) { - when (val currentState = state) { - is AuthState.Data -> Content(viewModel, currentState) - is AuthState.Loading -> { - CircularProgressIndicator( - modifier = Modifier.size(64.dp) - ) + BoxWithConstraints { + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = if(maxWidth < 400.dp) 48.dp else 200.dp) + .verticalScroll(rememberScrollState()) + .imePadding() + .imeNestedScroll(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + when (val currentState = state) { + is AuthState.Data -> Content(viewModel, currentState) + is AuthState.Loading -> { + CircularProgressIndicator( + modifier = Modifier.size(64.dp) + ) + } } } } @@ -136,7 +139,8 @@ private fun Content( shape = RoundedCornerShape(20.dp), colors = CardDefaults.cardColors( containerColor = MaterialTheme.colorScheme.errorContainer, - ) + ), + modifier = Modifier.fillMaxWidth() ) { Text( modifier = Modifier.testTag(TestIds.Auth.ERROR).padding(16.dp),