fix: possible moshi deleting due to proguard

fix: reverting separate release versions by architecture
fix: added proguard rules
2026-09-18 11:36:25 +03:00 · 2026-09-18 10:01:02 +03:00 · 2026-09-18 09:48:14 +03:00 · 2026-09-18 09:30:19 +03:00 · 2026-09-18 02:30:56 +03:00 · 2026-09-18 02:16:46 +03:00
34 changed files with 1909 additions and 263 deletions
@@ -30,9 +30,17 @@ jobs:
        # Ставим JDK вручную и явно прописываем JAVA_HOME.
        # actions/setup-java не всегда передаёт JAVA_HOME дальше в Gitea Actions.
        run: |
-          apt-get update
-          apt-get install -y openjdk-17-jdk-headless unzip wget
-          echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64" >> "$GITHUB_ENV"
+          set -euxo pipefail
+          cd /tmp
+          wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz
+          tar -xzf OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz -C /opt
+          mv /opt/jdk-17.0.12+7 /opt/java17
+          export JAVA_HOME=/opt/java17
+          export PATH=$JAVA_HOME/bin:$PATH
+          echo "JAVA_HOME=/opt/java17" >> $GITHUB_ENV
+          echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+          java -version
+          javac -version

      - name: Install Android SDK
        # Устанавливаем command-line tools и нужные компоненты SDK,
@@ -66,9 +74,9 @@ jobs:
            SUFFIX=$((SUFFIX + 1))
            TAG="v${BASE}.${SUFFIX}"
          done
-          echo "version_name=$BASE" >> "$GITHUB_OUTPUT"
+          echo "version_name=$TAG" >> "$GITHUB_OUTPUT"
          echo "version_tag=$TAG" >> "$GITHUB_OUTPUT"
-          echo "Generated version: $BASE (tag: $TAG)"
+          echo "Generated version: $BASE"

      - name: Restore keystore from secret
        # Ключ подписи передаётся как base64-секрет и декодируется в файл.
@@ -85,6 +93,9 @@ 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 }}
@@ -112,9 +123,3 @@ jobs:
          files: ${{ steps.apk.outputs.apk_path }}
          token: ${{ secrets.GITEA_TOKEN }}
          server_url: ${{ gitea.server_url }}
