Merge branch 'database-refactor'

.gitea/workflows/release.yml

@@ -85,9 +85,6 @@ jobs:
       - name: Build release APK
         run: ./gradlew assembleRelease
         env:
-          # Версия приложения — дата, сгенерированная на предыдущем шаге.
-          # Читается в app/build.gradle.kts как versionName (для BuildConfig).
-          APP_VERSION: ${{ steps.version.outputs.version_name }}
           # Переменные окружения, которые читает signingConfig в app/build.gradle.kts
           ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/keystore.jks
           ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}

app/build.gradle.kts

@@ -17,9 +17,7 @@ android {
         minSdk = 28
         targetSdk = 36
         versionCode = 1
-        // В продакшн-сборке версию приложения подставляет CI (env APP_VERSION = дата ГГГГ.ММ.ДД).
+        versionName = "1.0"
-        // Локально и при отсутствии переменной — fallback "1.0".
-        versionName = System.getenv("APP_VERSION") ?: "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/agzam/vyatsu/data/remote/pdf/Pdf2Table.kt

@@ -38,7 +38,7 @@ class Pdf2Table(page: PDPage) : PDFGraphicsStreamEngine(page) {
 
     private val svgBuilder = StringBuilder()
     private val currentPath = StringBuilder()
-    val tableSvg = StringBuilder()
+    private val tableSvg = StringBuilder()
 
 
     private val currentSubPathLines = mutableListOf<PdfLine>()
@@ -52,7 +52,7 @@ class Pdf2Table(page: PDPage) : PDFGraphicsStreamEngine(page) {
         val width = mediaBox.width
         val height = mediaBox.height
         return """
-            <svg width="$width" height="$height" viewBox="0 0 $width $height" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style='font-size: 50%;'>
+            <svg width="$width" height="$height" viewBox="0 0 $width $height" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
                 <g>${svgBuilder}</g>
                 <g>${tableSvg}</g>
             </svg>
@@ -211,7 +211,7 @@ class Pdf2Table(page: PDPage) : PDFGraphicsStreamEngine(page) {
                 val bottom = ys[ii+1]
                 cells.add(TableCell(left, top, right-left, bottom-top))
 
-                tableSvg.append("<rect fill='${if (i % 2 == 0) "#ff" else "#9e"}${if (ii % 2 == 0) "ff9e" else "9e9e"}' x='$left' y='$top' width='${right-left}' height='${bottom-top}'/>\n")
+                tableSvg.append("<rect fill='${if (i % 2 == 0) "#f" else "#0"}${if (ii % 2 == 0) "f0" else "00"}' x='$left' y='$top' width='${right-left}' height='${bottom-top}'/>\n")
             }
             columns.add(TableColumn(left, right-left, cells))
         }

app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt

@@ -2,7 +2,6 @@ package agzam.vyatsu.data.remote.pdf
 
 import agzam.vyatsu.domain.model.Day
 import agzam.vyatsu.domain.model.Lesson
-import agzam.vyatsu.domain.model.LessonType
 import agzam.vyatsu.domain.model.TimeSlot
 import android.util.Log
 import com.tom_roush.pdfbox.pdmodel.PDDocument
@@ -26,10 +25,6 @@ object PdfScheduleParser {
     private fun timeFrom(timeString: String?): LocalTime? { return runCatching { LocalTime.parse(timeString, TIME_FORMAT) }.getOrNull() }
     private fun dateFrom(dateString: String?): LocalDate? { return runCatching { LocalDate.parse(dateString, DATE_FORMAT) }.getOrNull() }
 
-    private val ROOM_REGEX = Regex("""(?<=^|\s)\d{1,2}-\d{3}[_a-zA-Zа-яА-Я]?(?=\s|$)""")
-    private val LESSON_TYPE_REGEX = Regex(LessonType.entries.joinToString(separator = "|") { Regex.escape(it.label) }.let { """(?<=^|\s)($it)(?=\s|$)""" } )
-    private val SUBGROUP_REGEX = Regex("""\d{2}\sподгруппа""", RegexOption.IGNORE_CASE)
-
     fun parse(pdfBytes: ByteArray): List<Day> {
         Log.d(TAG, "Parsing ${pdfBytes.size} bytes")
         val doc = try {
@@ -40,8 +35,6 @@ object PdfScheduleParser {
         }
 
         val days = mutableListOf<Day>()
-        var group: String? = null
-
         try {
             for (pageIndex in 0 until doc.numberOfPages) {
                 Log.v(TAG, "============ Page $pageIndex ============")
@@ -52,6 +45,12 @@ object PdfScheduleParser {
                 svg.processPage(page)
                 val cols = svg.asTable()
 
+                /** Вывод таблички из PDF в SVG формате + отладочные жлементы из [Pdf2Table.asTable] **/
+                Log.v(SVG_TAG,  "====")
+                for(line in  svg.asSvg().split("\n")) {
+                    Log.v(SVG_TAG,  line)
+                }
+
                 if(cols.size != 3) throw RuntimeException("Found columns: ${cols.size}/3")
 
                 // Парсинг текста
@@ -61,11 +60,6 @@ object PdfScheduleParser {
                 textStripper.getText(doc)
                 val texts = textStripper.blocks
 
-                for(text in texts) {
-                    svg.tableSvg.appendLine("<text x='${text.x}' y='${text.y}'>${text.text}</text>")
-                    svg.tableSvg.appendLine("<circle cx='${text.x}' cy='${text.y}' r='1' fill='red'/>")
-                }
-
                 val daysColumn      = cols[0] // Колонка "День", имеет формат "<день> dd.mm.yy"
                 val intervalsColumn = cols[1] // Колонка "Интервал", имеет формат "HH:mm-HH:mm"
                 val lessonsColumn   = cols[2] // Колонка с инофрмацией о паре
@@ -106,17 +100,10 @@ object PdfScheduleParser {
                     }
                 }
 
+
                 for (dayCell in daysColumn.cells) {
                     val day = content(dayCell).split(' ')
-                    if(day.size == 1 && day.first() == "День") {
+                    if(day.size != 2) continue // XXX: добавить защиту от заголовка и выбрасывать исключения вместо пропуска?
-                        val groupCell = select(lessonsColumn, dayCell).firstOrNull() ?: continue
-                        group = content(groupCell)
-                        continue
-                    }
-                    if(day.size != 2) {
-                        Log.w(TAG, "Day data is not in format <day> <date>: $day")
-                        continue // XXX: добавить защиту от заголовка и выбрасывать исключения вместо пропуска?
-                    }
 
                     val date = dateFrom(day[1]) ?: continue
                     val intervals = mutableListOf<TimeSlot>()
@@ -137,55 +124,7 @@ object PdfScheduleParser {
                             val content = content(lessonCell)
                             Log.v(TAG, "- $content")
                             // TODO: парсинг контента лекции
-
+                            lessons.add(Lesson(raw=content))
-                            // Поиск кабинета в строке, ибо он последний, если их несколько - то скорее всего разделение на подгруппы
-                            var found = 0
-                            var currentStart = 0
-                            for (roomMatch in ROOM_REGEX.findAll(content)) {
-                                found++
-
-                                val raw = content.substring(currentStart, roomMatch.range.last + 1)
-                                currentStart = roomMatch.range.last + 1
-
-                                // Предполагаемый формат: [группа], [XX подгруппа] <предмет> <тип> [id + тип] <ФИО> <кабинет>
-
-                                val room = roomMatch.value
-
-                                val typeMatch = LESSON_TYPE_REGEX.findAll(raw).toList()
-                                if(typeMatch.isEmpty()) {
-                                    lessons.add(Lesson(
-                                        raw=raw,
-                                        room=room,
-                                    ))
-                                    continue
-                                }
-                                var subject = raw.substring(0, typeMatch.first().range.first).trim() // TODO: сейчас [группа], [XX подгруппа] <предмет> - можно достать подгруппу
-                                val type = LessonType.fromRaw(typeMatch.first().value.trim())
-                                val teacher = raw.substring(typeMatch.last().range.last+1, raw.length - room.length).trim()
-                                var subgroup: String? = null
-                                Log.d(TAG, "$subject $group")
-                                if(group != null && subject.startsWith("$group,")) {
-                                    subject = subject.substring(group.length + 1).trim()
-                                    val subgroupMatch = SUBGROUP_REGEX.find(subject)
-                                    if(subgroupMatch != null) {
-                                        subgroup = subgroupMatch.value.trim()
-                                        subject = subject.removeRange(subgroupMatch.range).trim()
-                                    }
-                                }
-
-
-                                lessons.add(Lesson(
-                                    raw=raw,
-                                    subject=subject,
-                                    room=room,
-                                    type=type,
-                                    teacher=teacher,
-                                    subgroup=subgroup
-                                ))
-                            }
-
-                            if(found == 0) lessons.add(Lesson(raw=content))
-
                         }
                         intervals.add(TimeSlot(start = start, end = end, lessons = lessons))
                     }
@@ -194,18 +133,6 @@ object PdfScheduleParser {
                 for (text in texts.filter { it.rotation != 0f }) {
                     Log.v(TAG, "${text.x.roundToInt()}\t${text.y.roundToInt()}\t${text.text}")
                 }
-
-                /** Вывод таблички из PDF в SVG формате + отладочные жлементы из [Pdf2Table.asTable] **/
-                Log.v(SVG_TAG,  "====")
-                for(line in  svg.asSvg().split("\n")) {
-                    if(line.length > 250) {
-                        Log.v(SVG_TAG, "length: " + line.length)
-                        Log.v(SVG_TAG + "-" + (pageIndex+1),  "length: " + line.length)
-                        continue
-                    }
-                    Log.v(SVG_TAG,  line)
-                    Log.v(SVG_TAG + "-" + (pageIndex+1),  line)
-                }
             }
         } catch (e: Exception) {
             Log.e(TAG, "Parsing error", e)

app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfTextParser.kt

@@ -7,7 +7,6 @@ import com.tom_roush.pdfbox.text.TextPosition
  * Парсер блоков текста из PDF
  * @author Agzam
  */
-
 class PdfTextParser : PDFTextStripper() {
 
     data class TextBlock(
@@ -26,32 +25,9 @@ class PdfTextParser : PDFTextStripper() {
     }
 
     override fun writeString(string: String?, textPositions: MutableList<TextPosition>?) {
-        if (textPositions.isNullOrEmpty()) return
+        if (!string.isNullOrBlank() && !textPositions.isNullOrEmpty()) {
-
+            val first = textPositions.first()
-        val currentWordChars = mutableListOf<TextPosition>()
+            val last = textPositions.last()
-
-        for (tp in textPositions) {
-            val unicode = tp.unicode
-
-            if (unicode == " " || unicode == "\u00A0" || unicode == "\t") {
-                addWordBlock(currentWordChars)
-                currentWordChars.clear()
-            } else {
-                currentWordChars.add(tp)
-            }
-        }
-
-        addWordBlock(currentWordChars)
-    }
-
-    private fun addWordBlock(wordChars: List<TextPosition>) {
-        if (wordChars.isEmpty()) return
-
-        val first = wordChars.first()
-        val last = wordChars.last()
-
-        val wordText = wordChars.joinToString("") { it.unicode }.trim()
-        if (wordText.isEmpty()) return
 
             val matrix = first.textMatrix
             val rotation = first.dir
@@ -60,17 +36,10 @@ class PdfTextParser : PDFTextStripper() {
 
             val x = matrix.translateX
             val y = matrix.translateY - first.heightDir
+
             val height = first.heightDir
 
-        blocks.add(
+            blocks.add(TextBlock(string.trim(), x, currentPage.mediaBox.height - y - height, totalWidth, height, rotation))
-            TextBlock(
+        }
-                text = wordText,
-                x = x,
-                y = currentPage.mediaBox.height - y - height,
-                width = totalWidth,
-                height = height,
-                rotation = rotation
-            )
-        )
     }
 }

app/src/main/java/agzam/vyatsu/data/repository/GroupRepositoryImpl.kt

@@ -23,6 +23,9 @@ class GroupRepositoryImpl(
     override suspend fun getGroups(): List<Group> =
         groupDao.observeAll().first().map { it.toDomain() }
 
+    override suspend fun getGroup(id: String): Group? =
+        groupDao.getById(id)?.toDomain()
+
     override suspend fun getFaculties(): List<String> = groupDao.getFaculties()
 
     override suspend fun refreshIfStale(): Boolean {

app/src/main/java/agzam/vyatsu/data/repository/ScheduleRepositoryImpl.kt

@@ -157,7 +157,6 @@ class ScheduleRepositoryImpl(
         val lessonsByDay = lessonEntities.groupBy { it.dayId }
         val days = dayEntities
             .sortedBy { it.date }
-            .distinctBy { it.date }
             .map { day ->
                 val lessons = lessonsByDay[day.id].orEmpty()
                     .groupBy { it.slotIndex }

app/src/main/java/agzam/vyatsu/domain/repository/GroupRepository.kt

@@ -6,6 +6,7 @@ import kotlinx.coroutines.flow.Flow
 interface GroupRepository {
     fun observeGroups(): Flow<List<Group>>
     suspend fun getGroups(): List<Group>
+    suspend fun getGroup(id: String): Group?
     suspend fun getFaculties(): List<String>
     suspend fun refreshIfStale(): Boolean
     suspend fun forceRefresh(): Boolean

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

@@ -1,12 +1,9 @@
 package agzam.vyatsu.ui.schedule
 
 import agzam.vyatsu.domain.model.Day
-import agzam.vyatsu.domain.model.LessonType
 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
@@ -15,18 +12,14 @@ 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.FilterChip
 import androidx.compose.material3.FilterChipDefaults
@@ -40,12 +33,8 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-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
@@ -109,23 +98,31 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                         val isTodayDay = day.date == state.todayDate
                         val dayLabel = if (isTodayDay) "Сегодня " else ""
 
+                        Text(
+                            "$dayLabel ${dayName(day.date.dayOfWeek)} · ${day.date.format(FULL_DATE)}",
+                            style = MaterialTheme.typography.titleMedium
+                        )
                         Row(
                             Modifier.fillMaxWidth(),
-                            verticalAlignment = Alignment.CenterVertically
+                            horizontalArrangement = Arrangement.spacedBy(8.dp)
                         ) {
-                            Text(
+                            TextButton(onClick = { viewModel.clearSelectedPeriod() }) {
-                                "$dayLabel${dayName(day.date.dayOfWeek)} · ${day.date.format(FULL_DATE)}",
+                                Text("Очистить эту неделю")
-                                style = MaterialTheme.typography.titleMedium,
+                            }
-                                modifier = Modifier.weight(1f)
+                            TextButton(onClick = { viewModel.clearAll() }) {
-                            )
+                                Text("Очистить всё")
-                            WeekSelector(
+                            }
+                        }
+                        HorizontalDivider(Modifier.padding(vertical = 8.dp))
+
+                        WeekChips(
                             periods = schedule.periods,
                             selectedWeekStart = state.weekStart,
                             todayWeekStart = state.todayDate?.let { schedule.periodOf(it)?.weekStart },
                             onSelect = viewModel::selectWeek
                         )
-                        }
+
-                        HorizontalDivider(Modifier.padding(top = 8.dp, bottom = 0.dp))
+                        HorizontalDivider(Modifier.padding(vertical = 8.dp))
 
                         DayChips(
                             days = weekDays,
@@ -134,7 +131,7 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                             onSelect = viewModel::selectDay
                         )
 
-                        HorizontalDivider(Modifier.padding(top=0.dp, bottom = 8.dp))
+                        HorizontalDivider(Modifier.padding(vertical = 8.dp))
 
                         if (day.intervals.all { it.lessons.isEmpty() }) {
                             Text("Занятий нет", style = MaterialTheme.typography.bodyLarge)
@@ -155,69 +152,41 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-private fun WeekSelector(
+private fun WeekChips(
     periods: List<SchedulePeriod>,
     selectedWeekStart: LocalDate?,
     todayWeekStart: LocalDate?,
     onSelect: (LocalDate) -> Unit
 ) {
-    val selected = periods.firstOrNull { it.weekStart == selectedWeekStart }
+    LazyRow(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
-    var expanded by remember { mutableStateOf(false) }
+        items(periods, key = { it.weekStart.toEpochDay() }) { period ->
-
+            val selected = selectedWeekStart == period.weekStart
-    Box {
-        Row(
-            modifier = Modifier
-                .clip(MaterialTheme.shapes.small)
-                .clickable(enabled = true, onClick = { expanded = true })
-                .padding(horizontal = 10.dp, vertical = 8.dp),
-            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 },
-            modifier = Modifier.widthIn(min = 220.dp)
-        ) {
-            periods.forEach { period ->
             val isTodayWeek = todayWeekStart == period.weekStart
-                DropdownMenuItem(
+            FilterChip(
-                    text = {
+                selected = selected,
+                onClick = { onSelect(period.weekStart) },
+                label = {
                     Text(
                         weekLabel(period),
-                            style = MaterialTheme.typography.bodyLarge
+                        style = MaterialTheme.typography.labelLarge
                     )
                 },
-                    trailingIcon = if (isTodayWeek) {
+                modifier = Modifier.padding(vertical = 2.dp),
-                        {
+                border = if (isTodayWeek && !selected) {
-                            Text(
+                    FilterChipDefaults.filterChipBorder(
-                                "сегодня",
+                        borderColor = MaterialTheme.colorScheme.primary,
-                                style = MaterialTheme.typography.labelMedium,
+                        borderWidth = 1.dp,
-                                color = MaterialTheme.colorScheme.primary
+                        enabled = true,
+                        selected = false
                     )
-                        }
                 } else {
-                        null
+                    FilterChipDefaults.filterChipBorder(enabled = true, selected = selected)
                 },
-                    onClick = {
+                shape = RoundedCornerShape(8.dp)
-                        expanded = false
-                        onSelect(period.weekStart)
-                    }
             )
         }
     }
-    }
 }
 
 @Composable
@@ -286,48 +255,22 @@ private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
         } else {
             slot.lessons.forEach { lesson ->
                 Column(Modifier.fillMaxWidth().padding(vertical = 2.dp)) {
-                    var any = false
-                    if(lesson.type != LessonType.OTHER) {
                     Text(
-                            lesson.type.label,
+                        lesson.subject?.takeIf { it.isNotBlank() } ?: lesson.raw,
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
-                        )
-                        any = true
-                    }
-
-                    val subject = lesson.subject?.takeIf { it.isNotBlank() } ?: lesson.raw
-                    if(subject.isNotEmpty()) {
-                        Text(
-                            subject,
                         style = MaterialTheme.typography.bodyLarge
                     )
-                        any = true
+                    Text(
-                    }
+                        listOfNotNull(
-
+                            lesson.type.label,
-                    val meta = listOfNotNull(
                             lesson.subgroup,
                             lesson.teacher,
                             lesson.room
-                    ).filter { it.isNotBlank() }.joinToString(" · ")
+                        )
-
+                            .filter { it.isNotBlank() }
-                    if(meta.isNotEmpty()) {
+                            .joinToString(" · "),
-                        Text(
-                            meta,
                         style = MaterialTheme.typography.bodySmall,
                         color = MaterialTheme.colorScheme.onSurfaceVariant
                     )
-                        any = true
-                    }
-
-                    if(!any) {
-                        Text(
-                            "-",
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
-                        )
-                    }
-
                 }
             }
         }

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

@@ -1,6 +1,7 @@
 package agzam.vyatsu.ui.schedule
 
 import agzam.vyatsu.domain.ScheduleDates
+import agzam.vyatsu.domain.model.Day
 import agzam.vyatsu.domain.model.Schedule
 import agzam.vyatsu.domain.repository.GroupRepository
 import agzam.vyatsu.domain.repository.PreferencesRepository
@@ -11,7 +12,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import java.time.LocalDate
 
 class ScheduleViewModel(
     private val scheduleRepository: ScheduleRepository,
@@ -30,7 +30,7 @@ class ScheduleViewModel(
             if (groupId != null) {
                 selectGroup(groupId)
             } else {
-            _uiState.value = _uiState.value.copy(noGroup = true, groupName = null)
+                _uiState.value = _uiState.value.copy(noGroup = true)
             }
         }
     }
@@ -39,104 +39,32 @@ class ScheduleViewModel(
         currentGroupId = groupId
         viewModelScope.launch {
             preferencesRepository.setSelectedGroup(groupId)
-            val groupName = groupRepository.getGroups().firstOrNull { it.id == groupId }?.name
+            val groupName = groupRepository.getGroup(groupId)?.name
-
+            _uiState.value = _uiState.value.copy(noGroup = false, groupName = groupName)
-            val savedWeekStart = runCatching {
-                preferencesRepository.selectedWeekStart()?.let(LocalDate::parse)
-            }.getOrNull()
-            val savedDayDate = runCatching {
-                preferencesRepository.selectedDayDate()?.let(LocalDate::parse)
-            }.getOrNull()
-            _uiState.value = _uiState.value.copy(
-                noGroup = false,
-                groupName = groupName,
-                weekStart = savedWeekStart,
-                dayDate = savedDayDate
-            )
 
             launch {
                 scheduleRepository.observeSchedule(groupId).collect { schedule ->
-                    currentGroupId?.let { applySchedule(schedule) }
+                    currentGroupId?.let {
+                        val days = schedule?.days.orEmpty()
+                        val today = todayIndex(days)
+                        val current = _uiState.value
+                        val selected = current.selectedIndex.takeIf { i -> i in days.indices } ?: today
+                        _uiState.value = current.copy(
+                            schedule = schedule,
+                            todayIndex = today,
+                            selectedIndex = selected
+                        )
+                    }
                 }
             }
 
             launch {
-                syncIfMissingToday(groupId)
-            }
-        }
-    }
-
-    private suspend fun applySchedule(schedule: Schedule?) {
-        val current = _uiState.value
-        if (schedule == null || schedule.periods.isEmpty()) {
-            _uiState.value = current.copy(schedule = schedule, todayDate = null)
-            return
-        }
-        val today = ScheduleDates.moscowToday()
-        val todayDate = if (schedule.periodOf(today) != null) today else null
-
-        val weekStart = when {
-            schedule.periods.any { it.weekStart == current.weekStart } -> current.weekStart!!
-            todayDate != null -> schedule.periodOf(todayDate)!!.weekStart
-            else -> schedule.periods.first().weekStart
-        }
-        val period = schedule.periods.first { it.weekStart == weekStart }
-        val weekDays = schedule.daysOf(period)
-
-        val dayDate = when {
-            weekDays.any { it.date == current.dayDate } -> current.dayDate
-            weekDays.any { it.date == todayDate } -> todayDate
-            else -> weekDays.firstOrNull()?.date
-        }
-
-        preferencesRepository.setSelectedWeekStart(weekStart.toString())
-        dayDate?.let { preferencesRepository.setSelectedDayDate(it.toString()) }
-
-        _uiState.value = current.copy(
-            schedule = schedule,
-            weekStart = weekStart,
-            dayDate = dayDate,
-            todayDate = todayDate
-        )
-    }
-
-    fun selectWeek(weekStart: LocalDate) {
-        val state = _uiState.value
-        val schedule = state.schedule ?: return
-        val period = schedule.periods.firstOrNull { it.weekStart == weekStart } ?: return
-        viewModelScope.launch {
-            val today = ScheduleDates.moscowToday()
-            val weekDays = schedule.daysOf(period)
-            val dayDate = when {
-                weekDays.any { it.date == today } -> today
-                else -> weekDays.firstOrNull()?.date
-            }
-            preferencesRepository.setSelectedWeekStart(weekStart.toString())
-            dayDate?.let { preferencesRepository.setSelectedDayDate(it.toString()) }
-            _uiState.value = _uiState.value.copy(weekStart = weekStart, dayDate = dayDate)
-        }
-    }
-
-    fun selectDay(date: LocalDate) {
-        val state = _uiState.value
-        val schedule = state.schedule ?: return
-        val period = schedule.periodOf(date) ?: return
-        viewModelScope.launch {
-            preferencesRepository.setSelectedWeekStart(period.weekStart.toString())
-            preferencesRepository.setSelectedDayDate(date.toString())
-            _uiState.value = _uiState.value.copy(weekStart = period.weekStart, dayDate = date)
-        }
-    }
-
-    private suspend fun syncIfMissingToday(groupId: String) {
-        val schedule = scheduleRepository.getSchedule(groupId)
-        val today = ScheduleDates.moscowToday()
-        val hasTodayPeriod = schedule?.periodOf(today) != null
-        if (hasTodayPeriod) return
                 _uiState.value = _uiState.value.copy(isSyncing = true)
                 scheduleRepository.sync(groupId)
                 _uiState.value = _uiState.value.copy(isSyncing = false)
             }
+        }
+    }
 
     fun switchGroup() {
         viewModelScope.launch {
@@ -151,10 +79,23 @@ class ScheduleViewModel(
         viewModelScope.launch {
             _uiState.value = _uiState.value.copy(isRefreshing = true)
             scheduleRepository.sync(groupId)
-            _uiState.value = _uiState.value.copy(isRefreshing = false)
+            val current = _uiState.value
+            val days = current.schedule?.days.orEmpty()
+            val today = todayIndex(days)
+            _uiState.value = current.copy(
+                isRefreshing = false,
+                todayIndex = today,
+                selectedIndex = current.selectedIndex.takeIf { it in days.indices } ?: today
+            )
         }
     }
 
+    fun selectDay(index: Int) {
+        val days = _uiState.value.schedule?.days.orEmpty()
+        if (index !in days.indices) return
+        _uiState.value = _uiState.value.copy(selectedIndex = index)
+    }
+
     fun clearAll() {
         val groupId = currentGroupId ?: return
         viewModelScope.launch {
@@ -165,21 +106,29 @@ class ScheduleViewModel(
     fun clearSelectedPeriod() {
         val state = _uiState.value
         val schedule = state.schedule ?: return
-        val weekStart = state.weekStart ?: return
+        val day = schedule.days.getOrNull(state.selectedIndex) ?: return
-        val period = schedule.periods.firstOrNull { it.weekStart == weekStart } ?: return
+        val period = schedule.periodOf(day.date) ?: return
         viewModelScope.launch {
             scheduleRepository.clearPeriod(schedule.groupId, period)
         }
     }
+
+    private fun todayIndex(days: List<Day>): Int {
+        if (days.isEmpty()) return 0
+        val today = ScheduleDates.moscowToday()
+        val exact = days.indexOfFirst { it.date == today }
+        if (exact >= 0) return exact
+        val next = days.indexOfFirst { !it.date.isBefore(today) }
+        return if (next >= 0) next else days.lastIndex
+    }
 }
 
 data class ScheduleUiState(
     val noGroup: Boolean = false,
     val isRefreshing: Boolean = false,
     val isSyncing: Boolean = false,
-    val schedule: Schedule? = null,
     val groupName: String? = null,
-    val weekStart: LocalDate? = null,
+    val schedule: Schedule? = null,
-    val dayDate: LocalDate? = null,
+    val todayIndex: Int = 0,
-    val todayDate: LocalDate? = null
+    val selectedIndex: Int = 0
 )