ui: better week select l&f

app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt

@@ -3,7 +3,9 @@ package agzam.vyatsu.ui.schedule
 import agzam.vyatsu.domain.model.Day
 import agzam.vyatsu.domain.model.SchedulePeriod
 import agzam.vyatsu.domain.model.TimeSlot
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
@@ -12,26 +14,25 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExposedDropdownMenuAnchorType
-import androidx.compose.material3.ExposedDropdownMenuBox
-import androidx.compose.material3.ExposedDropdownMenuDefaults.TrailingIcon
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.FilterChipDefaults
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
@@ -43,6 +44,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import java.time.DayOfWeek
 import java.time.LocalDate
@@ -106,10 +108,22 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                         val isTodayDay = day.date == state.todayDate
                         val dayLabel = if (isTodayDay) "Сегодня " else ""
 
-                        Text(
+                        Row(
-                            "$dayLabel ${dayName(day.date.dayOfWeek)} · ${day.date.format(FULL_DATE)}",
+                            Modifier.fillMaxWidth(),
-                            style = MaterialTheme.typography.titleMedium
+                            verticalAlignment = Alignment.CenterVertically
-                        )
+                        ) {
+                            Text(
+                                "$dayLabel${dayName(day.date.dayOfWeek)} · ${day.date.format(FULL_DATE)}",
+                                style = MaterialTheme.typography.titleMedium,
+                                modifier = Modifier.weight(1f)
+                            )
+                            WeekSelector(
+                                periods = schedule.periods,
+                                selectedWeekStart = state.weekStart,
+                                todayWeekStart = state.todayDate?.let { schedule.periodOf(it)?.weekStart },
+                                onSelect = viewModel::selectWeek
+                            )
+                        }
                         Row(
                             Modifier.fillMaxWidth(),
                             horizontalArrangement = Arrangement.spacedBy(8.dp)
@@ -123,15 +137,6 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                         }
                         HorizontalDivider(Modifier.padding(vertical = 8.dp))
 
-                        WeekSelector(
-                            periods = schedule.periods,
-                            selectedWeekStart = state.weekStart,
-                            todayWeekStart = state.todayDate?.let { schedule.periodOf(it)?.weekStart },
-                            onSelect = viewModel::selectWeek
-                        )
-
-                        HorizontalDivider(Modifier.padding(vertical = 8.dp))
-
                         DayChips(
                             days = weekDays,
                             selectedDate = state.dayDate,
@@ -171,43 +176,49 @@ private fun WeekSelector(
     val selected = periods.firstOrNull { it.weekStart == selectedWeekStart }
     var expanded by remember { mutableStateOf(false) }
 
-    ExposedDropdownMenuBox(
+    Box {
-        expanded = expanded,
+        Row(
-        onExpandedChange = { expanded = it }
-    ) {
-        OutlinedTextField(
-            value = selected?.let(::weekLabel) ?: "Выберите период",
-            onValueChange = {},
-            readOnly = true,
-            label = { Text("Период") },
-            singleLine = true,
-            trailingIcon = { TrailingIcon(expanded = expanded) },
             modifier = Modifier
-                .fillMaxWidth()
+                .clip(MaterialTheme.shapes.small)
-                .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable, enabled = true)
+                .clickable(enabled = true, onClick = { expanded = true })
-        )
+                .padding(horizontal = 10.dp, vertical = 8.dp),
-        ExposedDropdownMenu(
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                selected?.let(::weekLabel) ?: "Период",
+                style = MaterialTheme.typography.labelLarge,
+                color = MaterialTheme.colorScheme.primary
+            )
+            Icon(
+                imageVector = Icons.Default.ArrowDropDown,
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.primary
+            )
+        }
+        DropdownMenu(
             expanded = expanded,
-            onDismissRequest = { expanded = false }
+            onDismissRequest = { expanded = false },
+            modifier = Modifier.widthIn(min = 220.dp)
         ) {
             periods.forEach { period ->
                 val isTodayWeek = todayWeekStart == period.weekStart
                 DropdownMenuItem(
                     text = {
-                        Row(verticalAlignment = Alignment.CenterVertically) {
+                        Text(
+                            weekLabel(period),
+                            style = MaterialTheme.typography.bodyLarge
+                        )
+                    },
+                    trailingIcon = if (isTodayWeek) {
+                        {
                             Text(
-                                weekLabel(period),
+                                "сегодня",
-                                style = MaterialTheme.typography.bodyLarge,
+                                style = MaterialTheme.typography.labelMedium,
-                                modifier = Modifier.weight(1f)
+                                color = MaterialTheme.colorScheme.primary
                             )
-                            if (isTodayWeek) {
-                                Text(
-                                    "сегодня",
-                                    style = MaterialTheme.typography.labelMedium,
-                                    color = MaterialTheme.colorScheme.primary
-                                )
-                            }
                         }
+                    } else {
+                        null
                     },
                     onClick = {
                         expanded = false