Compare commits

..
Author SHA1 Message Date
Agzamus 99e05e8232 ui: surfaceContainer background 2026-09-10 01:36:24 +03:00
Agzamus c4ecc43597 ui: canged colors 2026-09-10 01:01:57 +03:00
@@ -41,6 +41,7 @@ import androidx.compose.material3.FilterChipDefaults
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
@@ -54,6 +55,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.compositeOver
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import java.time.DayOfWeek import java.time.DayOfWeek
@@ -148,7 +150,6 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
) )
HorizontalDivider(Modifier.padding(top=0.dp, start = hPadding, end = hPadding)) HorizontalDivider(Modifier.padding(top=0.dp, start = hPadding, end = hPadding))
if (day.intervals.all { it.lessons.isEmpty() }) { if (day.intervals.all { it.lessons.isEmpty() }) {
Text("Занятий нет", style = MaterialTheme.typography.bodyLarge) Text("Занятий нет", style = MaterialTheme.typography.bodyLarge)
} else { } else {
@@ -309,10 +310,11 @@ private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
Text("—", style = MaterialTheme.typography.bodyMedium) Text("—", style = MaterialTheme.typography.bodyMedium)
} else { } else {
slot.lessons.forEachIndexed { index, lesson -> slot.lessons.forEachIndexed { index, lesson ->
val backgroundColor = if (indexColor % 2 == 0) { var baseSurface = Modifier.fillMaxWidth().padding(vertical = 2.dp)
MaterialTheme.colorScheme.surfaceBright if ((indexColor) % 2 != 0) {
} else { baseSurface = baseSurface.background(
MaterialTheme.colorScheme.surfaceVariant MaterialTheme.colorScheme.surfaceContainer
);
} }
indexColor++ indexColor++
// XXX: // XXX:
@@ -322,7 +324,7 @@ private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
// Меню на onLongClick? // Меню на onLongClick?
SelectionContainer() { SelectionContainer() {
Column( Column(
Modifier.fillMaxWidth().padding(vertical = 2.dp).background(backgroundColor) baseSurface
// XXX: combinedClickable? // XXX: combinedClickable?
//.combinedClickable( //.combinedClickable(
// onClick = { // onClick = {