fix: added proguard rules

.gitea/workflows/release.yml

@@ -30,9 +30,17 @@ jobs:
         # Ставим JDK вручную и явно прописываем JAVA_HOME.
         # actions/setup-java не всегда передаёт JAVA_HOME дальше в Gitea Actions.
         run: |
-          apt-get update
+          set -euxo pipefail
-          apt-get install -y openjdk-17-jdk-headless unzip wget
+          cd /tmp
-          echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64" >> "$GITHUB_ENV"
+          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 }}

app/build.gradle.kts

@@ -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
@@ -63,6 +67,18 @@ android {
         compose = true
         buildConfig = true
     }
+    splits {
+        abi {
+            isEnable = true
+            reset()
+            include("armeabi-v7a", "arm64-v8a")
+            isUniversalApk = false
+        }
+    }
+}
+
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas")
 }
 
 dependencies {

app/proguard-rules.pro

@@ -19,3 +19,12 @@
 # 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.** { *; }

app/schemas/agzam.vyatsu.data.local.AppDatabase/2.json

@@ -0,0 +1,381 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "48411ce0f1f22ef1dccd5852a9e97c5d",
+    "entities": [
+      {
+        "tableName": "groups",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `faculty` TEXT NOT NULL, `autumnFirst` INTEGER, `autumnSecond` INTEGER, `springFirst` INTEGER, `springSecond` INTEGER, `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": "autumnFirst",
+            "columnName": "autumnFirst",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "autumnSecond",
+            "columnName": "autumnSecond",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "springFirst",
+            "columnName": "springFirst",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "springSecond",
+            "columnName": "springSecond",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastSyncedAt",
+            "columnName": "lastSyncedAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "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, '48411ce0f1f22ef1dccd5852a9e97c5d')"
+    ]
+  }
+}

app/schemas/agzam.vyatsu.data.local.AppDatabase/3.json

@@ -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')"
+    ]
+  }
+}

app/src/main/AndroidManifest.xml

@@ -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>

app/src/main/java/agzam/vyatsu/AppRoot.kt

@@ -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) }

app/src/main/java/agzam/vyatsu/MainActivity.kt

@@ -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()

app/src/main/java/agzam/vyatsu/data/local/AppDatabase.kt

@@ -2,16 +2,21 @@ package agzam.vyatsu.data.local
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 
 @Database(
     entities = [
         GroupEntity::class,
+        GroupPeriodEntity::class,
         ScheduleEntity::class,
+        DayEntity::class,
+        LessonEntity::class,
         PreferenceEntity::class
     ],
-    version = 1,
+    version = 3,
-    exportSchema = false
+    exportSchema = true
 )
+@TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun groupDao(): GroupDao
     abstract fun scheduleDao(): ScheduleDao

app/src/main/java/agzam/vyatsu/data/local/Converters.kt

@@ -0,0 +1,29 @@
+package agzam.vyatsu.data.local
+
+import agzam.vyatsu.domain.model.LessonType
+import androidx.room.TypeConverter
+import java.time.LocalDate
+import java.time.LocalTime
+
+class Converters {
+
+    @TypeConverter
+    fun localDateToEpochDay(date: LocalDate?): Long? = date?.toEpochDay()
+
+    @TypeConverter
+    fun epochDayToLocalDate(epochDay: Long?): LocalDate? = epochDay?.let(LocalDate::ofEpochDay)
+
+    @TypeConverter
+    fun localTimeToMinutes(time: LocalTime?): Int? = time?.let { it.hour * 60 + it.minute }
+
+    @TypeConverter
+    fun minutesToLocalTime(minutes: Int?): LocalTime? =
+        minutes?.let { LocalTime.of(it / 60, it % 60) }
+
+    @TypeConverter
+    fun lessonTypeToString(type: LessonType): String = type.name
+
+    @TypeConverter
+    fun stringToLessonType(value: String): LessonType =
+        runCatching { LessonType.valueOf(value) }.getOrDefault(LessonType.OTHER)
+}

app/src/main/java/agzam/vyatsu/data/local/DayDto.kt

@@ -1,23 +0,0 @@
-package agzam.vyatsu.data.local
-
-import agzam.vyatsu.domain.model.Day
-import com.squareup.moshi.JsonClass
-import java.time.LocalDate
-
-@JsonClass(generateAdapter = true)
-data class DayDto(
-    val date: String,
-    val slots: List<SlotDto> = emptyList()
-) {
-    fun toDomain(): Day = Day(
-        date = LocalDate.parse(date),
-        intervals = slots.map { it.toDomain() }
-    )
-
-    companion object {
-        fun fromDomain(d: Day): DayDto = DayDto(
-            date = d.date.toString(),
-            slots = d.intervals.map { SlotDto.fromDomain(it) }
-        )
-    }
-}

app/src/main/java/agzam/vyatsu/data/local/DayEntity.kt

@@ -0,0 +1,27 @@
+package agzam.vyatsu.data.local
+
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
+@Entity(
+    tableName = "days",
+    foreignKeys = [
+        ForeignKey(
+            entity = ScheduleEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["scheduleId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ],
+    indices = [
+        Index("scheduleId"),
+        Index("date")
+    ]
+)
+data class DayEntity(
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    val scheduleId: Long,
+    val date: Long
+)

app/src/main/java/agzam/vyatsu/data/local/GroupDao.kt

@@ -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>)
 }

app/src/main/java/agzam/vyatsu/data/local/GroupEntity.kt

@@ -8,9 +8,5 @@ data class GroupEntity(
     @PrimaryKey val id: String,
     val name: String,
     val faculty: String,
-    val autumnFirst: String,
-    val autumnSecond: String,
-    val springFirst: String,
-    val springSecond: String,
     val lastSyncedAt: Long
 )

app/src/main/java/agzam/vyatsu/data/local/GroupPeriodEntity.kt

@@ -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
+)

app/src/main/java/agzam/vyatsu/data/local/LessonDto.kt

@@ -1,38 +0,0 @@
-package agzam.vyatsu.data.local
-
-import agzam.vyatsu.domain.model.Lesson
-import agzam.vyatsu.domain.model.LessonType
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
-data class LessonDto(
-    val raw: String = "",
-    val room: String? = null,
-    val group: String? = null,
-    val subgroup: String? = null,
-    val subject: String? = null,
-    val type: String = "",
-    val teacher: String? = null
-) {
-    fun toDomain(): Lesson = Lesson(
-        raw = raw,
-        room = room?.takeIf { it.isNotBlank() },
-        group = group?.takeIf { it.isNotBlank() },
-        subgroup = subgroup?.takeIf { it.isNotBlank() },
-        subject = subject?.takeIf { it.isNotBlank() },
-        type = runCatching { LessonType.valueOf(type) }.getOrDefault(LessonType.OTHER),
-        teacher = teacher?.takeIf { it.isNotBlank() }
-    )
-
-    companion object {
-        fun fromDomain(l: Lesson): LessonDto = LessonDto(
-            raw = l.raw,
-            room = l.room,
-            group = l.group,
-            subgroup = l.subgroup,
-            subject = l.subject,
-            type = l.type.name,
-            teacher = l.teacher
-        )
-    }
-}

app/src/main/java/agzam/vyatsu/data/local/LessonEntity.kt

@@ -0,0 +1,41 @@
+package agzam.vyatsu.data.local
+
+import agzam.vyatsu.domain.model.LessonType
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
+@Entity(
+    tableName = "lessons",
+    foreignKeys = [
+        ForeignKey(
+            entity = DayEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["dayId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ],
+    indices = [
+        Index("dayId"),
+        Index("date"),
+        Index("subject"),
+        Index("room")
+    ]
+)
+data class LessonEntity(
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    val dayId: Long,
+    val date: Long,
+    val slotIndex: Int,
+    val start: Int,
+    val end: Int,
+    val lessonIndex: Int,
+    val raw: String,
+    val room: String?,
+    val groupName: String?,
+    val subgroup: String?,
+    val subject: String?,
+    val type: LessonType,
+    val teacher: String?
+)

app/src/main/java/agzam/vyatsu/data/local/PreferencesDao.kt

@@ -15,4 +15,28 @@ interface PreferencesDao {
 
     @Query("DELETE FROM preferences WHERE key = 'selectedGroupId'")
     suspend fun clearSelectedGroup()
+
+    @Query("SELECT value FROM preferences WHERE key = 'selectedWeekStart'")
+    suspend fun selectedWeekStart(): String?
+
+    @Query("INSERT OR REPLACE INTO preferences(key, value) VALUES('selectedWeekStart', :weekStart)")
+    suspend fun setSelectedWeekStart(weekStart: String)
+
+    @Query("SELECT value FROM preferences WHERE key = 'selectedDayDate'")
+    suspend fun selectedDayDate(): String?
+
+    @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)
 }

app/src/main/java/agzam/vyatsu/data/local/ScheduleCodec.kt

@@ -1,25 +0,0 @@
-package agzam.vyatsu.data.local
-
-import agzam.vyatsu.domain.model.Day
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.Types
-
-class ScheduleCodec(moshi: Moshi) {
-    private val type: java.lang.reflect.Type =
-        Types.newParameterizedType(List::class.java, DayDto::class.java)
-    private val adapter = moshi.adapter<List<DayDto>>(type)
-
-    fun toJson(days: List<Day>): String {
-        val dto = days.map { DayDto.fromDomain(it) }
-        return adapter.toJson(dto)
-    }
-
-    fun fromJson(json: String): List<Day> {
-        return try {
-            val dto = adapter.fromJson(json) ?: return emptyList()
-            dto.map { it.toDomain() }
-        } catch (t: Throwable) {
-            emptyList()
-        }
-    }
-}

app/src/main/java/agzam/vyatsu/data/local/ScheduleDao.kt

@@ -8,15 +8,68 @@ import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface ScheduleDao {
-    @Query("SELECT * FROM schedules WHERE groupId = :groupId")
-    fun observe(groupId: String): Flow<ScheduleEntity?>
 
-    @Query("SELECT * FROM schedules WHERE groupId = :groupId")
+    @Query("SELECT * FROM schedules WHERE groupId = :groupId ORDER BY weekStart DESC")
-    suspend fun get(groupId: String): ScheduleEntity?
+    fun observeSchedules(groupId: String): Flow<List<ScheduleEntity>>
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Query("SELECT * FROM schedules WHERE groupId = :groupId ORDER BY weekStart DESC")
-    suspend fun upsert(entity: ScheduleEntity)
+    suspend fun getSchedules(groupId: String): List<ScheduleEntity>
+
+    @Query("DELETE FROM days WHERE scheduleId = :scheduleId")
+    suspend fun deleteDaysForSchedule(scheduleId: Long)
+
+    @Insert(onConflict = OnConflictStrategy.ABORT)
+    suspend fun insertSchedule(schedule: ScheduleEntity): Long
+
+    @Query("DELETE FROM schedules WHERE groupId = :groupId AND season = :season AND weekStart = :weekStart")
+    suspend fun deleteSchedule(groupId: String, season: String, weekStart: Long)
 
     @Query("DELETE FROM schedules WHERE groupId = :groupId")
-    suspend fun delete(groupId: String)
+    suspend fun deleteAll(groupId: String)
+
+    @Query(
+        """
+        DELETE FROM schedules
+        WHERE groupId = :groupId
+          AND id NOT IN (
+              SELECT id FROM schedules
+              WHERE groupId = :groupId
+              ORDER BY weekStart DESC
+              LIMIT :keep
+          )
+        """
+    )
+    suspend fun trim(groupId: String, keep: Int)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertDays(days: List<DayEntity>): List<Long>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertLessons(lessons: List<LessonEntity>)
+
+    @Query(
+        "SELECT days.* FROM days INNER JOIN schedules ON schedules.id = days.scheduleId " +
+            "WHERE schedules.groupId = :groupId ORDER BY days.date"
+    )
+    suspend fun getDaysForGroup(groupId: String): List<DayEntity>
+
+    @Query(
+        "SELECT lessons.* FROM lessons INNER JOIN days ON days.id = lessons.dayId " +
+            "INNER JOIN schedules ON schedules.id = days.scheduleId " +
+            "WHERE schedules.groupId = :groupId ORDER BY lessons.date, lessons.slotIndex, lessons.lessonIndex"
+    )
+    suspend fun getLessonsForGroup(groupId: String): List<LessonEntity>
+
+    @Query(
+        "SELECT days.* FROM days INNER JOIN schedules ON schedules.id = days.scheduleId " +
+            "WHERE schedules.groupId = :groupId ORDER BY days.date"
+    )
+    fun observeDaysForGroup(groupId: String): Flow<List<DayEntity>>
+
+    @Query(
+        "SELECT lessons.* FROM lessons INNER JOIN days ON days.id = lessons.dayId " +
+            "INNER JOIN schedules ON schedules.id = days.scheduleId " +
+            "WHERE schedules.groupId = :groupId ORDER BY lessons.date, lessons.slotIndex, lessons.lessonIndex"
+    )
+    fun observeLessonsForGroup(groupId: String): Flow<List<LessonEntity>>
 }

app/src/main/java/agzam/vyatsu/data/local/ScheduleEntity.kt

@@ -1,14 +1,31 @@
 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
 
-@Entity(tableName = "schedules")
+@Entity(
+    tableName = "schedules",
+    foreignKeys = [
+        ForeignKey(
+            entity = GroupEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["groupId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ],
+    indices = [
+        Index("groupId"),
+        Index(value = ["groupId", "season", "weekStart"], unique = true)
+    ]
+)
 data class ScheduleEntity(
-    @PrimaryKey val groupId: String,
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    val season: String,
+    val groupId: String,
-    val dateRangeFirst: String,
+    val season: Season,
-    val dateRangeSecond: String,
+    val weekStart: Long,
-    val weeksJson: String,
+    val weekEnd: Long,
     val lastSyncedAt: Long
 )

app/src/main/java/agzam/vyatsu/data/local/SlotDto.kt

@@ -1,26 +0,0 @@
-package agzam.vyatsu.data.local
-
-import agzam.vyatsu.domain.model.TimeSlot
-import com.squareup.moshi.JsonClass
-import java.time.LocalTime
-
-@JsonClass(generateAdapter = true)
-data class SlotDto(
-    val start: String,
-    val end: String,
-    val lessons: List<LessonDto> = emptyList()
-) {
-    fun toDomain(): TimeSlot = TimeSlot(
-        start = LocalTime.parse(start),
-        end = LocalTime.parse(end),
-        lessons = lessons.map { it.toDomain() }
-    )
-
-    companion object {
-        fun fromDomain(s: TimeSlot): SlotDto = SlotDto(
-            start = s.start.toString(),
-            end = s.end.toString(),
-            lessons = s.lessons.map { LessonDto.fromDomain(it) }
-        )
-    }
-}

app/src/main/java/agzam/vyatsu/data/remote/GroupsParser.kt

@@ -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 java.io.InputStream
-import org.jsoup.Jsoup
 
 /**
  * Основано на 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> {
+    fun parseStream(input: InputStream): ParsedGroups {
-        val doc = Jsoup.parse(html)
+        val reader = input.bufferedReader(Charsets.UTF_8)
-        val container = doc.selectFirst("div.column-center_rasp") ?: return emptyList()
+        val buf = CharArray(CHUNK_SIZE)
-        val tables = container.select("table[style~=border: none !important]")
+        val pending = StringBuilder(CHUNK_SIZE * 2)
+        val groups = ArrayList<Group>()
+        val ranges = HashMap<String, HashMap<Season, MutableList<DateRange>>>()
+        var faculty = ""
 
-        return tables.flatMap { table ->
+        fun addRanges(text: String) {
-            table.select("> tbody > tr, > tr").flatMap { row ->
+            for (m in groupPattern.findAll(text)) {
-                Log.v("ROW", row.html());
+                val groupId = m.groupValues[1]
-                val faculty = shortname(row.selectFirst("div.fak_name")?.text().orEmpty()) //
+                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 ->
+        while (true) {
-                    Group(
+            val n = reader.read(buf)
-                        id = grp.attr("data-grp_period_id").dropLast(1),
+            if (n < 0) break
-                        name = removeParenthesized(grp.text()),
+            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>>> {
+                if (pos > MAX_SLICE) {
-        val result = HashMap<String, HashMap<Season, MutableList<DateRange>>>()
+                    pending.delete(0, pos)
-        groupPattern.findAll(html).forEach { m ->
+                    pos = 0
-            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)
                 }
-        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>>>
+)

app/src/main/java/agzam/vyatsu/data/remote/VyatsuHttpClient.kt

@@ -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()
+    }
+
 }

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

@@ -38,7 +38,7 @@ class Pdf2Table(page: PDPage) : PDFGraphicsStreamEngine(page) {
 
     private val svgBuilder = StringBuilder()
     private val currentPath = StringBuilder()
-    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))
         }

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

@@ -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)

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

@@ -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()) {
+        if (textPositions.isNullOrEmpty()) return
-            val first = textPositions.first()
+
-            val last = textPositions.last()
+        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
+            )
+        )
     }
 }

app/src/main/java/agzam/vyatsu/data/remote/update/GiteaReleaseApi.kt

@@ -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
+}

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

@@ -2,15 +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,
@@ -39,25 +42,34 @@ class GroupRepositoryImpl(
     }
 
     private suspend fun refresh() {
-        val html = VyatsuHttpClient.getText(VyatsuUrls.GROUPS_PAGE)
+        val parsed = withContext(Dispatchers.IO) {
-        val groups = GroupsParser.parseGroups(html)
+            VyatsuHttpClient.openStream(VyatsuUrls.GROUPS_PAGE).use(GroupsParser::parseStream)
-        val ranges = GroupsParser.parseDateRanges(html)
+        }
-        val entities = groups.map { group ->
+        val now = now()
-            val range = ranges[group.id]
+        groupDao.insertAll(
-            val autumn = range?.get(Season.AUTUMN)?.lastOrNull()
+            parsed.groups.map { group ->
-            val spring = range?.get(Season.SPRING)?.lastOrNull()
                 GroupEntity(
                     id = group.id,
                     name = group.name,
                     faculty = group.faculty,
-                autumnFirst = autumn?.first ?: "",
+                    lastSyncedAt = now
-                autumnSecond = autumn?.second ?: "",
-                springFirst = spring?.first ?: "",
-                springSecond = spring?.second ?: "",
-                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 now(): Long = System.currentTimeMillis()

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

@@ -9,4 +9,14 @@ class PreferencesRepositoryImpl(
     override suspend fun selectedGroupId(): String? = dao.selectedGroupId()
     override suspend fun setSelectedGroup(groupId: String) = dao.setSelectedGroup(groupId)
     override suspend fun clearSelectedGroup() = dao.clearSelectedGroup()
+    override suspend fun selectedWeekStart(): String? = dao.selectedWeekStart()
+    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())
 }

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

@@ -1,6 +1,8 @@
 package agzam.vyatsu.data.repository
 
-import agzam.vyatsu.data.local.ScheduleCodec
+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
 import agzam.vyatsu.data.local.GroupDao
@@ -9,45 +11,79 @@ import agzam.vyatsu.data.remote.pdf.PdfScheduleParser
 import agzam.vyatsu.data.remote.VyatsuHttpClient
 import agzam.vyatsu.data.remote.VyatsuUrls
 import agzam.vyatsu.domain.ScheduleDates
+import agzam.vyatsu.domain.model.Day
 import agzam.vyatsu.domain.model.DateRange
+import agzam.vyatsu.domain.model.Lesson
 import agzam.vyatsu.domain.model.Schedule
+import agzam.vyatsu.domain.model.SchedulePeriod
 import agzam.vyatsu.domain.model.Season
+import agzam.vyatsu.domain.model.TimeSlot
 import agzam.vyatsu.domain.repository.ScheduleRepository
 import android.util.Log
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.combine
+import java.time.LocalDate
+import java.time.LocalTime
 
 class ScheduleRepositoryImpl(
     private val scheduleDao: ScheduleDao,
-    private val groupDao: GroupDao,
+    private val groupDao: GroupDao
-    private val codec: ScheduleCodec
 ) : ScheduleRepository {
 
     override fun observeSchedule(groupId: String): Flow<Schedule?> =
-        scheduleDao.observe(groupId).map { it?.toDomain() }
+        combine(
+            scheduleDao.observeSchedules(groupId),
+            scheduleDao.observeDaysForGroup(groupId),
+            scheduleDao.observeLessonsForGroup(groupId)
+        ) { schedules, days, lessons ->
+            buildSchedule(schedules, days, lessons)
+        }
 
     override suspend fun getSchedule(groupId: String): Schedule? =
-        scheduleDao.get(groupId)?.toDomain()
+        buildSchedule(
+            scheduleDao.getSchedules(groupId),
+            scheduleDao.getDaysForGroup(groupId),
+            scheduleDao.getLessonsForGroup(groupId)
+        )
 
     override suspend fun sync(groupId: String): Schedule? {
         Log.d(TAG, "sync(groupId=$groupId) start")
-        val group = groupDao.getById(groupId)
+        val group = groupDao.getById(groupId) ?: run {
-        if (group == null) {
             Log.w(TAG, "sync: group $groupId not found in DB")
             return null
         }
-        val season = ScheduleDates.currentSeason()
+        val today = ScheduleDates.moscowToday().toEpochDay()
-        val range = dateRangeFor(group, season)
+        val periods = groupDao.getCurrentAndFuturePeriods(groupId, today)
-        if (range == null) {
+        if (periods.isEmpty()) {
-            Log.w(TAG, "sync: no date range for season $season (group ${group.id}, " +
+            Log.w(TAG, "sync: no current/future periods for group ${group.id}")
-                "autumn=[${group.autumnFirst}, ${group.autumnSecond}], " +
-                "spring=[${group.springFirst}, ${group.springSecond}])")
             return null
         }
-        Log.d(TAG, "sync: season=$season range=[${range.first}, ${range.second}]")
 
-        return try {
+        for (period in periods) {
-            val pdfUrl = VyatsuUrls.groupPdfUrl(groupId, season, range)
+            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")
@@ -55,51 +91,124 @@ class ScheduleRepositoryImpl(
             val days = PdfScheduleParser.parse(bytes)
             Log.d(TAG, "sync: parsed ${days.size} days")
 
-            val entity = ScheduleEntity(
+            val scheduleId = existing?.id ?: scheduleDao.insertSchedule(
-                groupId = groupId,
+                ScheduleEntity(
-                season = season.name,
+                    groupId = group.id,
-                dateRangeFirst = range.first,
+                    season = season,
-                dateRangeSecond = range.second,
+                    weekStart = period.weekStart,
-                weeksJson = codec.toJson(days),
+                    weekEnd = period.weekEnd,
                     lastSyncedAt = now()
                 )
-            scheduleDao.upsert(entity)
+            )
-            Log.d(TAG, "sync: upserted schedule for $groupId")
+            replaceDays(scheduleId, days)
-            entity.toDomain()
+            Log.d(TAG, "sync: period $range synced")
         } catch (e: Throwable) {
-            Log.e(TAG, "sync: failed for $groupId (${e::class.simpleName}: ${e.message})", e)
+            Log.e(TAG, "sync: failed for ${group.id} period $range (${e::class.simpleName}: ${e.message})", e)
-            null
         }
     }
 
     override suspend fun isStale(groupId: String): Boolean {
-        val entity = scheduleDao.get(groupId) ?: return true
+        val schedules = scheduleDao.getSchedules(groupId)
-        return now() - entity.lastSyncedAt > STALE_WINDOW_MS
+        val latest = schedules.maxByOrNull { it.weekStart } ?: return true
+        return now() - latest.lastSyncedAt > STALE_WINDOW_MS
     }
 
-    override suspend fun clear(groupId: String) = scheduleDao.delete(groupId)
+    override suspend fun clearPeriod(groupId: String, period: SchedulePeriod) {
+        scheduleDao.deleteSchedule(
+            groupId = groupId,
+            season = period.season.name,
+            weekStart = period.weekStart.toEpochDay()
+        )
+    }
 
-    private fun dateRangeFor(group: GroupEntity, season: Season): DateRange? {
+    override suspend fun clearAll(groupId: String) = scheduleDao.deleteAll(groupId)
-        return when (season) {
+
-            Season.AUTUMN -> if (group.autumnFirst.isNotEmpty() && group.autumnSecond.isNotEmpty()) {
+    private suspend fun replaceDays(scheduleId: Long, days: List<Day>) {
-                DateRange(group.autumnFirst, group.autumnSecond)
+        scheduleDao.deleteDaysForSchedule(scheduleId)
-            } else null
+        val dayEntities = days.map { DayEntity(scheduleId = scheduleId, date = it.date.toEpochDay()) }
-            Season.SPRING -> if (group.springFirst.isNotEmpty() && group.springSecond.isNotEmpty()) {
+        val dayIds = scheduleDao.insertDays(dayEntities)
-                DateRange(group.springFirst, group.springSecond)
+        val dayIdByDate = dayEntities.zip(dayIds).associate { (day, id) -> LocalDate.ofEpochDay(day.date) to id }
-            } else null
+        val lessons = days.flatMap { day ->
+            day.intervals.flatMapIndexed { slotIndex, slot ->
+                slot.lessons.mapIndexed { lessonIndex, lesson ->
+                    LessonEntity(
+                        dayId = dayIdByDate.getValue(day.date),
+                        date = day.date.toEpochDay(),
+                        slotIndex = slotIndex,
+                        start = slot.start.toMinutesOfDay(),
+                        end = slot.end.toMinutesOfDay(),
+                        lessonIndex = lessonIndex,
+                        raw = lesson.raw,
+                        room = lesson.room,
+                        groupName = lesson.group,
+                        subgroup = lesson.subgroup,
+                        subject = lesson.subject,
+                        type = lesson.type,
+                        teacher = lesson.teacher
+                    )
                 }
             }
+        }
+        scheduleDao.insertLessons(lessons)
+    }
+
+    private fun buildSchedule(
+        schedules: List<ScheduleEntity>,
+        dayEntities: List<DayEntity>,
+        lessonEntities: List<LessonEntity>
+    ): Schedule? {
+        if (schedules.isEmpty()) return null
+        val groupId = schedules.first().groupId
+
+        val periods = schedules.sortedBy { it.weekStart }.map {
+            SchedulePeriod(
+                weekStart = LocalDate.ofEpochDay(it.weekStart),
+                weekEnd = LocalDate.ofEpochDay(it.weekEnd),
+                season = it.season
+            )
+        }
+
+        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 }
+                    .toSortedMap()
+                    .map { (_, slotLessons) ->
+                        TimeSlot(
+                            start = LocalTime.of(slotLessons.first().start / 60, slotLessons.first().start % 60),
+                            end = LocalTime.of(slotLessons.first().end / 60, slotLessons.first().end % 60),
+                            lessons = slotLessons
+                                .sortedBy { it.lessonIndex }
+                                .map { it.toDomain() }
+                        )
+                    }
+                Day(date = LocalDate.ofEpochDay(day.date), intervals = lessons)
+            }
+
+        return Schedule(groupId = groupId, periods = periods, days = days)
+    }
+
+    private fun LessonEntity.toDomain(): Lesson = Lesson(
+        raw = raw,
+        room = room,
+        group = groupName,
+        subgroup = subgroup,
+        subject = subject,
+        type = type,
+        teacher = teacher
+    )
+
+    private fun LocalTime.toMinutesOfDay(): Int = hour * 60 + minute
 
     private fun now(): Long = System.currentTimeMillis()
 
-    private fun ScheduleEntity.toDomain(): Schedule = Schedule(
-        groupId = groupId,
-        season = Season.valueOf(season),
-        days = codec.fromJson(weeksJson)
-    )
-
     companion object {
         private const val STALE_WINDOW_MS = 12 * 60 * 60 * 1000L
+        private const val MAX_PERIODS = 24
         private const val TAG = "ScheduleRepo"
+        private val RANGE_FMT = java.time.format.DateTimeFormatter.ofPattern("ddMMyyyy")
     }
 }

app/src/main/java/agzam/vyatsu/di/AppContainer.kt

@@ -1,7 +1,6 @@
 package agzam.vyatsu.di
 
 import agzam.vyatsu.data.local.AppDatabase
-import agzam.vyatsu.data.local.ScheduleCodec
 import agzam.vyatsu.data.remote.GroupsParser
 import agzam.vyatsu.data.remote.VyatsuHttpClient
 import agzam.vyatsu.data.repository.GroupRepositoryImpl
@@ -10,20 +9,18 @@ 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
-import com.squareup.moshi.Moshi
 
 class AppContainer(context: Context) {
-    private val moshi: Moshi = Moshi.Builder().build()
-
     private val database: AppDatabase = Room.databaseBuilder(
         context.applicationContext,
         AppDatabase::class.java,
         "vyatsu_schedule.db"
-    ).build()
+    )
-
+        .fallbackToDestructiveMigration(dropAllTables = true)
-    private val codec: ScheduleCodec = ScheduleCodec(moshi)
+        .build()
 
     val groupRepository: GroupRepository by lazy {
         GroupRepositoryImpl(
@@ -35,11 +32,14 @@ class AppContainer(context: Context) {
         ScheduleRepositoryImpl(
             scheduleDao = database.scheduleDao(),
             groupDao = database.groupDao(),
-            codec = codec
         )
     }
 
     val preferencesRepository: PreferencesRepository by lazy {
         PreferencesRepositoryImpl(database.preferencesDao())
     }
+
+    val appUpdater: AppUpdater by lazy {
+        AppUpdater(context.applicationContext, preferencesRepository)
+    }
 }

app/src/main/java/agzam/vyatsu/domain/model/Schedule.kt

@@ -1,17 +1,21 @@
 package agzam.vyatsu.domain.model
 
-/**
+import java.time.LocalDate
- * Расписание группы, как правило содержит 2 недели
+
- * @author Agzam
+data class SchedulePeriod(
- */
+    val weekStart: LocalDate,
+    val weekEnd: LocalDate,
+    val season: Season
+)
+
 data class Schedule(
-
     val groupId: String,
-    val season: Season,
+    val periods: List<SchedulePeriod>,
-
-    /** Может содержать более 7 дней */
     val days: List<Day>
-
 ) {
+    fun periodOf(date: LocalDate): SchedulePeriod? =
+        periods.firstOrNull { !date.isBefore(it.weekStart) && !date.isAfter(it.weekEnd) }
 
+    fun daysOf(period: SchedulePeriod): List<Day> =
+        days.filter { !it.date.isBefore(period.weekStart) && !it.date.isAfter(period.weekEnd) }
 }

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

@@ -4,4 +4,14 @@ interface PreferencesRepository {
     suspend fun selectedGroupId(): String?
     suspend fun setSelectedGroup(groupId: String)
     suspend fun clearSelectedGroup()
+    suspend fun selectedWeekStart(): String?
+    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)
 }

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

@@ -1,6 +1,7 @@
 package agzam.vyatsu.domain.repository
 
 import agzam.vyatsu.domain.model.Schedule
+import agzam.vyatsu.domain.model.SchedulePeriod
 import kotlinx.coroutines.flow.Flow
 
 interface ScheduleRepository {
@@ -8,5 +9,6 @@ interface ScheduleRepository {
     suspend fun getSchedule(groupId: String): Schedule?
     suspend fun sync(groupId: String): Schedule?
     suspend fun isStale(groupId: String): Boolean
-    suspend fun clear(groupId: String)
+    suspend fun clearPeriod(groupId: String, period: SchedulePeriod)
+    suspend fun clearAll(groupId: String)
 }

app/src/main/java/agzam/vyatsu/ui/home/HomeScreen.kt

@@ -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)
             }
         }
     }

app/src/main/java/agzam/vyatsu/ui/info/BuildingsScreen.kt

@@ -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))
-        }
     }
 }

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

@@ -1,51 +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("Сменить группу")
                 }
@@ -53,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 -> {
+                state.schedule == null && state.loadError -> {
-                    Row(
-                        Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.Center
-                    ) {
-                        CircularProgressIndicator()
-                    }
-                }
-
-                state.schedule == null -> {
                     Column(
                         Modifier.fillMaxWidth(),
                         horizontalAlignment = Alignment.CenterHorizontally
@@ -81,36 +121,98 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                     }
                 }
 
+                state.schedule == null -> {
+                    Row(
+                        Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.Center
+                    ) {
+                        CircularProgressIndicator()
+                    }
+                }
+
                 else -> {
                     val schedule = state.schedule!!
-                    val day = schedule.days.getOrNull(state.selectedIndex)
+                    val weekDays = state.weekStart
+                        ?.let { ws -> schedule.periods.firstOrNull { it.weekStart == ws } }
+                        ?.let { schedule.daysOf(it) }
+                        .orEmpty()
+                    val day = schedule.days.firstOrNull { it.date == state.dayDate }
+
                     if (day == null) {
                         Text("Занятий нет", style = MaterialTheme.typography.bodyLarge)
                     } else {
-                        val isToday = state.selectedIndex == state.todayIndex
-                        val dayLabel = if (isToday) "Сегодня " 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)
                             )
-                        HorizontalDivider(Modifier.padding(vertical = 8.dp))
+                            WeekSelector(
+                                periods = schedule.periods,
+                                selectedWeekStart = state.weekStart,
+                                todayWeekStart = state.todayDate?.let { schedule.periodOf(it)?.weekStart },
+                                onSelect = viewModel::selectWeek
+                            )
+                        }
+                        HorizontalDivider(Modifier.padding(top = 8.dp, bottom = 0.dp, start = hPadding, end = hPadding))
 
                         DayChips(
-                            days = schedule.days,
+                            days = weekDays,
-                            selectedIndex = state.selectedIndex,
+                            selectedDate = state.dayDate,
-                            todayIndex = state.todayIndex,
+                            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),
+                                    modifier = Modifier.fillMaxSize(),
-                                verticalArrangement = Arrangement.spacedBy(8.dp)
+                                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                                    contentPadding = PaddingValues(vertical = 8.dp)
                                 ) {
                                     itemsIndexed(day.intervals) { slotIndex, slot ->
                                         LessonSlot(slotIndex = slotIndex, slot = slot)
@@ -123,21 +225,143 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
             }
         }
     }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun WeekSelector(
+    periods: List<SchedulePeriod>,
+    selectedWeekStart: LocalDate?,
+    todayWeekStart: LocalDate?,
+    onSelect: (LocalDate) -> Unit
+) {
+    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
+                DropdownMenuItem(
+                    text = {
+                        Text(
+                            weekLabel(period),
+                            style = MaterialTheme.typography.bodyLarge
+                        )
+                    },
+                    trailingIcon = if (isTodayWeek) {
+                        {
+                            Text(
+                                "сегодня",
+                                style = MaterialTheme.typography.labelMedium,
+                                color = MaterialTheme.colorScheme.primary
+                            )
+                        }
+                    } else {
+                        null
+                    },
+                    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>,
-    selectedIndex: Int,
+    selectedDate: LocalDate?,
-    todayIndex: Int,
+    todayDate: LocalDate?,
-    onSelect: (Int) -> Unit
+    pagerState: PagerState,
+    onSelect: (LocalDate) -> Unit
 ) {
-    LazyRow(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+    val listState = rememberLazyListState()
-        itemsIndexed(days) { index, day ->
+
-            val selected = selectedIndex == index
+    val density = LocalDensity.current
-            val isTodayChip = todayIndex == index
+
+    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
             FilterChip(
                 selected = selected,
-                onClick = { onSelect(index) },
+                onClick = { onSelect(day.date) },
                 label = {
                     Column(horizontalAlignment = Alignment.CenterHorizontally) {
                         Text(
@@ -172,31 +396,104 @@ private fun DayChips(
     }
 }
 
+private fun weekLabel(period: SchedulePeriod): String {
+    val first = period.weekStart
+    return "с ${first.format(CHIP_DATE)}"
+}
+
 @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 ->
+            slot.lessons.forEachIndexed { index, lesson ->
-                Column(Modifier.fillMaxWidth().padding(vertical = 2.dp)) {
+                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(" · ")
+
+                        if (meta.isNotEmpty()) {
                             Text(
-                        lesson.subject?.takeIf { it.isNotBlank() } ?: lesson.raw,
+                                meta,
-                        style = MaterialTheme.typography.bodyLarge
-                    )
-                    Text(
-                        listOf(lesson.type.label, lesson.subgroup, lesson.teacher, lesson.room)
-                            .filterNotNull()
-                            .filter { it.isNotBlank() }
-                            .joinToString(" · "),
                                 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)
+                            )
+                        }
+
+                    }
                 }
             }
         }

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

@@ -1,8 +1,8 @@
 package agzam.vyatsu.ui.schedule
 
 import agzam.vyatsu.domain.ScheduleDates
-import agzam.vyatsu.domain.model.Day
 import agzam.vyatsu.domain.model.Schedule
+import agzam.vyatsu.domain.repository.GroupRepository
 import agzam.vyatsu.domain.repository.PreferencesRepository
 import agzam.vyatsu.domain.repository.ScheduleRepository
 import androidx.lifecycle.ViewModel
@@ -11,10 +11,12 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import java.time.LocalDate
 
 class ScheduleViewModel(
     private val scheduleRepository: ScheduleRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val preferencesRepository: PreferencesRepository,
+    private val groupRepository: GroupRepository
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(ScheduleUiState())
@@ -28,86 +30,168 @@ 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)
-            _uiState.value = _uiState.value.copy(noGroup = false)
+            val groupName = groupRepository.getGroups().firstOrNull { it.id == groupId }?.name
+
+            val savedWeekStart = runCatching {
+                preferencesRepository.selectedWeekStart()?.let(LocalDate::parse)
+            }.getOrNull()
+            val savedDayDate = runCatching {
+                preferencesRepository.selectedDayDate()?.let(LocalDate::parse)
+            }.getOrNull()
+            _uiState.value = _uiState.value.copy(
+                noGroup = false,
+                groupName = groupName,
+                weekStart = savedWeekStart,
+                dayDate = savedDayDate
+            )
 
             launch {
                 scheduleRepository.observeSchedule(groupId).collect { schedule ->
-                    currentGroupId?.let {
+                    currentGroupId?.let { applySchedule(schedule) }
-                        val days = schedule?.days.orEmpty()
-                        val today = todayIndex(days)
-                        val current = _uiState.value
-                        val selected = current.selectedIndex.takeIf { i -> i in days.indices } ?: today
-                        _uiState.value = current.copy(
-                            schedule = schedule,
-                            todayIndex = today,
-                            selectedIndex = selected
-                        )
-                    }
                 }
             }
 
             launch {
-                _uiState.value = _uiState.value.copy(isSyncing = true)
+                syncIfMissing(groupId)
-                scheduleRepository.sync(groupId)
-                _uiState.value = _uiState.value.copy(isSyncing = false)
             }
         }
     }
 
+    private suspend fun applySchedule(schedule: Schedule?) {
+        val current = _uiState.value
+        if (schedule == null || schedule.periods.isEmpty()) {
+            _uiState.value = current.copy(schedule = schedule, todayDate = null)
+            return
+        }
+        val today = ScheduleDates.moscowToday()
+        val todayDate = if (schedule.periodOf(today) != null) today else null
+
+        val weekStart = when {
+            schedule.periods.any { it.weekStart == current.weekStart } -> current.weekStart!!
+            todayDate != null -> schedule.periodOf(todayDate)!!.weekStart
+            else -> schedule.periods.first().weekStart
+        }
+        val period = schedule.periods.first { it.weekStart == weekStart }
+        val weekDays = schedule.daysOf(period)
+
+        val dayDate = when {
+            weekDays.any { it.date == current.dayDate } -> current.dayDate
+            weekDays.any { it.date == todayDate } -> todayDate
+            else -> weekDays.firstOrNull()?.date
+        }
+
+        preferencesRepository.setSelectedWeekStart(weekStart.toString())
+        dayDate?.let { preferencesRepository.setSelectedDayDate(it.toString()) }
+
+        _uiState.value = current.copy(
+            schedule = schedule,
+            weekStart = weekStart,
+            dayDate = dayDate,
+            todayDate = todayDate,
+            isLoading = false,
+            loadError = false
+        )
+    }
+
+    fun selectWeek(weekStart: LocalDate) {
+        val state = _uiState.value
+        val schedule = state.schedule ?: return
+        val period = schedule.periods.firstOrNull { it.weekStart == weekStart } ?: return
+        viewModelScope.launch {
+            val today = ScheduleDates.moscowToday()
+            val weekDays = schedule.daysOf(period)
+            val dayDate = when {
+                weekDays.any { it.date == today } -> today
+                else -> weekDays.firstOrNull()?.date
+            }
+            preferencesRepository.setSelectedWeekStart(weekStart.toString())
+            dayDate?.let { preferencesRepository.setSelectedDayDate(it.toString()) }
+            _uiState.value = _uiState.value.copy(weekStart = weekStart, dayDate = dayDate)
+        }
+    }
+
+    fun selectDay(date: LocalDate) {
+        val state = _uiState.value
+        val schedule = state.schedule ?: return
+        val period = schedule.periodOf(date) ?: return
+        viewModelScope.launch {
+            preferencesRepository.setSelectedWeekStart(period.weekStart.toString())
+            preferencesRepository.setSelectedDayDate(date.toString())
+            _uiState.value = _uiState.value.copy(weekStart = period.weekStart, dayDate = date)
+        }
+    }
+
+    private suspend fun 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)
+            _uiState.value = _uiState.value.copy(isLoading = true, loadError = false)
-            scheduleRepository.sync(groupId)
+            // Обновляем список групп: так подхватываются новые PDF (периоды), появившиеся на сайте.
-            val current = _uiState.value
+            runCatching { groupRepository.forceRefresh() }
-            val days = current.schedule?.days.orEmpty()
+            loadSchedule(groupId)
-            val today = todayIndex(days)
-            _uiState.value = current.copy(
-                isRefreshing = false,
-                todayIndex = today,
-                selectedIndex = current.selectedIndex.takeIf { it in days.indices } ?: today
-            )
         }
     }
 
-    fun selectDay(index: Int) {
+    fun clearAll() {
-        val days = _uiState.value.schedule?.days.orEmpty()
+        val groupId = currentGroupId ?: return
-        if (index !in days.indices) return
+        viewModelScope.launch {
-        _uiState.value = _uiState.value.copy(selectedIndex = index)
+            scheduleRepository.clearAll(groupId)
+        }
     }
 
-    private fun todayIndex(days: List<Day>): Int {
+    fun clearSelectedPeriod() {
-        if (days.isEmpty()) return 0
+        val state = _uiState.value
-        val today = ScheduleDates.moscowToday()
+        val schedule = state.schedule ?: return
-        val exact = days.indexOfFirst { it.date == today }
+        val weekStart = state.weekStart ?: return
-        if (exact >= 0) return exact
+        val period = schedule.periods.firstOrNull { it.weekStart == weekStart } ?: return
-        val next = days.indexOfFirst { !it.date.isBefore(today) }
+        viewModelScope.launch {
-        return if (next >= 0) next else days.lastIndex
+            scheduleRepository.clearPeriod(schedule.groupId, period)
+        }
     }
 }
 
 data class ScheduleUiState(
     val noGroup: Boolean = false,
-    val isRefreshing: Boolean = false,
+    val isLoading: Boolean = false,
-    val isSyncing: Boolean = false,
+    val loadError: Boolean = false,
     val schedule: Schedule? = null,
-    val todayIndex: Int = 0,
+    val groupName: String? = null,
-    val selectedIndex: Int = 0
+    val weekStart: LocalDate? = null,
+    val dayDate: LocalDate? = null,
+    val todayDate: LocalDate? = null
 )

app/src/main/java/agzam/vyatsu/ui/settings/SettingsScreen.kt

@@ -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))
+}

app/src/main/java/agzam/vyatsu/ui/settings/UpdateViewModel.kt

@@ -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()
+}

app/src/main/java/agzam/vyatsu/update/AppUpdater.kt

@@ -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
+    }
+}

app/src/main/res/drawable/icon.xml

@@ -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>

app/src/main/res/icon.svg

@@ -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>

app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">VyatsuSchedule</string>
+    <string name="app_name">ВятГУ Расписание</string>
 </resources>

app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <cache-path
+        name="updates"
+        path="updates/" />
+</paths>