diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/Previews.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/Previews.kt index 20e83c7..959d1fa 100644 --- a/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/Previews.kt +++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/Previews.kt @@ -289,4 +289,16 @@ fun HomeWorkCardPrev() { isDone = !it } ) +} + + +@Preview +@Composable +fun ScheduleShieldPrev() { + BaseScheduleShield( + subjectName = "Физика", + teacherName = "Иванов Иван Иванович", + classNumber = "3.13", + nextLessonName = "Обществознание" + ) } \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/ScheduleShield.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/ScheduleShield.kt index 403a91d..138947e 100644 --- a/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/ScheduleShield.kt +++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/ScheduleShield.kt @@ -1,10 +1,21 @@ package ru.megboyzz.dnevnik.screens.ui -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.* +import androidx.compose.material.Icon +import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp +import ru.megboyzz.dnevnik.AsPainter +import ru.megboyzz.dnevnik.AsString +import ru.megboyzz.dnevnik.R +import ru.megboyzz.dnevnik.ui.theme.H2 +import ru.megboyzz.dnevnik.ui.theme.MainText +import ru.megboyzz.dnevnik.ui.theme.dark +import ru.megboyzz.dnevnik.ui.theme.mainBlue @Composable fun BaseScheduleShield( @@ -15,9 +26,39 @@ fun BaseScheduleShield( ) { BaseCard { Column( + modifier = Modifier + .defaultMinSize(300.dp) + .padding(top = 20.dp, bottom = 40.dp), horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(15.dp) ) { + Column( + verticalArrangement = Arrangement.spacedBy(8.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Icon( + painter = R.drawable.ic_cap.AsPainter(), + contentDescription = "" + ) + TextHeader( + title = R.string.title_now_lesson.AsString(), + value = subjectName + ) + } + TextHeader( + title = R.string.title_lesson_teacher.AsString(), + value = teacherName + ) + TextHeader( + title = R.string.title_classroom.AsString(), + value = classNumber + ) + TextHeader( + title = R.string.title_next_lesson.AsString(), + value = nextLessonName, + valueIsBlue = false + ) } } } @@ -29,8 +70,22 @@ fun TextHeader( valueIsBlue: Boolean = true ) { Column( - verticalArrangement = Arrangement.spacedBy(10.dp) + verticalArrangement = Arrangement.spacedBy(2.dp), + modifier = Modifier.width(200.dp) ) { - + Text( + text = title, + style = MainText, + color = dark, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + Text( + text = value, + style = H2, + color = if(valueIsBlue) mainBlue else dark, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_cap.xml b/app/src/main/res/drawable/ic_cap.xml new file mode 100644 index 0000000..a7e7230 --- /dev/null +++ b/app/src/main/res/drawable/ic_cap.xml @@ -0,0 +1,13 @@ + + + + + +