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

main #8

Open
student-m-kuchergin wants to merge 17 commits from KHBGPU-org/NTO-2026-Android-TeamTask-Template:main into main
pull from: KHBGPU-org/NTO-2026-Android-TeamTask-Template:main
merge into: NTO-2026:main
Conversation 1 Commits 17 Files Changed 22 +5 -2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit abd0f5f053 - Show all commits

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

@ -3,8 +3,11 @@ package ru.myitschool.work.ui.screen.auth
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.material3.Button import androidx.compose.material3.Button
@ -87,7 +90,7 @@ private fun Content
val googleSans = FontFamily( val googleSans = FontFamily(
Font(R.font.googlesans_regular, FontWeight.Medium, FontStyle.Normal) Font(R.font.googlesans_regular, FontWeight.Medium, FontStyle.Normal)
) )
Spacer(modifier = Modifier.size(0.dp)) Spacer(modifier = Modifier.size(5.dp))
Text( Text(
text = stringResource(R.string.auth_title), text = stringResource(R.string.auth_title),
fontFamily = googleSans, fontFamily = googleSans,
@ -98,7 +101,7 @@ private fun Content
fontStyle = FontStyle.Normal, fontStyle = FontStyle.Normal,
modifier = Modifier.fillMaxWidth(1f) modifier = Modifier.fillMaxWidth(1f)
) )
Spacer(modifier = Modifier.size(106.dp)) Spacer(modifier = Modifier.height(5.dp))
Text( Text(
text = stringResource(R.string.auth_label_login), text = stringResource(R.string.auth_label_login),
fontFamily = googleSans, fontFamily = googleSans,