-
-      - name: Upload APK as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: vyatsu-schedule-${{ steps.version.outputs.version_name }}
-          path: ${{ steps.apk.outputs.apk_path }}
@@ -17,7 +17,9 @@ android {
        minSdk = 28
        targetSdk = 36
        versionCode = 1
-        versionName = "1.0"
+        // В продакшн-сборке версию приложения подставляет CI (env APP_VERSION = дата ГГГГ.ММ.ДД).
+        // Локально и при отсутствии переменной — fallback "1.0".
+        versionName = System.getenv("APP_VERSION") ?: "debug"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -38,7 +40,8 @@ android {

    buildTypes {
        release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
            proguardFiles(
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
@@ -51,6 +54,7 @@ android {
    }
    testOptions {
        unitTests.isReturnDefaultValues = true
+        unitTests.all { it.maxHeapSize = "16m" }
    }
    compileOptions {
        sourceCompatibility = JavaVersion.VERSION_11
@@ -19,3 +19,22 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+# Игнорировать отсутствие класса декодера JP2 в PdfBox-Android
+-dontwarn com.gemalto.jp2.JP2Decoder
+# На всякий случай, если PdfBox ссылается на другие отсутствующие библиотеки (например, ICU для текста)
+-dontwarn com.tom_roush.pdfbox.**
+
+# Запретить R8 удалять и переименовывать внутренности PdfBox-Android
+-keep class com.tom_roush.pdfbox.** { *; }
+-keep interface com.tom_roush.pdfbox.** { *; }
+
+# Moshi удаляется proguard
+-keepnames @com.squareup.moshi.JsonClass class *
+-keep class **JsonAdapter {
+    public <init>(...);
+    <fields>;
+}
+-keepclassmembers @com.squareup.moshi.JsonClass class * {
+    synthetic <init>(...);
+}
@@ -0,0 +1,427 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "3fd5eda9ac5e29fc96371ecf246e437c",
+    "entities": [
+      {
+        "tableName": "groups",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `faculty` TEXT NOT NULL, `lastSyncedAt` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "faculty",
+            "columnName": "faculty",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastSyncedAt",
+            "columnName": "lastSyncedAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "group_periods",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `groupId` TEXT NOT NULL, `season` TEXT NOT NULL, `weekStart` INTEGER NOT NULL, `weekEnd` INTEGER NOT NULL, FOREIGN KEY(`groupId`) REFERENCES `groups`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "groupId",
+            "columnName": "groupId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "season",
+            "columnName": "season",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weekStart",
+            "columnName": "weekStart",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weekEnd",
+            "columnName": "weekEnd",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_group_periods_groupId",
+            "unique": false,
+            "columnNames": [
+              "groupId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_group_periods_groupId` ON `${TABLE_NAME}` (`groupId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "groups",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "groupId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "schedules",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `groupId` TEXT NOT NULL, `season` TEXT NOT NULL, `weekStart` INTEGER NOT NULL, `weekEnd` INTEGER NOT NULL, `lastSyncedAt` INTEGER NOT NULL, FOREIGN KEY(`groupId`) REFERENCES `groups`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "groupId",
+            "columnName": "groupId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "season",
+            "columnName": "season",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weekStart",
+            "columnName": "weekStart",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weekEnd",
+            "columnName": "weekEnd",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastSyncedAt",
+            "columnName": "lastSyncedAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_schedules_groupId",
+            "unique": false,
+            "columnNames": [
+              "groupId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_schedules_groupId` ON `${TABLE_NAME}` (`groupId`)"
+          },
+          {
+            "name": "index_schedules_groupId_season_weekStart",
+            "unique": true,
+            "columnNames": [
+              "groupId",
+              "season",
+              "weekStart"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_schedules_groupId_season_weekStart` ON `${TABLE_NAME}` (`groupId`, `season`, `weekStart`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "groups",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "groupId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "days",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scheduleId` INTEGER NOT NULL, `date` INTEGER NOT NULL, FOREIGN KEY(`scheduleId`) REFERENCES `schedules`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scheduleId",
+            "columnName": "scheduleId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_days_scheduleId",
+            "unique": false,
+            "columnNames": [
+              "scheduleId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_days_scheduleId` ON `${TABLE_NAME}` (`scheduleId`)"
+          },
+          {
+            "name": "index_days_date",
+            "unique": false,
+            "columnNames": [
+              "date"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_days_date` ON `${TABLE_NAME}` (`date`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "schedules",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "scheduleId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "lessons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `dayId` INTEGER NOT NULL, `date` INTEGER NOT NULL, `slotIndex` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `lessonIndex` INTEGER NOT NULL, `raw` TEXT NOT NULL, `room` TEXT, `groupName` TEXT, `subgroup` TEXT, `subject` TEXT, `type` TEXT NOT NULL, `teacher` TEXT, FOREIGN KEY(`dayId`) REFERENCES `days`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dayId",
+            "columnName": "dayId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "slotIndex",
+            "columnName": "slotIndex",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lessonIndex",
+            "columnName": "lessonIndex",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "raw",
+            "columnName": "raw",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "groupName",
+            "columnName": "groupName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "subgroup",
+            "columnName": "subgroup",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_lessons_dayId",
+            "unique": false,
+            "columnNames": [
+              "dayId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_lessons_dayId` ON `${TABLE_NAME}` (`dayId`)"
+          },
+          {
+            "name": "index_lessons_date",
+            "unique": false,
+            "columnNames": [
+              "date"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_lessons_date` ON `${TABLE_NAME}` (`date`)"
+          },
+          {
+            "name": "index_lessons_subject",
+            "unique": false,
+            "columnNames": [
+              "subject"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_lessons_subject` ON `${TABLE_NAME}` (`subject`)"
+          },
+          {
+            "name": "index_lessons_room",
+            "unique": false,
+            "columnNames": [
+              "room"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_lessons_room` ON `${TABLE_NAME}` (`room`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "days",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "dayId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "preferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        }
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '3fd5eda9ac5e29fc96371ecf246e437c')"
+    ]
+  }
+}
@@ -3,13 +3,14 @@
    xmlns:tools="http://schemas.android.com/tools">

    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />

    <application
        android:name=".VyatsuApplication"
        android:allowBackup="true"
        android:dataExtractionRules="@xml/data_extraction_rules"
        android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/icon"
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
@@ -25,6 +26,16 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
    </application>

 </manifest>
@@ -5,6 +5,10 @@ import agzam.vyatsu.ui.groups.GroupPickerScreen
 import agzam.vyatsu.ui.groups.GroupPickerViewModel
 import agzam.vyatsu.ui.home.HomeScreen
 import agzam.vyatsu.ui.schedule.ScheduleViewModel
+import agzam.vyatsu.ui.settings.UpdateViewModel
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -19,11 +23,36 @@ fun AppRoot() {
    val container = app.container

    val scheduleViewModel: ScheduleViewModel = viewModel(factory = scheduleFactory(container))
-    val groupPickerViewModel: GroupPickerViewModel = viewModel(factory = groupPickerFactory(container))
+    val updateViewModel: UpdateViewModel = viewModel(factory = updateFactory(container))

    val state by scheduleViewModel.uiState.collectAsState()
+    val showFirstRunDialog by updateViewModel.showFirstRunDialog.collectAsState()
+
+    if (showFirstRunDialog) {
+        AlertDialog(
+            onDismissRequest = { updateViewModel.onFirstRunDecision(false) },
+            title = { Text("Автоматические обновления") },
+            text = {
+                Text(
+                    "Разрешить автоматически проверять и устанавливать " +
+                        "новые версии приложения?"
+                )
+            },
+            confirmButton = {
+                TextButton(onClick = { updateViewModel.onFirstRunDecision(true) }) {
+                    Text("Разрешить")
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { updateViewModel.onFirstRunDecision(false) }) {
+                    Text("Не надо")
+                }
+            }
+        )
+    }

    if (state.noGroup) {
+        val groupPickerViewModel: GroupPickerViewModel = viewModel(factory = groupPickerFactory(container))
        GroupPickerScreen(
            viewModel = groupPickerViewModel,
            onGroupPicked = { group -> scheduleViewModel.selectGroup(group.id) }
@@ -32,6 +61,7 @@ fun AppRoot() {
    }
    HomeScreen(
        scheduleViewModel = scheduleViewModel,
+        updateViewModel = updateViewModel,
        onSwitchGroup = { scheduleViewModel.switchGroup() }
    )
 }
@@ -41,5 +71,6 @@ private class SimpleFactory<T : ViewModel>(private val create: () -> T) : ViewMo
    override fun <T : ViewModel> create(modelClass: Class<T>): T = create() as T
 }

-private fun scheduleFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { ScheduleViewModel(c.scheduleRepository, c.preferencesRepository) }
+private fun scheduleFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { ScheduleViewModel(c.scheduleRepository, c.preferencesRepository, c.groupRepository) }
 private fun groupPickerFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { GroupPickerViewModel(c.groupRepository) }
+private fun updateFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { UpdateViewModel(c.appUpdater, c.preferencesRepository) }
@@ -10,6 +10,8 @@ class MainActivity : ComponentActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        enableEdgeToEdge()
+        val container = (application as VyatsuApplication).container
+        container.appUpdater.autoCheckAndInstall()
        setContent {
            VyatsuScheduleTheme {
                AppRoot()
@@ -7,12 +7,13 @@ import androidx.room.TypeConverters
@Database(
    entities = [
        GroupEntity::class,
+        GroupPeriodEntity::class,
        ScheduleEntity::class,
        DayEntity::class,
        LessonEntity::class,
        PreferenceEntity::class
    ],
-    version = 2,
+    version = 3,
    exportSchema = true
 )
@TypeConverters(Converters::class)
@@ -25,4 +25,13 @@ interface GroupDao {

    @Query("SELECT MAX(lastSyncedAt) FROM groups")
    suspend fun maxSyncedAt(): Long?
+
+    @Query("SELECT * FROM group_periods WHERE groupId = :groupId AND weekEnd >= :fromEpochDay ORDER BY weekStart")
+    suspend fun getCurrentAndFuturePeriods(groupId: String, fromEpochDay: Long): List<GroupPeriodEntity>
+
+    @Query("DELETE FROM group_periods")
+    suspend fun deleteAllPeriods()
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertPeriods(periods: List<GroupPeriodEntity>)
 }
@@ -8,9 +8,5 @@ data class GroupEntity(
    @PrimaryKey val id: String,
    val name: String,
    val faculty: String,
-    val autumnFirst: Long?,
-    val autumnSecond: Long?,
-    val springFirst: Long?,
-    val springSecond: Long?,
    val lastSyncedAt: Long
 )
@@ -0,0 +1,28 @@
+package agzam.vyatsu.data.local
+
+import agzam.vyatsu.domain.model.Season
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
+// Все опубликованные на сайте 2-недельные периоды группы, включая ещё не начавшиеся.
+@Entity(
+    tableName = "group_periods",
+    foreignKeys = [
+        ForeignKey(
+            entity = GroupEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["groupId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ],
+    indices = [Index("groupId")]
+)
+data class GroupPeriodEntity(
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    val groupId: String,
+    val season: Season,
+    val weekStart: Long,
+    val weekEnd: Long
+)
@@ -27,4 +27,16 @@ interface PreferencesDao {

    @Query("INSERT OR REPLACE INTO preferences(key, value) VALUES('selectedDayDate', :date)")
    suspend fun setSelectedDayDate(date: String)
+
+    @Query("SELECT value FROM preferences WHERE key = 'autoUpdateEnabled'")
+    suspend fun autoUpdateEnabled(): String?
+
+    @Query("INSERT OR REPLACE INTO preferences(key, value) VALUES('autoUpdateEnabled', :enabled)")
+    suspend fun setAutoUpdateEnabled(enabled: String)
+
+    @Query("SELECT value FROM preferences WHERE key = 'autoUpdateAsked'")
+    suspend fun autoUpdateAsked(): String?
+
+    @Query("INSERT OR REPLACE INTO preferences(key, value) VALUES('autoUpdateAsked', :asked)")
+    suspend fun setAutoUpdateAsked(asked: String)
 }
@@ -3,8 +3,7 @@ package agzam.vyatsu.data.remote
 import agzam.vyatsu.domain.model.DateRange
 import agzam.vyatsu.domain.model.Group
 import agzam.vyatsu.domain.model.Season
-import android.util.Log
-import org.jsoup.Jsoup
+import java.io.InputStream

 /**
 * Основано на https://github.com/alirzaev/vyatsu-schedule-backend/blob/master/utils/extractors.py
@@ -14,6 +13,13 @@ object GroupsParser {

    private val groupPattern = Regex("""/reports/schedule/Group/(\d{4,})_([12])_(\d{8})_(\d{8})\.pdf""")

+    private val grpIdPattern = Regex("""data-grp_period_id="(\d+)"""")
+    private val parenthesized = Regex("""\(.*?\)\s?""")
+
+    private const val CHUNK_SIZE = 8192
+    private const val MAX_SLICE = 1 shl 16      // 64 KiB — защита от аномально длинных единиц
+    private const val MAX_PENDING = 1 shl 20    // 1 MiB — жёсткий потолок буфера
+
    private val shorthands = mapOf(
        "Институт биологии и биотехнологии (факультет)(ОРУ)" to "ИББТ",
        "Институт химии и экологии (факультет) (ОРУ)" to "ИнХимЭк",
@@ -33,41 +39,118 @@ object GroupsParser {
    )

    /**
-     * Извлекает список групп с HTML страницы
+     * Стриминговый парсер страницы групп: читает тело ответа по чанкам и
+     * разбирает его на лету, не материализуя весь HTML в память.
+     *
+     * Страница весит ~2.6MB, а на устройствах с маленькой кучей даже
+     * одиночный String такого размера — критично (jsoup-DOM и подавно приводил к OOM).
+     * За один проход извлекаем и список групп, и диапазоны дат из PDF-ссылок.
     */
-    fun parseGroups(html: String): List<Group> {
-        val doc = Jsoup.parse(html)
-        val container = doc.selectFirst("div.column-center_rasp") ?: return emptyList()
-        val tables = container.select("table[style~=border: none !important]")
+    fun parseStream(input: InputStream): ParsedGroups {
+        val reader = input.bufferedReader(Charsets.UTF_8)
+        val buf = CharArray(CHUNK_SIZE)
+        val pending = StringBuilder(CHUNK_SIZE * 2)
+        val groups = ArrayList<Group>()
+        val ranges = HashMap<String, HashMap<Season, MutableList<DateRange>>>()
+        var faculty = ""

-        return tables.flatMap { table ->
-            table.select("> tbody > tr, > tr").flatMap { row ->
-                Log.v("ROW", row.html());
-                val faculty = shortname(row.selectFirst("div.fak_name")?.text().orEmpty()) //
+        fun addRanges(text: String) {
+            for (m in groupPattern.findAll(text)) {
+                val groupId = m.groupValues[1]
+                val season = if (m.groupValues[2] == "1") Season.AUTUMN else Season.SPRING
+                val range = DateRange(m.groupValues[3], m.groupValues[4])
+                ranges.getOrPut(groupId) {
+                    hashMapOf(Season.AUTUMN to ArrayList(), Season.SPRING to ArrayList())
+                }.getOrPut(season) { ArrayList() }.add(range)
+            }
+        }

-                row.select("div.grpPeriod").map { grp ->
-                    Group(
-                        id = grp.attr("data-grp_period_id").dropLast(1),
-                        name = removeParenthesized(grp.text()),
+        while (true) {
+            val n = reader.read(buf)
+            if (n < 0) break
+            pending.append(buf, 0, n)
+
+            var pos = 0
+            while (pos < pending.length) {
+                val divAt = pending.indexOf("<div", pos)
+                val aAt = pending.indexOf("<a", pos)
+                val tagStart = when {
+                    divAt < 0 -> aAt
+                    aAt < 0 -> divAt
+                    else -> minOf(divAt, aAt)
+                }
+                if (tagStart < 0) {
+                    // хвостовой текст без div-тегов — обычный текст страницы
+                    pos = pending.length
+                    break
+                }
+                if (tagStart > pos) {
+                    addRanges(pending.substring(pos, tagStart))
+                }
+                val tagEnd = findTagEnd(pending, tagStart)
+                if (tagEnd < 0) break // тег не дочитан — ждём следующий чанк
+                val tagText = pending.substring(tagStart, tagEnd + 1)
+
+                val isDiv = tagText.startsWith("<div")
+                val isFakName = isDiv && tagText.contains("class=\"fak_name\"")
+                val isGrpPeriod = isDiv && tagText.contains("class=\"grpPeriod\"")
+                if (isFakName || isGrpPeriod) {
+                    val closeDiv = pending.indexOf("</div>", tagEnd + 1)
+                    if (closeDiv < 0) break // содержимое не дочитано — ждём следующий чанк
+                    addRanges(tagText)
+                    val content = pending.substring(tagEnd + 1, closeDiv)
+                    if (isFakName) {
+                        val name = content.trim()
+                        if (name.isNotEmpty()) faculty = shortname(name)
+                    } else {
+                        val m = grpIdPattern.find(tagText)
+                        if (m != null) {
+                            groups += Group(
+                                id = m.groupValues[1].dropLast(1),
+                                name = removeParenthesized(content),
                                faculty = faculty
                            )
                        }
                    }
-        }
+                    pos = closeDiv + 6
+                } else {
+                    addRanges(tagText)
+                    pos = tagEnd + 1
                }

-    fun parseDateRanges(html: String): Map<String, Map<Season, List<DateRange>>> {
-        val result = HashMap<String, HashMap<Season, MutableList<DateRange>>>()
-        groupPattern.findAll(html).forEach { m ->
-            val groupId = m.groupValues[1]
-            val season = if (m.groupValues[2] == "1") Season.AUTUMN else Season.SPRING
-            val range = DateRange(m.groupValues[3], m.groupValues[4])
-            result
-                .getOrPut(groupId) { hashMapOf(Season.AUTUMN to mutableListOf(), Season.SPRING to mutableListOf()) }
-                .getOrPut(season) { mutableListOf() }
-                .add(range)
+                if (pos > MAX_SLICE) {
+                    pending.delete(0, pos)
+                    pos = 0
                }
-        return result
+            }
+            if (pos > 0 && pos <= pending.length) {
+                pending.delete(0, pos)
+            }
+            if (pending.length > MAX_PENDING) {
+                // на странице нет настолько длинных конструкций; страховка от аномалий
+                pending.delete(0, pending.length - MAX_SLICE)
+            }
+        }
+        return ParsedGroups(groups, ranges)
+    }
+
+    /** Ищет конец HTML-тега — символ '>' вне кавычек. */
+    private fun findTagEnd(s: CharSequence, start: Int): Int {
+        var i = start
+        var quote = 0.toChar()
+        while (i < s.length) {
+            val c = s[i]
+            if (quote != 0.toChar()) {
+                if (c == quote) quote = 0.toChar()
+            } else {
+                when (c) {
+                    '"', '\'' -> quote = c
+                    '>' -> return i
+                }
+            }
+            i++
+        }
+        return -1
    }

    private fun shortname(name: String): String {
@@ -76,5 +159,10 @@ object GroupsParser {
        return if (sh != null) "$sh ($stripped)" else stripped
    }

-    private fun removeParenthesized(name: String): String = name.replace(Regex("""\(.*?\)\s?"""), "").trim()
+    private fun removeParenthesized(name: String): String = name.replace(parenthesized, "").trim()
 }
+
+data class ParsedGroups(
+    val groups: List<Group>,
+    val dateRanges: Map<String, Map<Season, List<DateRange>>>
+)
@@ -5,6 +5,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import java.io.InputStream
 import java.util.concurrent.TimeUnit

 /**
@@ -35,4 +36,15 @@ object VyatsuHttpClient {
        }
    }

+    /**
+     * Открывает потоковое тело ответа. Вызывающий обязан закрыть
+     * возвращённый [InputStream], чтобы вернуть соединение в пул.
+     */
+    suspend fun openStream(url: String): InputStream = withContext(Dispatchers.IO) {
+        val resp = client.newCall(Request.Builder().url(url).build()).execute()
+        Log.d(TAG, "GET $url -> ${resp.code}")
+        check(resp.isSuccessful) { "HTTP ${resp.code} for $url" }
+        resp.body!!.byteStream()
+    }
+
 }
@@ -38,7 +38,7 @@ class Pdf2Table(page: PDPage) : PDFGraphicsStreamEngine(page) {

    private val svgBuilder = StringBuilder()
    private val currentPath = StringBuilder()
-    private val tableSvg = StringBuilder()
+    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">
+            <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%;'>
                <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) "#f" else "#0"}${if (ii % 2 == 0) "f0" else "00"}' x='$left' y='$top' width='${right-left}' height='${bottom-top}'/>\n")
+                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")
            }
            columns.add(TableColumn(left, right-left, cells))
        }
@@ -2,6 +2,7 @@ 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
@@ -25,6 +26,10 @@ 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 {
@@ -35,6 +40,8 @@ object PdfScheduleParser {
        }

        val days = mutableListOf<Day>()
+        var group: String? = null
+
        try {
            for (pageIndex in 0 until doc.numberOfPages) {
                Log.v(TAG, "============ Page $pageIndex ============")
@@ -45,12 +52,6 @@ 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")

                // Парсинг текста
@@ -60,6 +61,11 @@ 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] // Колонка с инофрмацией о паре
@@ -100,10 +106,21 @@ object PdfScheduleParser {
                    }
                }

-
                for (dayCell in daysColumn.cells) {
                    val day = content(dayCell).split(' ')
-                    if(day.size != 2) continue // XXX: добавить защиту от заголовка и выбрасывать исключения вместо пропуска?
+                    if(day.size == 1) {
+                        Log.v(TAG, "day.first(): ${day.first()}")
+                    }
+                    if(day.size == 1 && day.first() == "День") {
+                        val groupCell = select(lessonsColumn, dayCell).firstOrNull() ?: continue
+                        group = content(groupCell)
+                        Log.v(TAG, "Group: $group")
+                        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>()
@@ -124,7 +141,55 @@ 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.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))
                    }
@@ -133,6 +198,19 @@ 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,  "====")
+                Log.v(SVG_TAG+ "-" + (pageIndex+1),  "====")
+                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)
@@ -7,6 +7,7 @@ import com.tom_roush.pdfbox.text.TextPosition
 * Парсер блоков текста из PDF
 * @author Agzam
 */
+
 class PdfTextParser : PDFTextStripper() {

    data class TextBlock(
@@ -25,9 +26,32 @@ class PdfTextParser : PDFTextStripper() {
    }

    override fun writeString(string: String?, textPositions: MutableList<TextPosition>?) {
-        if (!string.isNullOrBlank() && !textPositions.isNullOrEmpty()) {
-            val first = textPositions.first()
-            val last = textPositions.last()
+        if (textPositions.isNullOrEmpty()) return
+
+        val currentWordChars = mutableListOf<TextPosition>()
+
+        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
@@ -36,10 +60,17 @@ class PdfTextParser : PDFTextStripper() {

        val x = matrix.translateX
        val y = matrix.translateY - first.heightDir
-
        val height = first.heightDir

-            blocks.add(TextBlock(string.trim(), x, currentPage.mediaBox.height - y - height, totalWidth, height, rotation))
-        }
+        blocks.add(
+            TextBlock(
+                text = wordText,
+                x = x,
+                y = currentPage.mediaBox.height - y - height,
+                width = totalWidth,
+                height = height,
+                rotation = rotation
+            )
+        )
    }
 }
@@ -0,0 +1,56 @@
+package agzam.vyatsu.data.remote.update
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.Moshi
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.io.IOException
+
+@JsonClass(generateAdapter = true)
+data class GiteaRelease(
+    @Json(name = "tag_name") val tagName: String?,
+    val name: String?,
+    val body: String?,
+    val assets: List<GiteaAsset> = emptyList()
+)
+
+@JsonClass(generateAdapter = true)
+data class GiteaAsset(
+    val name: String?,
+    @Json(name = "browser_download_url") val browserDownloadUrl: String?
+)
+
+class GiteaReleaseApi(
+    private val client: OkHttpClient,
+    private val baseUrl: String = "https://vantablacktea.ddns.net",
+    private val repoPath: String = "agzam/vyatsu-schedule"
+) {
+
+    private val moshi = Moshi.Builder().build()
+    private val releaseAdapter = moshi.adapter(GiteaRelease::class.java)
+
+    /**
+     * Возвращает последний релиз или null, если релизов ещё нет (404).
+     */
+    suspend fun latestRelease(): GiteaRelease? {
+        val url = "$baseUrl/api/v1/repos/$repoPath/releases/latest"
+        val request = Request.Builder().url(url).get().build()
+
+        return client.newCall(request).execute().use { resp ->
+            when {
+                resp.code == 404 -> null
+                !resp.isSuccessful -> throw IOException("HTTP ${resp.code} при запросе релиза")
+                else -> {
+                    val body = resp.body ?: throw IOException("Пустой ответ сервера")
+                    releaseAdapter.fromJson(body.source())
+                }
+            }
+        }
+    }
+
+    fun apkDownloadUrl(release: GiteaRelease): String? =
+        release.assets
+            .firstOrNull { it.name?.endsWith(".apk", ignoreCase = true) == true }
+            ?.browserDownloadUrl
+}
@@ -2,16 +2,18 @@ package agzam.vyatsu.data.repository

 import agzam.vyatsu.data.local.GroupDao
 import agzam.vyatsu.data.local.GroupEntity
+import agzam.vyatsu.data.local.GroupPeriodEntity
 import agzam.vyatsu.data.remote.GroupsParser
 import agzam.vyatsu.data.remote.VyatsuHttpClient
 import agzam.vyatsu.data.remote.VyatsuUrls
 import agzam.vyatsu.domain.ScheduleDates
 import agzam.vyatsu.domain.model.Group
-import agzam.vyatsu.domain.model.Season
 import agzam.vyatsu.domain.repository.GroupRepository
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext

 class GroupRepositoryImpl(
    private val groupDao: GroupDao,
@@ -40,28 +42,35 @@ class GroupRepositoryImpl(
    }

    private suspend fun refresh() {
-        val html = VyatsuHttpClient.getText(VyatsuUrls.GROUPS_PAGE)
-        val groups = GroupsParser.parseGroups(html)
-        val ranges = GroupsParser.parseDateRanges(html)
-        val entities = groups.map { group ->
-            val range = ranges[group.id]
-            val autumn = range?.get(Season.AUTUMN)?.lastOrNull()
-            val spring = range?.get(Season.SPRING)?.lastOrNull()
+        val parsed = withContext(Dispatchers.IO) {
+            VyatsuHttpClient.openStream(VyatsuUrls.GROUPS_PAGE).use(GroupsParser::parseStream)
+        }
+        val now = now()
+        groupDao.insertAll(
+            parsed.groups.map { group ->
                GroupEntity(
                    id = group.id,
                    name = group.name,
                    faculty = group.faculty,
-                autumnFirst = autumn?.first?.let(::epochDay),
-                autumnSecond = autumn?.second?.let(::epochDay),
-                springFirst = spring?.first?.let(::epochDay),
-                springSecond = spring?.second?.let(::epochDay),
-                lastSyncedAt = now()
+                    lastSyncedAt = now
                )
            }
-        groupDao.insertAll(entities)
+        )
+        val periods = parsed.groups.flatMap { group ->
+            parsed.dateRanges[group.id].orEmpty().flatMap { (season, ranges) ->
+                ranges.map { range ->
+                    GroupPeriodEntity(
+                        groupId = group.id,
+                        season = season,
+                        weekStart = ScheduleDates.asDate(range.first).toEpochDay(),
+                        weekEnd = ScheduleDates.asDate(range.second).toEpochDay()
+                    )
+                }
+            }
+        }
+        groupDao.deleteAllPeriods()
+        groupDao.insertPeriods(periods)
    }
-
-    private fun epochDay(dateStr: String): Long = ScheduleDates.asDate(dateStr).toEpochDay()

    private fun now(): Long = System.currentTimeMillis()

@@ -13,4 +13,10 @@ class PreferencesRepositoryImpl(
    override suspend fun setSelectedWeekStart(weekStart: String) = dao.setSelectedWeekStart(weekStart)
    override suspend fun selectedDayDate(): String? = dao.selectedDayDate()
    override suspend fun setSelectedDayDate(date: String) = dao.setSelectedDayDate(date)
+
+    override suspend fun autoUpdateEnabled(): Boolean = dao.autoUpdateEnabled() == "true"
+    override suspend fun setAutoUpdateEnabled(enabled: Boolean) = dao.setAutoUpdateEnabled(enabled.toString())
+
+    override suspend fun autoUpdateAsked(): Boolean = dao.autoUpdateAsked() == "true"
+    override suspend fun setAutoUpdateAsked(asked: Boolean) = dao.setAutoUpdateAsked(asked.toString())
 }
@@ -1,6 +1,7 @@
 package agzam.vyatsu.data.repository

 import agzam.vyatsu.data.local.DayEntity
+import agzam.vyatsu.data.local.GroupPeriodEntity
 import agzam.vyatsu.data.local.LessonEntity
 import agzam.vyatsu.data.local.ScheduleDao
 import agzam.vyatsu.data.local.ScheduleEntity
@@ -51,15 +52,38 @@ class ScheduleRepositoryImpl(
            Log.w(TAG, "sync: group $groupId not found in DB")
            return null
        }
-        val season = ScheduleDates.currentSeason()
-        val range = dateRangeFor(group, season) ?: run {
-            Log.w(TAG, "sync: no date range for season $season (group ${group.id})")
+        val today = ScheduleDates.moscowToday().toEpochDay()
+        val periods = groupDao.getCurrentAndFuturePeriods(groupId, today)
+        if (periods.isEmpty()) {
+            Log.w(TAG, "sync: no current/future periods for group ${group.id}")
            return null
        }
-        Log.d(TAG, "sync: season=$season range=[${range.first}, ${range.second}]")

-        return try {
-            val pdfUrl = VyatsuUrls.groupPdfUrl(groupId, season, range)
+        for (period in periods) {
+            syncPeriod(group, period)
+        }
+
+        scheduleDao.trim(groupId, MAX_PERIODS)
+
+        return getSchedule(groupId)
+    }
+
+    private suspend fun syncPeriod(group: GroupEntity, period: GroupPeriodEntity) {
+        val season = period.season
+        val range = DateRange(
+            LocalDate.ofEpochDay(period.weekStart).format(RANGE_FMT),
+            LocalDate.ofEpochDay(period.weekEnd).format(RANGE_FMT)
+        )
+        val existing = scheduleDao.getSchedules(group.id)
+            .firstOrNull { it.season == season && it.weekStart == period.weekStart }
+        val isCurrent = ScheduleDates.moscowToday().toEpochDay() in period.weekStart..period.weekEnd
+        if (existing != null && !isCurrent && now() - existing.lastSyncedAt < STALE_WINDOW_MS) {
+            Log.d(TAG, "sync: period $range up to date, skip")
+            return
+        }
+
+        try {
+            val pdfUrl = VyatsuUrls.groupPdfUrl(group.id, season, range)
            Log.d(TAG, "sync: downloading $pdfUrl")
            val bytes = VyatsuHttpClient.getBytes(pdfUrl)
            Log.d(TAG, "sync: downloaded ${bytes.size} bytes")
@@ -67,29 +91,19 @@ class ScheduleRepositoryImpl(
            val days = PdfScheduleParser.parse(bytes)
            Log.d(TAG, "sync: parsed ${days.size} days")

-            val weekStart = ScheduleDates.asDate(range.first).toEpochDay()
-            val weekEnd = ScheduleDates.asDate(range.second).toEpochDay()
-
-            val existing = scheduleDao.getSchedules(groupId)
-                .firstOrNull { it.season == season && it.weekStart == weekStart }
-            val scheduleId = if (existing != null) existing.id
-            else scheduleDao.insertSchedule(
+            val scheduleId = existing?.id ?: scheduleDao.insertSchedule(
                ScheduleEntity(
-                    groupId = groupId,
+                    groupId = group.id,
                    season = season,
-                    weekStart = weekStart,
-                    weekEnd = weekEnd,
+                    weekStart = period.weekStart,
+                    weekEnd = period.weekEnd,
                    lastSyncedAt = now()
                )
            )
            replaceDays(scheduleId, days)
-
-            scheduleDao.trim(groupId, MAX_PERIODS)
-
-            getSchedule(groupId)
+            Log.d(TAG, "sync: period $range synced")
        } catch (e: Throwable) {
-            Log.e(TAG, "sync: failed for $groupId (${e::class.simpleName}: ${e.message})", e)
-            null
+            Log.e(TAG, "sync: failed for ${group.id} period $range (${e::class.simpleName}: ${e.message})", e)
        }
    }

@@ -157,6 +171,7 @@ 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 }
@@ -186,30 +201,13 @@ class ScheduleRepositoryImpl(
        teacher = teacher
    )

-    private fun dateRangeFor(group: GroupEntity, season: Season): DateRange? {
-        return when (season) {
-            Season.AUTUMN -> if (group.autumnFirst != null && group.autumnSecond != null) {
-                DateRange(
-                    LocalDate.ofEpochDay(group.autumnFirst).format(RANGE_FMT),
-                    LocalDate.ofEpochDay(group.autumnSecond).format(RANGE_FMT)
-                )
-            } else null
-            Season.SPRING -> if (group.springFirst != null && group.springSecond != null) {
-                DateRange(
-                    LocalDate.ofEpochDay(group.springFirst).format(RANGE_FMT),
-                    LocalDate.ofEpochDay(group.springSecond).format(RANGE_FMT)
-                )
-            } else null
-        }
-    }
-
    private fun LocalTime.toMinutesOfDay(): Int = hour * 60 + minute

    private fun now(): Long = System.currentTimeMillis()

    companion object {
        private const val STALE_WINDOW_MS = 12 * 60 * 60 * 1000L
-        private const val MAX_PERIODS = 3
+        private const val MAX_PERIODS = 24
        private const val TAG = "ScheduleRepo"
        private val RANGE_FMT = java.time.format.DateTimeFormatter.ofPattern("ddMMyyyy")
    }
@@ -9,6 +9,7 @@ import agzam.vyatsu.data.repository.ScheduleRepositoryImpl
 import agzam.vyatsu.domain.repository.GroupRepository
 import agzam.vyatsu.domain.repository.PreferencesRepository
 import agzam.vyatsu.domain.repository.ScheduleRepository
+import agzam.vyatsu.update.AppUpdater
 import android.content.Context
 import androidx.room.Room

@@ -37,4 +38,8 @@ class AppContainer(context: Context) {
    val preferencesRepository: PreferencesRepository by lazy {
        PreferencesRepositoryImpl(database.preferencesDao())
    }
+
+    val appUpdater: AppUpdater by lazy {
+        AppUpdater(context.applicationContext, preferencesRepository)
+    }
 }
@@ -8,4 +8,10 @@ interface PreferencesRepository {
    suspend fun setSelectedWeekStart(weekStart: String)
    suspend fun selectedDayDate(): String?
    suspend fun setSelectedDayDate(date: String)
+
+    suspend fun autoUpdateEnabled(): Boolean
+    suspend fun setAutoUpdateEnabled(enabled: Boolean)
+
+    suspend fun autoUpdateAsked(): Boolean
+    suspend fun setAutoUpdateAsked(asked: Boolean)
 }
@@ -4,12 +4,15 @@ import agzam.vyatsu.ui.info.BuildingsScreen
 import agzam.vyatsu.ui.info.CallsScreen
 import agzam.vyatsu.ui.schedule.ScheduleScreen
 import agzam.vyatsu.ui.schedule.ScheduleViewModel
+import agzam.vyatsu.ui.settings.SettingsScreen
+import agzam.vyatsu.ui.settings.UpdateViewModel
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.DateRange
 import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.Icon
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
@@ -25,12 +28,14 @@ import androidx.compose.ui.Modifier
 private enum class HomeTab(val label: String) {
    SCHEDULE("Расписание"),
    CALLS("Звонки"),
-    BUILDINGS("Корпуса")
+    BUILDINGS("Корпуса"),
+    SETTINGS("Настройки")
 }

@Composable
 fun HomeScreen(
    scheduleViewModel: ScheduleViewModel,
+    updateViewModel: UpdateViewModel,
    onSwitchGroup: () -> Unit
 ) {
    var tab by rememberSaveable { mutableStateOf(HomeTab.SCHEDULE) }
@@ -48,6 +53,7 @@ fun HomeScreen(
                                    HomeTab.SCHEDULE -> Icons.Default.DateRange
                                    HomeTab.CALLS -> Icons.Default.Info
                                    HomeTab.BUILDINGS -> Icons.Default.Home
+                                    HomeTab.SETTINGS -> Icons.Default.Settings
                                },
                                contentDescription = t.label
                            )
@@ -67,6 +73,7 @@ fun HomeScreen(
                HomeTab.SCHEDULE -> ScheduleScreen(viewModel = scheduleViewModel, onSwitchGroup = onSwitchGroup)
                HomeTab.CALLS -> CallsScreen()
                HomeTab.BUILDINGS -> BuildingsScreen()
+                HomeTab.SETTINGS -> SettingsScreen(viewModel = updateViewModel)
            }
        }
    }
@@ -54,17 +54,5 @@ fun BuildingsScreen() {
            }
            HorizontalDivider(Modifier.padding(horizontal = 16.dp))
        }
-
-        item {
-            Spacer(Modifier.height(24.dp))
-            Text(
-                "Версия ${BuildConfig.VERSION_NAME}",
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                textAlign = TextAlign.Center,
-                modifier = Modifier.fillMaxWidth()
-            )
-            Spacer(Modifier.height(16.dp))
-        }
    }
 }
@@ -1,54 +1,100 @@
 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 android.widget.Toast
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListItemInfo
+import androidx.compose.foundation.lazy.LazyListLayoutInfo
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.PagerState
+import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.selection.SelectionContainer
 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
 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
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 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.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.flow.collectLatest
 import java.time.DayOfWeek
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
+import kotlin.math.absoluteValue
+import kotlin.math.max
+import kotlin.math.min
+
+
+val hPadding = 16.dp

@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
+
    val state by viewModel.uiState.collectAsState()

    Column(Modifier.fillMaxSize()) {
        TopAppBar(
-            title = { Text("Расписание") },
+            title = { Text(state.groupName ?: "Расписание", style = MaterialTheme.typography.titleMedium) },
            actions = {
+                if (state.isLoading && state.schedule != null) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(24.dp),
+                        strokeWidth = 2.dp
+                    )
+                }
                TextButton(onClick = { onSwitchGroup() }) {
                    Text("Сменить группу")
                }
@@ -56,20 +102,11 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                    Icon(Icons.Default.Refresh, contentDescription = "Обновить")
                }
            },
-            windowInsets = WindowInsets.systemBars.only(androidx.compose.foundation.layout.WindowInsetsSides.Top)
+            windowInsets = WindowInsets(0.dp)
        )
-        Column(Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 0.dp)) {
+        Column(Modifier.fillMaxSize().padding(horizontal = 0.dp, vertical = 0.dp)) {
            when {
-                state.isSyncing && state.schedule == null -> {
-                    Row(
-                        Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.Center
-                    ) {
-                        CircularProgressIndicator()
-                    }
-                }
-
-                state.schedule == null -> {
+                state.schedule == null && state.loadError -> {
                    Column(
                        Modifier.fillMaxWidth(),
                        horizontalAlignment = Alignment.CenterHorizontally
@@ -84,6 +121,15 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                    }
                }

+                state.schedule == null -> {
+                    Row(
+                        Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.Center
+                    ) {
+                        CircularProgressIndicator()
+                    }
+                }
+
                else -> {
                    val schedule = state.schedule!!
                    val weekDays = state.weekStart
@@ -95,50 +141,78 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                    if (day == null) {
                        Text("Занятий нет", style = MaterialTheme.typography.bodyLarge)
                    } else {
+
+                        val schedule = state.schedule!!
+                        val weekDays = state.weekStart
+                            ?.let { ws -> schedule.periods.firstOrNull { it.weekStart == ws } }
+                            ?.let { schedule.daysOf(it) }
+                            .orEmpty()
+
+                        val selectedDayIndex = weekDays.indexOfFirst { it.date == state.dayDate }.coerceAtLeast(0)
+                        val pagerState = rememberPagerState(
+                            initialPage = selectedDayIndex,
+                            pageCount = { weekDays.size }
+                        )
+                        LaunchedEffect(state.dayDate) {
+                            val targetPage = weekDays.indexOfFirst { it.date == state.dayDate }
+                            if (targetPage != -1 && targetPage != pagerState.currentPage) {
+                                pagerState.scrollToPage(targetPage) // Мгновенное переключение без анимации
+                            }
+                        }
+                        LaunchedEffect(pagerState) {
+                            snapshotFlow { pagerState.currentPage }.collect { page ->
+                                if (pagerState.isScrollInProgress && page in weekDays.indices) {
+                                    viewModel.selectDay(weekDays[page].date)
+                                }
+                            }
+                        }
+
                        val isTodayDay = day.date == state.todayDate
                        val dayLabel = if (isTodayDay) "Сегодня " else ""

+                        Row(
+                            Modifier.fillMaxWidth().padding(horizontal = hPadding),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
                            Text(
                                "$dayLabel${dayName(day.date.dayOfWeek)} · ${day.date.format(FULL_DATE)}",
-                            style = MaterialTheme.typography.titleMedium
+                                style = MaterialTheme.typography.titleMedium,
+                                modifier = Modifier.weight(1f)
                            )
-                        Row(
-                            Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.spacedBy(8.dp)
-                        ) {
-                            TextButton(onClick = { viewModel.clearSelectedPeriod() }) {
-                                Text("Очистить эту неделю")
-                            }
-                            TextButton(onClick = { viewModel.clearAll() }) {
-                                Text("Очистить всё")
-                            }
-                        }
-                        HorizontalDivider(Modifier.padding(vertical = 8.dp))
-
-                        WeekChips(
+                            WeekSelector(
                                periods = schedule.periods,
                                selectedWeekStart = state.weekStart,
                                todayWeekStart = state.todayDate?.let { schedule.periodOf(it)?.weekStart },
                                onSelect = viewModel::selectWeek
                            )
-
-                        HorizontalDivider(Modifier.padding(vertical = 8.dp))
+                        }
+                        HorizontalDivider(Modifier.padding(top = 8.dp, bottom = 0.dp, start = hPadding, end = hPadding))

                        DayChips(
                            days = weekDays,
                            selectedDate = state.dayDate,
                            todayDate = state.todayDate,
-                            onSelect = viewModel::selectDay
+                            onSelect = viewModel::selectDay,
+                            pagerState = pagerState
                        )

-                        HorizontalDivider(Modifier.padding(vertical = 8.dp))
+                        HorizontalDivider(Modifier.padding(top=0.dp, start = hPadding, end = hPadding))

-                        if (day.intervals.all { it.lessons.isEmpty() }) {
+                        HorizontalPager(state = pagerState, modifier = Modifier.weight(1f)) { page ->
+                            val day = weekDays.getOrNull(page)
+
+                            if (day == null || day.intervals.all { it.lessons.isEmpty() }) {
+                                Box(
+                                    modifier = Modifier.fillMaxSize(),
+                                    contentAlignment = Alignment.Center
+                                ) {
                                    Text("Занятий нет", style = MaterialTheme.typography.bodyLarge)
+                                }
                            } else {
                                LazyColumn(
-                                modifier = Modifier.weight(1f),
-                                verticalArrangement = Arrangement.spacedBy(8.dp)
+                                    modifier = Modifier.fillMaxSize(),
+                                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                                    contentPadding = PaddingValues(vertical = 8.dp)
                                ) {
                                    itemsIndexed(day.intervals) { slotIndex, slot ->
                                        LessonSlot(slotIndex = slotIndex, slot = slot)
@@ -151,52 +225,137 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
            }
        }
    }
+}

+@OptIn(ExperimentalMaterial3Api::class)
@Composable
-private fun WeekChips(
+private fun WeekSelector(
    periods: List<SchedulePeriod>,
    selectedWeekStart: LocalDate?,
    todayWeekStart: LocalDate?,
    onSelect: (LocalDate) -> Unit
 ) {
-    LazyRow(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
-        items(periods, key = { it.weekStart.toEpochDay() }) { period ->
-            val selected = selectedWeekStart == period.weekStart
+    val selected = periods.firstOrNull { it.weekStart == selectedWeekStart }
+    var expanded by remember { mutableStateOf(false) }
+
+    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
-            FilterChip(
-                selected = selected,
-                onClick = { onSelect(period.weekStart) },
-                label = {
+                DropdownMenuItem(
+                    text = {
                        Text(
                            weekLabel(period),
-                        style = MaterialTheme.typography.labelLarge
+                            style = MaterialTheme.typography.bodyLarge
                        )
                    },
-                modifier = Modifier.padding(vertical = 2.dp),
-                border = if (isTodayWeek && !selected) {
-                    FilterChipDefaults.filterChipBorder(
-                        borderColor = MaterialTheme.colorScheme.primary,
-                        borderWidth = 1.dp,
-                        enabled = true,
-                        selected = false
+                    trailingIcon = if (isTodayWeek) {
+                        {
+                            Text(
+                                "сегодня",
+                                style = MaterialTheme.typography.labelMedium,
+                                color = MaterialTheme.colorScheme.primary
                            )
+                        }
                    } else {
-                    FilterChipDefaults.filterChipBorder(enabled = true, selected = selected)
+                        null
                    },
-                shape = RoundedCornerShape(8.dp)
+                    onClick = {
+                        expanded = false
+                        onSelect(period.weekStart)
+                    }
                )
            }
        }
    }
+}
+
+private fun getVisiblePercentage(item: LazyListItemInfo, layoutInfo: LazyListLayoutInfo): Float {
+    val viewportStart = layoutInfo.viewportStartOffset
+    val viewportEnd = layoutInfo.viewportEndOffset
+
+    val itemStart = item.offset
+    val itemEnd = item.offset + item.size
+
+    val visibleStart = max(itemStart, viewportStart)
+    val visibleEnd = min(itemEnd, viewportEnd)
+    val visibleSize = visibleEnd - visibleStart
+
+    return if (visibleSize <= 0) 0f else visibleSize.toFloat() / item.size
+}

@Composable
 private fun DayChips(
    days: List<Day>,
    selectedDate: LocalDate?,
    todayDate: LocalDate?,
+    pagerState: PagerState,
    onSelect: (LocalDate) -> Unit
 ) {
-    LazyRow(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+    val listState = rememberLazyListState()
+
+    val density = LocalDensity.current
+
+    val paddingPx = with(density) { hPadding.toPx() }
+
+
+    LaunchedEffect(pagerState, days) {
+        snapshotFlow {
+            pagerState.currentPage
+        }.collectLatest { targetPage ->
+
+            if (targetPage in days.indices) {
+                val layoutInfo = listState.layoutInfo
+                val visibleItems = layoutInfo.visibleItemsInfo
+                val targetItem = visibleItems.firstOrNull { it.index == targetPage }
+
+                if (targetItem != null) {
+                    val visiblePercentage = getVisiblePercentage(targetItem, layoutInfo)
+                    val minVisibleThreshold = 0.9f
+
+                    if (visiblePercentage < minVisibleThreshold) {
+                        val viewPortWidth = layoutInfo.viewportEndOffset - layoutInfo.viewportStartOffset
+                        val halfViewport = viewPortWidth / 2f
+                        val centerOffset = (halfViewport - (targetItem.size / 2f) - paddingPx).toInt()
+
+                        listState.animateScrollToItem(index = targetPage, scrollOffset = -centerOffset)
+                    }
+                } else {
+                    val viewPortWidth = layoutInfo.viewportEndOffset - layoutInfo.viewportStartOffset
+                    val halfViewport = viewPortWidth / 2f
+
+                    val averageSize = visibleItems.map { it.size }.average().toInt().coerceAtLeast(150)
+                    val centerOffset = (halfViewport - (averageSize / 2f) - paddingPx).toInt()
+
+                    listState.animateScrollToItem(index = targetPage, scrollOffset = -centerOffset)
+                }
+            }
+        }
+    }
+
+    LazyRow(state = listState, horizontalArrangement = Arrangement.spacedBy(6.dp), contentPadding = PaddingValues(horizontal = hPadding, vertical = 2.dp),) {
        items(days, key = { it.date.toEpochDay() }) { day ->
            val selected = selectedDate == day.date
            val isTodayChip = todayDate == day.date
@@ -244,33 +403,97 @@ private fun weekLabel(period: SchedulePeriod): String {

@Composable
 private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
+    val context = LocalContext.current
+    var indexColor = 0
    Column(Modifier.fillMaxWidth()) {
+        Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+            HorizontalDivider(
+                modifier = Modifier.width(10.dp + hPadding).padding(start = hPadding),
+                color = MaterialTheme.colorScheme.primary
+            )
            Text(
                "${slotIndex + 1} пара · ${slot.start.format(TIME)}–${slot.end.format(TIME)}",
                style = MaterialTheme.typography.labelMedium,
-            color = MaterialTheme.colorScheme.primary
+                color = MaterialTheme.colorScheme.primary,
+                modifier = Modifier.padding(horizontal = 4.dp)
            )
+            HorizontalDivider(color = MaterialTheme.colorScheme.primary, modifier = Modifier.weight(1f).padding(end = hPadding))
+        }
        if (slot.lessons.isEmpty()) {
            Text("—", style = MaterialTheme.typography.bodyMedium)
        } else {
-            slot.lessons.forEach { lesson ->
-                Column(Modifier.fillMaxWidth().padding(vertical = 2.dp)) {
-                    Text(
-                        lesson.subject?.takeIf { it.isNotBlank() } ?: lesson.raw,
-                        style = MaterialTheme.typography.bodyLarge
-                    )
-                    Text(
-                        listOfNotNull(
-                            lesson.type.label,
+            slot.lessons.forEachIndexed { index, lesson ->
+                var baseSurface = Modifier.fillMaxWidth().padding(vertical = 2.dp)
+                if ((indexColor) % 2 != 0) {
+                    baseSurface = baseSurface.background(
+                        MaterialTheme.colorScheme.surfaceContainer
+                    );
+                }
+                indexColor++
+                // XXX:
+                // Убрать SelectionContainer?
+                // Режим редактирования расписания?
+                // Меню на onClick?
+                // Меню на onLongClick?
+                SelectionContainer() {
+                    Column(
+                        baseSurface
+                        // XXX: combinedClickable?
+                        //.combinedClickable(
+                        //    onClick = {
+                        //        Toast.makeText(
+                        //            context,
+                        //            lesson.raw,
+                        //            Toast.LENGTH_SHORT
+                        //        ).show()
+                        //    },
+                        //    onLongClick = {},
+                        //    // TODO: onLongClickLabel = "(Accessibility)"
+                        //),
+                    ) {
+                        var any = false
+
+                        val meta = listOfNotNull(
+                            if (lesson.type == LessonType.OTHER) {
+                                null
+                            } else {
+                                lesson.type.label
+                            },
                            lesson.subgroup,
                            lesson.teacher,
                            lesson.room
-                        )
-                            .filter { it.isNotBlank() }
-                            .joinToString(" · "),
+                        ).filter { it.isNotBlank() }.joinToString(" · ")
+
+                        if (meta.isNotEmpty()) {
+                            Text(
+                                meta,
                                style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                                modifier = Modifier.padding(horizontal = hPadding)
                            )
+                            any = true
+                        }
+
+                        val subject = lesson.subject?.takeIf { it.isNotBlank() } ?: lesson.raw
+                        if (subject.isNotEmpty()) {
+                            Text(
+                                subject,
+                                style = MaterialTheme.typography.bodyLarge,
+                                modifier = Modifier.padding(horizontal = hPadding)
+                            )
+                            any = true
+                        }
+
+                        if (!any) {
+                            Text(
+                                "пусто",
+                                style = MaterialTheme.typography.bodySmall,
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                                modifier = Modifier.padding(horizontal = hPadding)
+                            )
+                        }
+
+                    }
                }
            }
        }
@@ -2,6 +2,7 @@ package agzam.vyatsu.ui.schedule

 import agzam.vyatsu.domain.ScheduleDates
 import agzam.vyatsu.domain.model.Schedule
+import agzam.vyatsu.domain.repository.GroupRepository
 import agzam.vyatsu.domain.repository.PreferencesRepository
 import agzam.vyatsu.domain.repository.ScheduleRepository
 import androidx.lifecycle.ViewModel
@@ -14,7 +15,8 @@ import java.time.LocalDate

 class ScheduleViewModel(
    private val scheduleRepository: ScheduleRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val preferencesRepository: PreferencesRepository,
+    private val groupRepository: GroupRepository
 ) : ViewModel() {

    private val _uiState = MutableStateFlow(ScheduleUiState())
@@ -28,15 +30,17 @@ class ScheduleViewModel(
            if (groupId != null) {
                selectGroup(groupId)
            } else {
-                _uiState.value = _uiState.value.copy(noGroup = true)
+            _uiState.value = _uiState.value.copy(noGroup = true, groupName = null)
            }
        }
    }

    fun selectGroup(groupId: String) {
        currentGroupId = groupId
+        _uiState.value = _uiState.value.copy(noGroup = false, isLoading = true, loadError = false)
        viewModelScope.launch {
            preferencesRepository.setSelectedGroup(groupId)
+            val groupName = groupRepository.getGroups().firstOrNull { it.id == groupId }?.name

            val savedWeekStart = runCatching {
                preferencesRepository.selectedWeekStart()?.let(LocalDate::parse)
@@ -46,6 +50,7 @@ class ScheduleViewModel(
            }.getOrNull()
            _uiState.value = _uiState.value.copy(
                noGroup = false,
+                groupName = groupName,
                weekStart = savedWeekStart,
                dayDate = savedDayDate
            )
@@ -57,7 +62,7 @@ class ScheduleViewModel(
            }

            launch {
-                syncIfMissingToday(groupId)
+                syncIfMissing(groupId)
            }
        }
    }
@@ -92,7 +97,9 @@ class ScheduleViewModel(
            schedule = schedule,
            weekStart = weekStart,
            dayDate = dayDate,
-            todayDate = todayDate
+            todayDate = todayDate,
+            isLoading = false,
+            loadError = false
        )
    }

@@ -124,30 +131,39 @@ class ScheduleViewModel(
        }
    }

-    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)
+    private suspend fun syncIfMissing(groupId: String) {
+        if (scheduleRepository.getSchedule(groupId) != null) {
+            _uiState.value = _uiState.value.copy(isLoading = false)
+            return
+        }
+        loadSchedule(groupId)
+    }
+
+    private suspend fun loadSchedule(groupId: String) {
+        _uiState.value = _uiState.value.copy(isLoading = true, loadError = false)
+        val schedule = scheduleRepository.sync(groupId)
+        _uiState.value = if (schedule != null) {
+            _uiState.value.copy(isLoading = false, loadError = false)
+        } else {
+            _uiState.value.copy(isLoading = false, loadError = true)
+        }
    }

    fun switchGroup() {
        viewModelScope.launch {
            currentGroupId = null
            preferencesRepository.clearSelectedGroup()
-            _uiState.value = _uiState.value.copy(noGroup = true)
+            _uiState.value = _uiState.value.copy(noGroup = true, isLoading = false, loadError = false)
        }
    }

    fun refresh() {
        val groupId = currentGroupId ?: return
        viewModelScope.launch {
-            _uiState.value = _uiState.value.copy(isRefreshing = true)
-            scheduleRepository.sync(groupId)
-            _uiState.value = _uiState.value.copy(isRefreshing = false)
+            _uiState.value = _uiState.value.copy(isLoading = true, loadError = false)
+            // Обновляем список групп: так подхватываются новые PDF (периоды), появившиеся на сайте.
+            runCatching { groupRepository.forceRefresh() }
+            loadSchedule(groupId)
        }
    }

@@ -171,9 +187,10 @@ class ScheduleViewModel(

 data class ScheduleUiState(
    val noGroup: Boolean = false,
-    val isRefreshing: Boolean = false,
-    val isSyncing: Boolean = false,
+    val isLoading: Boolean = false,
+    val loadError: Boolean = false,
    val schedule: Schedule? = null,
+    val groupName: String? = null,
    val weekStart: LocalDate? = null,
    val dayDate: LocalDate? = null,
    val todayDate: LocalDate? = null
@@ -0,0 +1,152 @@
+package agzam.vyatsu.ui.settings
+
+import agzam.vyatsu.BuildConfig
+import agzam.vyatsu.update.UpdateState
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun SettingsScreen(viewModel: UpdateViewModel) {
+    val autoEnabled by viewModel.autoEnabled.collectAsState()
+    val updateState by viewModel.updateState.collectAsState()
+
+    LazyColumn(
+        Modifier
+            .fillMaxWidth()
+            .windowInsetsPadding(WindowInsets.statusBars)
+    ) {
+        item { SectionHeader("Обновления") }
+        item {
+            SettingsItem(
+                title = "Автоматические обновления",
+                subtitle = "Проверять и устанавливать новые версии при запуске",
+                trailing = {
+                    Switch(
+                        checked = autoEnabled,
+                        onCheckedChange = { viewModel.setAutoEnabled(it) }
+                    )
+                }
+            )
+            SettingsDivider()
+        }
+        item {
+            SettingsItem(
+                title = "Проверить наличие обновлений",
+                subtitle = updateStatusText(updateState, autoEnabled),
+                onClick = { viewModel.checkNow() }
+            )
+            SettingsDivider()
+        }
+        if (autoEnabled && (updateState is UpdateState.Available || updateState is UpdateState.ReadyToInstall)) {
+            item {
+                SettingsItem(
+                    title = "Установить обновление",
+                    subtitle = installHint(updateState, viewModel),
+                    onClick = {
+                        when (updateState) {
+                            is UpdateState.Available -> viewModel.downloadAndInstall()
+                            is UpdateState.ReadyToInstall -> viewModel.installDownloadedApk()
+                            else -> {}
+                        }
+                    }
+                )
+                SettingsDivider()
+            }
+        }
+
+        item { SectionHeader("О приложении") }
+        item {
+            SettingsItem(
+                title = "Версия",
+                trailing = {
+                    Text(
+                        BuildConfig.VERSION_NAME,
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    )
+                }
+            )
+            SettingsDivider()
+        }
+    }
+}
+
+private fun updateStatusText(state: UpdateState, autoEnabled: Boolean): String = when (state) {
+    is UpdateState.Idle -> "Проверить сейчас"
+    is UpdateState.Checking -> "Проверка…"
+    is UpdateState.UpToDate -> "Установлена последняя версия"
+    is UpdateState.Available ->
+        if (autoEnabled) "Доступна версия ${state.version}"
+        else "Доступна версия ${state.version} — включите автообновления для установки"
+    is UpdateState.Downloading -> "Скачивание: ${state.progress?.let { "$it%" } ?: "…"}"
+    is UpdateState.ReadyToInstall -> "Обновление скачано, нажмите для установки"
+    is UpdateState.Failed -> "Ошибка: ${state.message}"
+}
+
+private fun installHint(state: UpdateState, viewModel: UpdateViewModel): String = when {
+    state is UpdateState.ReadyToInstall && !viewModel.canRequestInstalls() ->
+        "Разрешите установку приложений из этого источника"
+    else -> "Нажмите, чтобы продолжить"
+}
+
+@Composable
+private fun SectionHeader(title: String) {
+    Text(
+        title,
+        style = MaterialTheme.typography.titleSmall,
+        color = MaterialTheme.colorScheme.onSurfaceVariant,
+        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
+    )
+}
+
+@Composable
+private fun SettingsItem(
+    title: String,
+    subtitle: String? = null,
+    trailing: (@Composable () -> Unit)? = null,
+    onClick: (() -> Unit)? = null
+) {
+    Row(
+        Modifier
+            .fillMaxWidth()
+            .heightIn(min = 48.dp)
+            .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
+            .padding(horizontal = 16.dp, vertical = 12.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Column(Modifier.weight(1f)) {
+            Text(title, style = MaterialTheme.typography.bodyLarge)
+            if (subtitle != null) {
+                Text(
+                    subtitle,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+            }
+        }
+        trailing?.invoke()
+    }
+}
+
+@Composable
+private fun SettingsDivider() {
+    HorizontalDivider(Modifier.padding(horizontal = 16.dp))
+}
@@ -0,0 +1,58 @@
+package agzam.vyatsu.ui.settings
+
+import agzam.vyatsu.domain.repository.PreferencesRepository
+import agzam.vyatsu.update.AppUpdater
+import agzam.vyatsu.update.UpdateState
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+class UpdateViewModel(
+    private val updater: AppUpdater,
+    private val preferencesRepository: PreferencesRepository
+) : ViewModel() {
+
+    val updateState: StateFlow<UpdateState> = updater.state
+
+    private val _autoEnabled = MutableStateFlow(false)
+    val autoEnabled: StateFlow<Boolean> = _autoEnabled.asStateFlow()
+
+    private val _showFirstRunDialog = MutableStateFlow(false)
+    val showFirstRunDialog: StateFlow<Boolean> = _showFirstRunDialog.asStateFlow()
+
+    init {
+        viewModelScope.launch {
+            _autoEnabled.value = preferencesRepository.autoUpdateEnabled()
+            _showFirstRunDialog.value = !preferencesRepository.autoUpdateAsked()
+        }
+    }
+
+    fun setAutoEnabled(enabled: Boolean) {
+        _autoEnabled.value = enabled
+        updater.setAutoEnabled(enabled)
+        if (enabled && !updater.canRequestInstalls()) {
+            updater.openUnknownSourcesSettings()
+        }
+    }
+
+    fun onFirstRunDecision(enable: Boolean) {
+        _showFirstRunDialog.value = false
+        viewModelScope.launch {
+            preferencesRepository.setAutoUpdateAsked(true)
+        }
+        setAutoEnabled(enable)
+    }
+
+    fun checkNow() = updater.checkForUpdate()
+
+    fun downloadAndInstall() = updater.downloadAndInstall()
+
+    fun installDownloadedApk() = updater.installDownloadedApk()
+
+    fun canRequestInstalls() = updater.canRequestInstalls()
+
+    fun openUnknownSourcesSettings() = updater.openUnknownSourcesSettings()
+}
@@ -0,0 +1,217 @@
+package agzam.vyatsu.update
+
+import agzam.vyatsu.BuildConfig
+import agzam.vyatsu.data.remote.update.GiteaReleaseApi
+import agzam.vyatsu.domain.repository.PreferencesRepository
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
+import android.util.Log
+import androidx.core.content.FileProvider
+import kotlin.coroutines.cancellation.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.io.File
+import java.io.IOException
+import java.util.concurrent.TimeUnit
+
+sealed interface UpdateState {
+    data object Idle : UpdateState
+    data object Checking : UpdateState
+    data object UpToDate : UpdateState
+    data class Available(val version: String, val notes: String?) : UpdateState
+    data class Downloading(val progress: Int?) : UpdateState
+    data object ReadyToInstall : UpdateState
+    data class Failed(val message: String) : UpdateState
+}
+
+class AppUpdater(
+    private val context: Context,
+    private val preferencesRepository: PreferencesRepository
+) {
+
+    private val scope = CoroutineScope(Dispatchers.IO)
+
+    private val client = OkHttpClient.Builder()
+        .connectTimeout(15, TimeUnit.SECONDS)
+        .readTimeout(60, TimeUnit.SECONDS)
+        .build()
+
+    private val api = GiteaReleaseApi(client)
+
+    private val _state = MutableStateFlow<UpdateState>(UpdateState.Idle)
+    val state: StateFlow<UpdateState> = _state.asStateFlow()
+
+    private var job: Job? = null
+    private var pendingUpdate: AvailableUpdate? = null
+    private var downloadedApk: File? = null
+
+    fun autoCheckAndInstall() {
+        if (job?.isActive == true) return
+        job = scope.launch {
+            if (!preferencesRepository.autoUpdateEnabled()) return@launch
+            runCatching {
+                val update = check() ?: return@launch
+                install(download(update))
+            }.onFailure(::onUpdateFailed)
+        }
+    }
+
+    fun checkForUpdate() {
+        if (job?.isActive == true) return
+        job = scope.launch {
+            runCatching { check() }.onFailure(::onUpdateFailed)
+        }
+    }
+
+    fun downloadAndInstall() {
+        if (job?.isActive == true) return
+        val update = pendingUpdate ?: return
+        job = scope.launch {
+            if (!preferencesRepository.autoUpdateEnabled()) return@launch
+            runCatching { install(download(update)) }.onFailure(::onUpdateFailed)
+        }
+    }
+
+    fun installDownloadedApk() {
+        val apk = downloadedApk ?: return
+        install(apk)
+    }
+
+    fun setAutoEnabled(enabled: Boolean) {
+        if (!enabled) {
+            job?.cancel()
+            if (_state.value is UpdateState.Downloading || _state.value is UpdateState.Checking) {
+                _state.value = UpdateState.Idle
+            }
+        }
+        scope.launch {
+            preferencesRepository.setAutoUpdateEnabled(enabled)
+        }
+    }
+
+    fun canRequestInstalls(): Boolean =
+        context.packageManager.canRequestPackageInstalls()
+
+    fun openUnknownSourcesSettings() {
+        val intent = Intent(
+            Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,
+            Uri.parse("package:${context.packageName}")
+        ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        runCatching { context.startActivity(intent) }
+    }
+
+    private suspend fun check(): AvailableUpdate? {
+        _state.value = UpdateState.Checking
+        val release = api.latestRelease()
+        if (release == null) {
+            _state.value = UpdateState.UpToDate
+            return null
+        }
+
+        val remoteVersion = release.tagName?.trimStart('v', 'V')
+        if (remoteVersion == null || !isNewerVersion(remoteVersion, BuildConfig.VERSION_NAME.trimStart('v', 'V'))) {
+            _state.value = UpdateState.UpToDate
+            return null
+        }
+
+        val apkUrl = api.apkDownloadUrl(release)
+            ?: throw IOException("В релизе $remoteVersion нет APK-файла")
+
+        val update = AvailableUpdate(version = remoteVersion, apkUrl = apkUrl)
+        pendingUpdate = update
+        _state.value = UpdateState.Available(update.version, release.body)
+        return update
+    }
+
+    private suspend fun download(update: AvailableUpdate): File {
+        _state.value = UpdateState.Downloading(null)
+
+        val dir = File(context.cacheDir, "updates").apply { mkdirs() }
+        val target = File(dir, "update-${update.version}.apk")
+        downloadedApk?.delete()
+
+        val response = client.newCall(Request.Builder().url(update.apkUrl).get().build()).execute()
+        response.use { resp ->
+            if (!resp.isSuccessful) throw IOException("HTTP ${resp.code} при скачивании")
+            val body = resp.body ?: throw IOException("Пустой ответ при скачивании")
+            val contentLength = body.contentLength()
+
+            body.byteStream().use { input ->
+                target.outputStream().use { output ->
+                    val buffer = ByteArray(BUFFER_SIZE_BYTES)
+                    var readTotal = 0L
+                    while (true) {
+                        val read = input.read(buffer)
+                        if (read == -1) break
+                        output.write(buffer, 0, read)
+                        readTotal += read
+                        if (contentLength > 0) {
+                            _state.value = UpdateState.Downloading((readTotal * 100 / contentLength).toInt())
+                        }
+                    }
+                }
+            }
+        }
+
+        if (target.length() == 0L) {
+            target.delete()
+            throw IOException("Скачанный файл пуст")
+        }
+
+        downloadedApk = target
+        _state.value = UpdateState.ReadyToInstall
+        return target
+    }
+
+    private fun install(apk: File) {
+        if (!canRequestInstalls()) {
+            return
+        }
+        val uri = FileProvider.getUriForFile(
+            context,
+            "${context.packageName}.fileprovider",
+            apk
+        )
+        val intent = Intent(Intent.ACTION_INSTALL_PACKAGE).apply {
+            data = uri
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        runCatching { context.startActivity(intent) }
+            .onFailure { Log.e(TAG, "Не удалось запустить установку", it) }
+    }
+
+    private fun onUpdateFailed(error: Throwable) {
+        if (error is CancellationException) throw error
+        Log.e(TAG, "Ошибка обновления", error)
+        _state.value = UpdateState.Failed(error.message ?: "Неизвестная ошибка")
+    }
+
+    private data class AvailableUpdate(val version: String, val apkUrl: String)
+
+    private fun isNewerVersion(remote: String, local: String): Boolean {
+        val remoteParts = remote.split('.').map { it.toLongOrNull() ?: 0L }
+        val localParts = local.split('.').map { it.toLongOrNull() ?: 0L }
+        val size = maxOf(remoteParts.size, localParts.size)
+        for (i in 0 until size) {
+            val r = remoteParts.getOrElse(i) { 0L }
+            val l = localParts.getOrElse(i) { 0L }
+            if (r != l) return r > l
+        }
+        return false
+    }
+
+    private companion object {
+        const val TAG = "AppUpdate"
+        const val BUFFER_SIZE_BYTES = 8 * 1024
+    }
+}
@@ -0,0 +1,109 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M1,6L1,18L19,18L19,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0"
+      android:strokeLineCap="round">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="1"
+          android:startY="18"
+          android:endX="19"
+          android:endY="6"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF5581D5"/>
+        <item android:offset="1" android:color="#FF4063CD"/>
+      </gradient>
+    </aapt:attr>
+    <aapt:attr name="android:strokeColor">
+      <gradient
+          android:startX="1"
+          android:startY="18"
+          android:endX="19"
+          android:endY="6"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF5581D5"/>
+        <item android:offset="1" android:color="#FF4063CD"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M19,18L1,18C12,18 19,14 19,6Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0"
+      android:strokeLineCap="round">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="1"
+          android:startY="18"
+          android:endX="19"
+          android:endY="6"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF6598E3"/>
+        <item android:offset="1" android:color="#FF74A2E6"/>
+      </gradient>
+    </aapt:attr>
+    <aapt:attr name="android:strokeColor">
+      <gradient
+          android:startX="1"
+          android:startY="18"
+          android:endX="19"
+          android:endY="6"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF6598E3"/>
+        <item android:offset="1" android:color="#FF74A2E6"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M4,4C4,2 6,2 6,4L14,4C14,2 16,2 16,4L19,4L19,6L1,6L1,4Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0"
+      android:strokeLineCap="round">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="1"
+          android:startY="2.5"
+          android:endX="19"
+          android:endY="2.5"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF4260C4"/>
+        <item android:offset="1" android:color="#FF0E2CB0"/>
+      </gradient>
+    </aapt:attr>
+    <aapt:attr name="android:strokeColor">
+      <gradient
+          android:startX="1"
+          android:startY="2.5"
+          android:endX="19"
+          android:endY="2.5"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF4260C4"/>
+        <item android:offset="1" android:color="#FF0E2CB0"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M3,8L17,8C18,8 18,9 17,9L3,9C2,9 2,8 3,8M3,11L14,11C15,11 15,12 14,12L3,12C2,12 2,11 3,11M4,14L12,14C13,14 13,15 12,15L5,15C4,15 4,14 5,14M3,14C4,14 4,15 3,15C2,15 2,14 3,14"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="round">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="2.25"
+          android:startY="8"
+          android:endX="17.75"
+          android:endY="8"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF4260C4"/>
+        <item android:offset="1" android:color="#FF0E2CB0"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100px" height="100px" viewBox="-10 -10 20 20">
+  <defs>
+    <linearGradient id="accent">
+      <stop offset="0%" stop-color="#4260c4" />
+      <stop offset="100%" stop-color="#0e2cb0" />
+    </linearGradient>
+
+    <linearGradient id="bg" x1="0%" y1="100%" x2="100%" y2="0%">
+      <stop offset="0%" stop-color="#5581d5" />
+      <stop offset="100%" stop-color="#4063cd" />
+    </linearGradient>
+
+    <linearGradient id="bga" x1="0%" y1="100%" x2="100%" y2="0%">
+      <stop offset="0%" stop-color="#6598e3" />
+      <stop offset="100%" stop-color="#74a2e6" />
+    </linearGradient>
+  </defs>
+
+  <g stroke-width="0" stroke-linejoin="round" stroke-linecap="round">
+  <!-- <path stroke="#111" d="M -9 -4 L -9 8 L 9 8 L 9 -4"/> -->
+
+  <path stroke="url(#bg)" fill="url(#bg)" d="M -9 -4 L -9 8 L 9 8 L 9 -4"/>
+  <path stroke="url(#bga)" fill="url(#bga)" d="M 9 8 L -9 8 C 2 8 9 4 9 -4 Z"/>
+
+  <!-- <path stroke="#111" d="M -6 -6 C -6 -8 -4 -8 -4 -6 L 4 -6 C 4 -8 6 -8 6 -6 L 9 -6 L 9 -4 L -9 -4 L -9 -6 Z"/> -->
+
+  <g stroke="url(#accent)">
+  <path fill="url(#accent)" d="M -6 -6 C -6 -8 -4 -8 -4 -6 L 4 -6 C 4 -8 6 -8 6 -6 L 9 -6 L 9 -4 L -9 -4 L -9 -6 Z"/>
+
+  <path fill="url(#accent)" stroke="none" d="M -7 -2 L 7 -2 C 8 -2 8 -1 7 -1 L -7 -1 C -8 -1 -8 -2 -7 -2 M -7 1 L 4 1 C 5 1 5 2 4 2 L -7 2 C -8 2 -8 1 -7 1 M -6 4 L 2 4 C 3 4 3 5 2 5 L -5 5 C -6 5 -6 4 -5 4 M -7 4 C -6 4 -6 5 -7 5 C -8 5 -8 4 -7 4"/>
+  </g>
+
+  </g>
+
+</svg>
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">VyatsuSchedule</string>
+    <string name="app_name">ВятГУ Расписание</string>
 </resources>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <cache-path
+        name="updates"
+        path="updates/" />
+</paths>
Author	SHA1	Message	Date
vantablackTea	1077be1897	fix: possible moshi deleting due to proguard	2026-09-18 11:36:25 +03:00
vantablackTea	96db4fa3a6	fix: reverting separate release versions by architecture	2026-09-18 10:01:02 +03:00
vantablackTea	830b4664fb	fix: added proguard rules	2026-09-18 09:48:14 +03:00
vantablackTea	dd4fb90dc4	fix: testing build optimisation	2026-09-18 09:30:19 +03:00
Agzamus	a55fb0461c	ci: debug build name	2026-09-18 02:30:56 +03:00
Agzamus	e789729c76	ui: removed version info from buildings screen	2026-09-18 02:16:46 +03:00
Agzamus	7e23895f0d	fix: version check	2026-09-18 02:16:29 +03:00
Agzamus	708ad11dca	ci: release same tag & version	2026-09-18 01:28:48 +03:00
Agzamus	b1418f79da	fix: immediately scrolling	2026-09-18 01:25:00 +03:00
Agzamus	d17c70e871	feat: schedule swiping	2026-09-18 01:20:47 +03:00
Agzamus	6cd211f744	fix: no more group prefix	2026-09-11 02:34:30 +03:00
Agzamus	019cf5da21	feat: also refresh groups list in schedule	2026-09-11 02:05:43 +03:00
Agzamus	a24748ec04	ci: "debug" if no APP_VERSION	2026-09-11 02:04:36 +03:00
Agzamus	caf3debb3f	feat: 2-week select	2026-09-11 01:55:52 +03:00
Agzamus	1c5140d751	fix: streaming parsing to prevent crashes on low-end phones	2026-09-11 01:34:05 +03:00
Agzamus	65bb6cc7db	fix: loading instead error screen	2026-09-11 00:18:23 +03:00
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
Agzamus	9a96bd3dac	ci: installing from /github.com/adoptium	2026-09-10 00:47:38 +03:00
Agzamus	c4345f9dbe	ci: bullseye repo archive mirror	2026-09-10 00:44:18 +03:00
Agzamus	4797811097	ci: ignore jdk Check-Valid-Until	2026-09-10 00:31:17 +03:00
Agzamus	2dfef426a7	ui: schedule striped copyable rows	2026-09-10 00:23:28 +03:00
Agzamus	97c19647cc	ui: LessonSlot separator	2026-09-09 22:25:55 +03:00
Agzamus	dea27bc8f1	ci: fixed workflow old apt jdk17 repo	2026-09-07 00:35:50 +03:00
Agzamus	bafebfd253	fix: no auto download if updated disabled	2026-09-07 00:31:34 +03:00
Agzamus	f19d65abb5	feat: update request when need	2026-09-06 17:23:55 +03:00
Agzamus	889c57bbba	feat: autoupdater	2026-09-06 12:38:00 +03:00
Agzamus	ec6a7174e8	feat: icon & name	2026-09-06 02:47:40 +03:00
Agzamus	014896aaea	ui: no more empty lines in schedule	2026-09-05 00:21:39 +03:00
Agzamus	9f6cf3ef30	fix: #1 - text blocks by words	2026-09-05 00:13:38 +03:00
Agzamus	d1923d3296	ci: auto version_name	2026-09-04 04:43:43 +03:00
Agzamus	686976347e	feat: better parsing & display	2026-09-04 04:40:29 +03:00
Agzamus	699bcd81f5	ui: header group display	2026-09-04 02:05:52 +03:00
Agzamus	050f835a33	ui: reduced maket padding	2026-09-04 01:22:35 +03:00
Agzamus	5fee57d93a	ui: better week select l&f	2026-09-04 01:07:09 +03:00
Agzamus	36711d1bf3	ui: smaller week select	2026-09-03 23:34:45 +03:00
Agzamus	c2a9cfb7e7	refactor: weeks select -> combobox	2026-09-03 23:16:57 +03:00
Agzamus	467c1a735f	fix: Key "XXX" was already used.	2026-09-03 23:01:05 +03:00
Agzamus	28965e6aed	Merge branch 'database-refactor'	2026-09-03 22:54:49 +03:00
Agzamus	181f8b2f2a	Merge branch 'database-refactor'	2026-09-03 22:53:26 +03:00
Agzamus	84ae97b906	feat: group display on schedule screen	2026-09-03 19:59:21 +03:00
Agzamus	2069ec811a	ci: removed "Upload APK as artifact" action step	2026-09-03 19:47:06 +03:00