NTO-2026/NTO-2026-Android-TeamTask-Template
106
0
Fork 28
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

new_select_screen #9

Open
student-i-nikolaevskiy wants to merge 42 commits from Minipigi-org/NTO-2026-Android-TeamTask-Template:new_select_screen into main
pull from: Minipigi-org/NTO-2026-Android-TeamTask-Template:new_select_screen
merge into: NTO-2026:main
Conversation 0 Commits 42 Files Changed 39 +21 -17
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 70c6452367 - Show all commits

8
app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthScreen.kt
View File

@ -1,6 +1,7 @@
package ru.myitschool.work.ui.screen.auth package ru.myitschool.work.ui.screen.auth
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
@ -59,10 +60,11 @@ fun AuthScreen(
} }
} }
BoxWithConstraints {
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(horizontal = 48.dp) .padding(horizontal = if(maxWidth < 400.dp) 48.dp else 200.dp)
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
.imePadding() .imePadding()
.imeNestedScroll(), .imeNestedScroll(),
@ -78,6 +80,7 @@ fun AuthScreen(
} }
} }
} }
}
} }
@Composable @Composable
@ -136,7 +139,8 @@ private fun Content(
shape = RoundedCornerShape(20.dp), shape = RoundedCornerShape(20.dp),
colors = CardDefaults.cardColors( colors = CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.errorContainer, containerColor = MaterialTheme.colorScheme.errorContainer,
) ),
modifier = Modifier.fillMaxWidth()
) { ) {
Text( Text(
modifier = Modifier.testTag(TestIds.Auth.ERROR).padding(16.dp), modifier = Modifier.testTag(TestIds.Auth.ERROR).padding(16.dp),