ui: surfaceContainer background

This commit is contained in:
2026-09-10 01:36:24 +03:00
parent c4ecc43597
commit 99e05e8232
@@ -41,6 +41,7 @@ import androidx.compose.material3.FilterChipDefaults
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
@@ -149,7 +150,6 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
)
HorizontalDivider(Modifier.padding(top=0.dp, start = hPadding, end = hPadding))
if (day.intervals.all { it.lessons.isEmpty() }) {
Text("Занятий нет", style = MaterialTheme.typography.bodyLarge)
} else {
@@ -310,13 +310,11 @@ private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
Text("—", style = MaterialTheme.typography.bodyMedium)
} else {
slot.lessons.forEachIndexed { index, lesson ->
val baseSurface = MaterialTheme.colorScheme.surfaceContainer
val backgroundColor = if (indexColor % 2 == 0) {
baseSurface
} else {
baseSurface.copy(alpha = 1f).compositeOver(
MaterialTheme.colorScheme.onSurface.copy(alpha = 0.03f)
)
var baseSurface = Modifier.fillMaxWidth().padding(vertical = 2.dp)
if ((indexColor) % 2 != 0) {
baseSurface = baseSurface.background(
MaterialTheme.colorScheme.surfaceContainer
);
}
indexColor++
// XXX:
@@ -326,7 +324,7 @@ private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
// Меню на onLongClick?
SelectionContainer() {
Column(
Modifier.fillMaxWidth().padding(vertical = 2.dp).background(backgroundColor)
baseSurface
// XXX: combinedClickable?
//.combinedClickable(
// onClick = {