ui: group display istead of teacher in teacher schedule

slotIndex is a per-department index of non-empty intervals, not a time.
Merging all departments of a period by slotIndex and deriving the slot
time from the first inserted lesson produced shifted times (e.g. Meltsov
10:00 shown at 11:45) depending on sync order. Group by lesson start
minute instead so each department's real times are kept.

Add debug logging for teacher schedule sync/build and debounce teacher
search in picker.

.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-секрет и декодируется в файл.

app/build.gradle.kts

@@ -19,7 +19,7 @@ android {
         versionCode = 1
         // В продакшн-сборке версию приложения подставляет CI (env APP_VERSION = дата ГГГГ.ММ.ДД).
         // Локально и при отсутствии переменной — fallback "1.0".
-        versionName = System.getenv("APP_VERSION") ?: "1.0"
+        versionName = System.getenv("APP_VERSION") ?: "debug"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -40,7 +40,8 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -53,6 +54,7 @@ android {
     }
     testOptions {
         unitTests.isReturnDefaultValues = true
+        unitTests.all { it.maxHeapSize = "16m" }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11

app/proguard-rules.pro

@@ -19,3 +19,22 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+# Игнорировать отсутствие класса декодера JP2 в PdfBox-Android
+-dontwarn com.gemalto.jp2.JP2Decoder
+# На всякий случай, если PdfBox ссылается на другие отсутствующие библиотеки (например, ICU для текста)
+-dontwarn com.tom_roush.pdfbox.**
+
+# Запретить R8 удалять и переименовывать внутренности PdfBox-Android
+-keep class com.tom_roush.pdfbox.** { *; }
+-keep interface com.tom_roush.pdfbox.** { *; }
+
+# Moshi удаляется proguard
+-keepnames @com.squareup.moshi.JsonClass class *
+-keep class **JsonAdapter {
+    public <init>(...);
+    <fields>;
+}
+-keepclassmembers @com.squareup.moshi.JsonClass class * {
+    synthetic <init>(...);
+}

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/schemas/agzam.vyatsu.data.local.AppDatabase/4.json

@@ -0,0 +1,818 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "38abab3f8c5b39625b6a4de9d58968ca",
+    "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"
+          ]
+        }
+      },
+      {
+        "tableName": "departments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`departmentId` TEXT NOT NULL, `name` TEXT NOT NULL, `faculty` TEXT NOT NULL, `lastSyncedAt` INTEGER NOT NULL, PRIMARY KEY(`departmentId`))",
+        "fields": [
+          {
+            "fieldPath": "departmentId",
+            "columnName": "departmentId",
+            "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": [
+            "departmentId"
+          ]
+        }
+      },
+      {
+        "tableName": "department_periods",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `departmentId` TEXT NOT NULL, `season` TEXT NOT NULL, `weekStart` INTEGER NOT NULL, `weekEnd` INTEGER NOT NULL, FOREIGN KEY(`departmentId`) REFERENCES `departments`(`departmentId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "departmentId",
+            "columnName": "departmentId",
+            "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_department_periods_departmentId",
+            "unique": false,
+            "columnNames": [
+              "departmentId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_department_periods_departmentId` ON `${TABLE_NAME}` (`departmentId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "departments",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "departmentId"
+            ],
+            "referencedColumns": [
+              "departmentId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "teacher_schedules",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `departmentId` TEXT NOT NULL, `season` TEXT NOT NULL, `weekStart` INTEGER NOT NULL, `weekEnd` INTEGER NOT NULL, `lastSyncedAt` INTEGER NOT NULL, FOREIGN KEY(`departmentId`) REFERENCES `departments`(`departmentId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "departmentId",
+            "columnName": "departmentId",
+            "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_teacher_schedules_departmentId",
+            "unique": false,
+            "columnNames": [
+              "departmentId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_teacher_schedules_departmentId` ON `${TABLE_NAME}` (`departmentId`)"
+          },
+          {
+            "name": "index_teacher_schedules_departmentId_season_weekStart",
+            "unique": true,
+            "columnNames": [
+              "departmentId",
+              "season",
+              "weekStart"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_teacher_schedules_departmentId_season_weekStart` ON `${TABLE_NAME}` (`departmentId`, `season`, `weekStart`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "departments",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "departmentId"
+            ],
+            "referencedColumns": [
+              "departmentId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "teacher_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 `teacher_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_teacher_days_scheduleId",
+            "unique": false,
+            "columnNames": [
+              "scheduleId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_teacher_days_scheduleId` ON `${TABLE_NAME}` (`scheduleId`)"
+          },
+          {
+            "name": "index_teacher_days_date",
+            "unique": false,
+            "columnNames": [
+              "date"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_teacher_days_date` ON `${TABLE_NAME}` (`date`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "teacher_schedules",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "scheduleId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "teacher_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 NOT NULL, FOREIGN KEY(`dayId`) REFERENCES `teacher_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",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_teacher_lessons_dayId",
+            "unique": false,
+            "columnNames": [
+              "dayId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_teacher_lessons_dayId` ON `${TABLE_NAME}` (`dayId`)"
+          },
+          {
+            "name": "index_teacher_lessons_teacher",
+            "unique": false,
+            "columnNames": [
+              "teacher"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_teacher_lessons_teacher` ON `${TABLE_NAME}` (`teacher`)"
+          },
+          {
+            "name": "index_teacher_lessons_room",
+            "unique": false,
+            "columnNames": [
+              "room"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_teacher_lessons_room` ON `${TABLE_NAME}` (`room`)"
+          },
+          {
+            "name": "index_teacher_lessons_subject",
+            "unique": false,
+            "columnNames": [
+              "subject"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_teacher_lessons_subject` ON `${TABLE_NAME}` (`subject`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "teacher_days",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "dayId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      }
+    ],
+    "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, '38abab3f8c5b39625b6a4de9d58968ca')"
+    ]
+  }
+}

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

@@ -1,10 +1,15 @@
 package agzam.vyatsu
 
 import agzam.vyatsu.di.AppContainer
-import agzam.vyatsu.ui.groups.GroupPickerScreen
-import agzam.vyatsu.ui.groups.GroupPickerViewModel
 import agzam.vyatsu.ui.home.HomeScreen
+import agzam.vyatsu.ui.picker.PickerScreen
+import agzam.vyatsu.ui.picker.PickerViewModel
 import agzam.vyatsu.ui.schedule.ScheduleViewModel
+import agzam.vyatsu.ui.settings.UpdateViewModel
+import agzam.vyatsu.ui.teacher.TeacherScheduleViewModel
+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,20 +24,51 @@ fun AppRoot() {
     val container = app.container
 
     val scheduleViewModel: ScheduleViewModel = viewModel(factory = scheduleFactory(container))
-    val groupPickerViewModel: GroupPickerViewModel = viewModel(factory = groupPickerFactory(container))
+    val teacherScheduleViewModel: TeacherScheduleViewModel = viewModel(factory = teacherScheduleFactory(container))
+    val updateViewModel: UpdateViewModel = viewModel(factory = updateFactory(container))
 
     val state by scheduleViewModel.uiState.collectAsState()
+    val teacherState by teacherScheduleViewModel.uiState.collectAsState()
+    val showFirstRunDialog by updateViewModel.showFirstRunDialog.collectAsState()
 
-    if (state.noGroup) {
+    if (showFirstRunDialog) {
-        GroupPickerScreen(
+        AlertDialog(
-            viewModel = groupPickerViewModel,
+            onDismissRequest = { updateViewModel.onFirstRunDecision(false) },
-            onGroupPicked = { group -> scheduleViewModel.selectGroup(group.id) }
+            title = { Text("Автоматические обновления") },
+            text = {
+                Text(
+                    "Разрешить автоматически проверять и устанавливать " +
+                        "новые версии приложения?"
+                )
+            },
+            confirmButton = {
+                TextButton(onClick = { updateViewModel.onFirstRunDecision(true) }) {
+                    Text("Разрешить")
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { updateViewModel.onFirstRunDecision(false) }) {
+                    Text("Не надо")
+                }
+            }
+        )
+    }
+
+    if (state.noGroup && teacherState.noTeacher) {
+        val pickerViewModel: PickerViewModel = viewModel(factory = pickerFactory(container))
+        PickerScreen(
+            viewModel = pickerViewModel,
+            onGroupPicked = { group -> scheduleViewModel.selectGroup(group.id) },
+            onTeacherPicked = { teacher -> teacherScheduleViewModel.selectTeacher(teacher.name) }
         )
         return
     }
     HomeScreen(
         scheduleViewModel = scheduleViewModel,
-        onSwitchGroup = { scheduleViewModel.switchGroup() }
+        teacherScheduleViewModel = teacherScheduleViewModel,
+        updateViewModel = updateViewModel,
+        onSwitchGroup = { scheduleViewModel.switchGroup() },
+        onSwitchTeacher = { teacherScheduleViewModel.switchTeacher() }
     )
 }
 
@@ -42,4 +78,13 @@ private class SimpleFactory<T : ViewModel>(private val create: () -> T) : ViewMo
 }
 
 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 teacherScheduleFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { TeacherScheduleViewModel(c.teacherScheduleRepository, c.preferencesRepository) }
+private fun pickerFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory {
+    PickerViewModel(
+        c.groupRepository,
+        c.teacherRepository,
+        c.teacherScheduleRepository,
+        c.preferencesRepository
+    )
+}
+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

@@ -3,16 +3,24 @@ package agzam.vyatsu.data.local
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 
 @Database(
     entities = [
         GroupEntity::class,
+        GroupPeriodEntity::class,
         ScheduleEntity::class,
         DayEntity::class,
         LessonEntity::class,
-        PreferenceEntity::class
+        PreferenceEntity::class,
+        DepartmentEntity::class,
+        DepartmentPeriodEntity::class,
+        TeacherScheduleEntity::class,
+        TeacherDayEntity::class,
+        TeacherLessonEntity::class
     ],
-    version = 2,
+    version = 4,
     exportSchema = true
 )
 @TypeConverters(Converters::class)
@@ -20,4 +28,91 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun groupDao(): GroupDao
     abstract fun scheduleDao(): ScheduleDao
     abstract fun preferencesDao(): PreferencesDao
+    abstract fun teacherDao(): TeacherDao
+    abstract fun teacherScheduleDao(): TeacherScheduleDao
+
+    companion object {
+        val MIGRATION_3_4 = object : Migration(3, 4) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL(
+                    "CREATE TABLE IF NOT EXISTS `departments` (" +
+                        "`departmentId` TEXT NOT NULL, `name` TEXT NOT NULL, " +
+                        "`faculty` TEXT NOT NULL, `lastSyncedAt` INTEGER NOT NULL, " +
+                        "PRIMARY KEY(`departmentId`))"
+                )
+                db.execSQL(
+                    "CREATE TABLE IF NOT EXISTS `department_periods` (" +
+                        "`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
+                        "`departmentId` TEXT NOT NULL, `season` TEXT NOT NULL, " +
+                        "`weekStart` INTEGER NOT NULL, `weekEnd` INTEGER NOT NULL, " +
+                        "FOREIGN KEY(`departmentId`) REFERENCES `departments`(`departmentId`) " +
+                        "ON UPDATE NO ACTION ON DELETE CASCADE )"
+                )
+                db.execSQL(
+                    "CREATE INDEX IF NOT EXISTS `index_department_periods_departmentId` " +
+                        "ON `department_periods` (`departmentId`)"
+                )
+                db.execSQL(
+                    "CREATE TABLE IF NOT EXISTS `teacher_schedules` (" +
+                        "`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
+                        "`departmentId` TEXT NOT NULL, `season` TEXT NOT NULL, " +
+                        "`weekStart` INTEGER NOT NULL, `weekEnd` INTEGER NOT NULL, " +
+                        "`lastSyncedAt` INTEGER NOT NULL, " +
+                        "FOREIGN KEY(`departmentId`) REFERENCES `departments`(`departmentId`) " +
+                        "ON UPDATE NO ACTION ON DELETE CASCADE )"
+                )
+                db.execSQL(
+                    "CREATE INDEX IF NOT EXISTS `index_teacher_schedules_departmentId` " +
+                        "ON `teacher_schedules` (`departmentId`)"
+                )
+                db.execSQL(
+                    "CREATE UNIQUE INDEX IF NOT EXISTS `index_teacher_schedules_departmentId_season_weekStart` " +
+                        "ON `teacher_schedules` (`departmentId`, `season`, `weekStart`)"
+                )
+                db.execSQL(
+                    "CREATE TABLE IF NOT EXISTS `teacher_days` (" +
+                        "`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
+                        "`scheduleId` INTEGER NOT NULL, `date` INTEGER NOT NULL, " +
+                        "FOREIGN KEY(`scheduleId`) REFERENCES `teacher_schedules`(`id`) " +
+                        "ON UPDATE NO ACTION ON DELETE CASCADE )"
+                )
+                db.execSQL(
+                    "CREATE INDEX IF NOT EXISTS `index_teacher_days_scheduleId` " +
+                        "ON `teacher_days` (`scheduleId`)"
+                )
+                db.execSQL(
+                    "CREATE INDEX IF NOT EXISTS `index_teacher_days_date` " +
+                        "ON `teacher_days` (`date`)"
+                )
+                db.execSQL(
+                    "CREATE TABLE IF NOT EXISTS `teacher_lessons` (" +
+                        "`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 NOT NULL, " +
+                        "FOREIGN KEY(`dayId`) REFERENCES `teacher_days`(`id`) " +
+                        "ON UPDATE NO ACTION ON DELETE CASCADE )"
+                )
+                db.execSQL(
+                    "CREATE INDEX IF NOT EXISTS `index_teacher_lessons_dayId` " +
+                        "ON `teacher_lessons` (`dayId`)"
+                )
+                db.execSQL(
+                    "CREATE INDEX IF NOT EXISTS `index_teacher_lessons_teacher` " +
+                        "ON `teacher_lessons` (`teacher`)"
+                )
+                db.execSQL(
+                    "CREATE INDEX IF NOT EXISTS `index_teacher_lessons_room` " +
+                        "ON `teacher_lessons` (`room`)"
+                )
+                db.execSQL(
+                    "CREATE INDEX IF NOT EXISTS `index_teacher_lessons_subject` " +
+                        "ON `teacher_lessons` (`subject`)"
+                )
+            }
+        }
+    }
 }

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

@@ -0,0 +1,12 @@
+package agzam.vyatsu.data.local
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "departments")
+data class DepartmentEntity(
+    @PrimaryKey val departmentId: String,
+    val name: String,
+    val faculty: String,
+    val lastSyncedAt: Long
+)

app/src/main/java/agzam/vyatsu/data/local/DepartmentPeriodEntity.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 = "department_periods",
+    foreignKeys = [
+        ForeignKey(
+            entity = DepartmentEntity::class,
+            parentColumns = ["departmentId"],
+            childColumns = ["departmentId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ],
+    indices = [Index("departmentId")]
+)
+data class DepartmentPeriodEntity(
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    val departmentId: String,
+    val season: Season,
+    val weekStart: Long,
+    val weekEnd: 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: Long?,
-    val autumnSecond: Long?,
-    val springFirst: Long?,
-    val springSecond: Long?,
     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/PreferencesDao.kt

@@ -27,4 +27,46 @@ interface PreferencesDao {
 
     @Query("INSERT OR REPLACE INTO preferences(key, value) VALUES('selectedDayDate', :date)")
     suspend fun setSelectedDayDate(date: String)
+
+    @Query("SELECT value FROM preferences WHERE key = 'selectedTeacherId'")
+    suspend fun selectedTeacherId(): String?
+
+    @Query(
+        "INSERT OR REPLACE INTO preferences(key, value) VALUES('selectedTeacherId', :teacherId)"
+    )
+    suspend fun setSelectedTeacherId(teacherId: String)
+
+    @Query("SELECT value FROM preferences WHERE key = 'selectedTeacherWeekStart'")
+    suspend fun selectedTeacherWeekStart(): String?
+
+    @Query(
+        "INSERT OR REPLACE INTO preferences(key, value) VALUES('selectedTeacherWeekStart', :weekStart)"
+    )
+    suspend fun setSelectedTeacherWeekStart(weekStart: String)
+
+    @Query("SELECT value FROM preferences WHERE key = 'selectedTeacherDayDate'")
+    suspend fun selectedTeacherDayDate(): String?
+
+    @Query(
+        "INSERT OR REPLACE INTO preferences(key, value) VALUES('selectedTeacherDayDate', :date)"
+    )
+    suspend fun setSelectedTeacherDayDate(date: String)
+
+    @Query(
+        "DELETE FROM preferences WHERE key IN " +
+            "('selectedTeacherId', 'selectedTeacherWeekStart', 'selectedTeacherDayDate')"
+    )
+    suspend fun clearSelectedTeacher()
+
+    @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/TeacherDao.kt

@@ -0,0 +1,39 @@
+package agzam.vyatsu.data.local
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface TeacherDao {
+    @Query("SELECT * FROM departments ORDER BY name")
+    fun observeDepartments(): Flow<List<DepartmentEntity>>
+
+    @Query("SELECT * FROM departments WHERE departmentId = :id")
+    suspend fun getDepartment(id: String): DepartmentEntity?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAll(departments: List<DepartmentEntity>)
+
+    @Query("SELECT MAX(lastSyncedAt) FROM departments")
+    suspend fun maxSyncedAt(): Long?
+
+    @Query("SELECT DISTINCT faculty FROM departments ORDER BY faculty")
+    suspend fun getFaculties(): List<String>
+
+    @Query("DELETE FROM department_periods")
+    suspend fun deleteAllPeriods()
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertPeriods(periods: List<DepartmentPeriodEntity>)
+
+    @Query(
+        "SELECT * FROM department_periods WHERE weekStart <= :epochDay AND weekEnd >= :epochDay ORDER BY departmentId"
+    )
+    suspend fun getPeriodsForDate(epochDay: Long): List<DepartmentPeriodEntity>
+
+    @Query("SELECT * FROM department_periods WHERE departmentId = :departmentId ORDER BY weekStart")
+    suspend fun getPeriodsForDepartment(departmentId: String): List<DepartmentPeriodEntity>
+}

app/src/main/java/agzam/vyatsu/data/local/TeacherDayEntity.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 = "teacher_days",
+    foreignKeys = [
+        ForeignKey(
+            entity = TeacherScheduleEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["scheduleId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ],
+    indices = [
+        Index("scheduleId"),
+        Index("date")
+    ]
+)
+data class TeacherDayEntity(
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    val scheduleId: Long,
+    val date: Long
+)

app/src/main/java/agzam/vyatsu/data/local/TeacherLessonEntity.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 = "teacher_lessons",
+    foreignKeys = [
+        ForeignKey(
+            entity = TeacherDayEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["dayId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ],
+    indices = [
+        Index("dayId"),
+        Index("teacher"),
+        Index("room"),
+        Index("subject")
+    ]
+)
+data class TeacherLessonEntity(
+    @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/TeacherScheduleDao.kt

@@ -0,0 +1,81 @@
+package agzam.vyatsu.data.local
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface TeacherScheduleDao {
+
+    @Query("SELECT * FROM teacher_schedules ORDER BY weekStart DESC")
+    fun observeSchedules(): Flow<List<TeacherScheduleEntity>>
+
+    @Query("SELECT * FROM teacher_schedules ORDER BY weekStart DESC")
+    suspend fun getSchedules(): List<TeacherScheduleEntity>
+
+    @Query("DELETE FROM teacher_days WHERE scheduleId = :scheduleId")
+    suspend fun deleteDaysForSchedule(scheduleId: Long)
+
+    @Insert(onConflict = OnConflictStrategy.ABORT)
+    suspend fun insertSchedule(schedule: TeacherScheduleEntity): Long
+
+    @Query(
+        "DELETE FROM teacher_schedules WHERE departmentId = :departmentId AND season = :season AND weekStart = :weekStart"
+    )
+    suspend fun deleteSchedule(departmentId: String, season: String, weekStart: Long)
+
+    @Query("DELETE FROM teacher_schedules WHERE season = :season AND weekStart = :weekStart")
+    suspend fun deletePeriod(season: String, weekStart: Long)
+
+    @Query("DELETE FROM teacher_schedules")
+    suspend fun deleteAll()
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertDays(days: List<TeacherDayEntity>): List<Long>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertLessons(lessons: List<TeacherLessonEntity>)
+
+    @Transaction
+    suspend fun replaceSchedule(schedule: TeacherScheduleEntity, days: List<TeacherDayEntity>, lessons: List<TeacherLessonEntity>) {
+        val scheduleId = insertSchedule(schedule)
+        val daysWithScheduleId = days.map { it.copy(scheduleId = scheduleId) }
+        deleteDaysForSchedule(scheduleId)
+        val dayIds = insertDays(daysWithScheduleId)
+        val dayIdByDate = daysWithScheduleId.zip(dayIds).associate { (day, id) -> day.date to id }
+        insertLessons(lessons.map { lesson -> lesson.copy(dayId = dayIdByDate.getValue(lesson.date)) })
+    }
+
+    @Query(
+        "SELECT teacher_days.* FROM teacher_days INNER JOIN teacher_schedules ON teacher_schedules.id = teacher_days.scheduleId " +
+            "WHERE teacher_schedules.season = :season AND teacher_schedules.weekStart <= :weekStart " +
+            "AND teacher_schedules.weekEnd >= :weekStart ORDER BY teacher_days.date"
+    )
+    fun observeDaysForPeriod(season: String, weekStart: Long): Flow<List<TeacherDayEntity>>
+
+    @Query(
+        "SELECT teacher_lessons.* FROM teacher_lessons INNER JOIN teacher_days ON teacher_days.id = teacher_lessons.dayId " +
+            "INNER JOIN teacher_schedules ON teacher_schedules.id = teacher_days.scheduleId " +
+            "WHERE teacher_schedules.season = :season AND teacher_schedules.weekStart <= :weekStart " +
+            "AND teacher_schedules.weekEnd >= :weekStart " +
+            "ORDER BY teacher_lessons.date, teacher_lessons.slotIndex, teacher_lessons.lessonIndex"
+    )
+    fun observeLessonsForPeriod(season: String, weekStart: Long): Flow<List<TeacherLessonEntity>>
+
+    @Query(
+        "SELECT DISTINCT teacher FROM teacher_lessons INNER JOIN teacher_days ON teacher_days.id = teacher_lessons.dayId " +
+            "INNER JOIN teacher_schedules ON teacher_schedules.id = teacher_days.scheduleId " +
+            "WHERE teacher_schedules.season = :season AND teacher_schedules.weekStart <= :weekStart " +
+            "AND teacher_schedules.weekEnd >= :weekStart ORDER BY teacher"
+    )
+    fun observeDistinctTeachers(season: String, weekStart: Long): Flow<List<String>>
+
+    @Query(
+        "SELECT EXISTS(SELECT 1 FROM teacher_schedules WHERE season = :season " +
+            "AND weekStart <= :weekStart AND weekEnd >= :weekStart)"
+    )
+    suspend fun hasSchedulesForPeriod(season: String, weekStart: Long): Boolean
+}

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

@@ -0,0 +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 = "teacher_schedules",
+    foreignKeys = [
+        ForeignKey(
+            entity = DepartmentEntity::class,
+            parentColumns = ["departmentId"],
+            childColumns = ["departmentId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ],
+    indices = [
+        Index("departmentId"),
+        Index(value = ["departmentId", "season", "weekStart"], unique = true)
+    ]
+)
+data class TeacherScheduleEntity(
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    val departmentId: String,
+    val season: Season,
+    val weekStart: Long,
+    val weekEnd: Long,
+    val lastSyncedAt: Long
+)

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

@@ -0,0 +1,36 @@
+package agzam.vyatsu.data.remote
+
+/**
+ * Справочник сокращённых названий факультетов ВятГУ.
+ * Вынесен из GroupsParser, так как TeachersParser использует те же сокращения.
+ */
+object FacultyNames {
+
+    private val parenthesized = Regex("""\(.*?\)\s?""")
+
+    private val shorthands = mapOf(
+        "Институт биологии и биотехнологии (факультет)(ОРУ)" to "ИББТ",
+        "Институт химии и экологии (факультет) (ОРУ)" to "ИнХимЭк",
+        "Факультет автоматики и вычислительной техники (ОРУ)" to "ФАВТ",
+        "Факультет истории, политических наук и культурологии (ОРУ)" to "ФИПНК",
+        "Факультет компьютерных и физико-математических наук (ОРУ)" to "ФКФМН",
+        "Факультет лингвистики (ОРУ)" to "ФЛ",
+        "Факультет менеджмента и сервиса (ОРУ)" to "ФМиС",
+        "Факультет педагогики и психологии (ОРУ)" to "ФПП",
+        "Факультет строительства и архитектуры (ОРУ)" to "ФСА",
+        "Факультет технологий, инжиниринга и дизайна (ОРУ)" to "ФТИД",
+        "Факультет физической культуры и спорта (ОРУ)" to "ФФКС",
+        "Факультет филологии и медиакоммуникаций (ОРУ)" to "ФФМ",
+        "Факультет экономики и финансов (ОРУ)" to "ФЭиФ",
+        "Электротехнический факультет (ОРУ)" to "ЭТФ",
+        "Юридический институт (факультет) (ОРУ)" to "ЮИ"
+    )
+
+    fun shortname(name: String): String {
+        val stripped = removeParenthesized(name)
+        val sh = shorthands[name]
+        return if (sh != null) "$sh ($stripped)" else stripped
+    }
+
+    fun removeParenthesized(name: String): String = name.replace(parenthesized, "").trim()
+}

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,67 +13,145 @@ object GroupsParser {
 
     private val groupPattern = Regex("""/reports/schedule/Group/(\d{4,})_([12])_(\d{8})_(\d{8})\.pdf""")
 
-    private val shorthands = mapOf(
+    private val grpIdPattern = Regex("""data-grp_period_id="(\d+)"""")
-        "Институт биологии и биотехнологии (факультет)(ОРУ)" to "ИББТ",
+
-        "Институт химии и экологии (факультет) (ОРУ)" to "ИнХимЭк",
+    private const val CHUNK_SIZE = 8192
-        "Факультет автоматики и вычислительной техники (ОРУ)" to "ФАВТ",
+    private const val MAX_SLICE = 1 shl 16      // 64 KiB — защита от аномально длинных единиц
-        "Факультет истории, политических наук и культурологии (ОРУ)" to "ФИПНК",
+    private const val MAX_PENDING = 1 shl 20    // 1 MiB — жёсткий потолок буфера
-        "Факультет компьютерных и физико-математических наук (ОРУ)" to "ФКФМН",
-        "Факультет лингвистики (ОРУ)" to "ФЛ",
-        "Факультет менеджмента и сервиса (ОРУ)" to "ФМиС",
-        "Факультет педагогики и психологии (ОРУ)" to "ФПП",
-        "Факультет строительства и архитектуры (ОРУ)" to "ФСА",
-        "Факультет технологий, инжиниринга и дизайна (ОРУ)" to "ФТИД",
-        "Факультет физической культуры и спорта (ОРУ)" to "ФФКС",
-        "Факультет филологии и медиакоммуникаций (ОРУ)" to "ФФМ",
-        "Факультет экономики и финансов (ОРУ)" to "ФЭиФ",
-        "Электротехнический факультет (ОРУ)" to "ЭТФ",
-        "Юридический институт (факультет) (ОРУ)" to "ЮИ"
-    )
 
     /**
-     * Извлекает список групп с 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) {
+                    pos = keepPartialTagTail(pending, pos)
+                    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 = FacultyNames.shortname(name)
+                    } else {
+                        val m = grpIdPattern.find(tagText)
+                        if (m != null) {
+                            groups += Group(
+                                id = m.groupValues[1].dropLast(1),
+                                name = FacultyNames.removeParenthesized(content),
                                 faculty = faculty
                             )
                         }
                     }
+                    pos = closeDiv + 6
+                } else {
+                    addRanges(tagText)
+                    pos = tagEnd + 1
+                }
+
+                if (pos > MAX_SLICE) {
+                    pending.delete(0, pos)
+                    pos = 0
+                }
+            }
+            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
+    }
+
+    /**
+     * Хвост буфера может содержать неполное начало тега (<div... разорванный границей чанка).
+     * Сдвиг перемотки назад, чтобы оставить такой префикс в pending до прихода следующего чанка.
+     */
+    private fun keepPartialTagTail(pending: CharSequence, from: Int): Int {
+        var i = from
+        while (i < pending.length) {
+            val c = pending[i]
+            if (c == '<') {
+                val tail = pending.substring(i, pending.length)
+                if (tail == "<" || tail == "<d" || tail == "<di" || tail == "<a") return i
+            }
+            i++
+        }
+        return pending.length
     }
 }
 
-    fun parseDateRanges(html: String): Map<String, Map<Season, List<DateRange>>> {
+data class ParsedGroups(
-        val result = HashMap<String, HashMap<Season, MutableList<DateRange>>>()
+    val groups: List<Group>,
-        groupPattern.findAll(html).forEach { m ->
+    val dateRanges: Map<String, Map<Season, List<DateRange>>>
-            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
-    }
-
-    private fun shortname(name: String): String {
-        val stripped = removeParenthesized(name)
-        val sh = shorthands[name]
-        return if (sh != null) "$sh ($stripped)" else stripped
-    }
-
-    private fun removeParenthesized(name: String): String = name.replace(Regex("""\(.*?\)\s?"""), "").trim()
-}

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

@@ -0,0 +1,145 @@
+package agzam.vyatsu.data.remote
+
+import agzam.vyatsu.data.remote.pdf.TextPatterns
+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 org.jsoup.Jsoup
+import org.jsoup.nodes.Element
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+
+object TeacherScheduleParser {
+
+    private const val TAG = "TeacherParserDebug"
+    private val DAY_REGEX = Regex("""^(понедельник|вторник|среда|четверг|пятница|суббота|воскресенье)\s+(\d{2}\.\d{2}\.\d{2})$""")
+    private val INTERVAL_REGEX = Regex("""^(\d{2}:\d{2})-(\d{2}:\d{2})$""")
+    private val GROUP_TOKEN = Regex("""(?<![\p{L}\p{N}])[А-ЯЁа-яё]{1,4}-\d{2,4}-\d{2}-\d{2}(?![\p{L}\p{N}])""")
+    private val SPLIT_BY_GROUP = Regex("""(?=(?<![\p{L}\p{N}])[А-ЯЁа-яё]{1,4}-\d{2,4}-\d{2}-\d{2}(?![\p{L}\p{N}]))""")
+    private val DATE_FMT = DateTimeFormatter.ofPattern("dd.MM.yy")
+
+    data class ParsedTeacherSchedule(val teachers: List<String>, val days: List<Day>)
+
+    fun parse(html: String): ParsedTeacherSchedule {
+        val doc = Jsoup.parse(html)
+        var headerFound = false
+        var teachers: List<String> = emptyList()
+        val days = mutableListOf<Day>()
+        var currentDate: LocalDate? = null
+        var currentIntervals: MutableList<TimeSlot>? = null
+
+        fun flushDay() {
+            val date = currentDate ?: return
+            val intervals = currentIntervals ?: return
+            if (intervals.isNotEmpty()) days.add(Day(date, intervals.toList()))
+        }
+
+        for (tr in doc.select("tr")) {
+            val tds = tr.children().filter { it.tagName() == "td" }
+            if (tds.size < 2) continue
+            val first = cellText(tds[0])
+            val second = cellText(tds[1])
+            if (!headerFound && first == "День" && second == "Интервал") {
+                teachers = tds.drop(2)
+                    .map { cellText(it.selectFirst("span") ?: it) }
+                    .filter { it.isNotEmpty() }
+                    .distinct()
+                headerFound = true
+                continue
+            }
+            val dayMatch = DAY_REGEX.matchEntire(first)
+            val intervalMatch = INTERVAL_REGEX.matchEntire(if (dayMatch != null) second else first)
+            if (dayMatch != null) {
+                flushDay()
+                currentDate = LocalDate.parse(dayMatch.groupValues[2], DATE_FMT)
+                currentIntervals = mutableListOf()
+            }
+            if (intervalMatch != null && currentIntervals != null) {
+                parseIntervalRow(tds, intervalMatch, if (dayMatch != null) 2 else 1, teachers, currentIntervals!!)
+            }
+        }
+        flushDay()
+        Log.d(TAG, "parse: teachers=$teachers days=${days.size}")
+        for (day in days) {
+            Log.d(TAG, "  parse ${day.date}: intervals=${day.intervals.size}")
+            for (slot in day.intervals) {
+                val mel = slot.lessons.filter { it.teacher == "Мельцов В.Ю." }
+                val teachersInSlot = slot.lessons.map { it.teacher }.distinct()
+                Log.d(
+                    TAG,
+                    "    slot ${slot.start}-${slot.end} total=${slot.lessons.size} meltsov=${mel.size} teachers=$teachersInSlot"
+                )
+                mel.forEach { l ->
+                    Log.d(TAG, "      mel: room=${l.room} group=${l.group} subj=${l.subject} type=${l.type} raw=${l.raw}")
+                }
+            }
+        }
+        return ParsedTeacherSchedule(teachers, days)
+    }
+
+    private fun parseIntervalRow(
+        tds: List<Element>,
+        intervalMatch: MatchResult,
+        startCol: Int,
+        teachers: List<String>,
+        intervals: MutableList<TimeSlot>
+    ) {
+        val start = LocalTime.parse(intervalMatch.groupValues[1])
+        val end = LocalTime.parse(intervalMatch.groupValues[2])
+        val lessons = mutableListOf<Lesson>()
+        for (i in teachers.indices) {
+            val cell = tds.getOrNull(startCol + i) ?: continue
+            lessons += parseCell(cell, teachers[i])
+        }
+        if (lessons.isNotEmpty()) intervals.add(TimeSlot(start, end, lessons))
+    }
+
+    private fun parseCell(cell: Element, teacher: String): List<Lesson> {
+        val raw = cellText(cell)
+        if (raw.isEmpty()) return emptyList()
+        val room = TextPatterns.ROOM_REGEX.find(raw)?.value
+        val typeMatch = TextPatterns.LESSON_TYPE_REGEX.find(raw)
+        val type = LessonType.fromRaw(typeMatch?.value?.trim() ?: "")
+        val segments = raw.split(SPLIT_BY_GROUP).map { it.trim() }.filter { it.isNotEmpty() }
+        val groupSegments = segments.filter { GROUP_TOKEN.containsMatchIn(it) }
+        if (groupSegments.isEmpty()) {
+            return listOf(
+                Lesson(
+                    raw = raw,
+                    room = room,
+                    subject = subjectOf(raw, room, typeMatch),
+                    type = type,
+                    teacher = teacher
+                )
+            )
+        }
+        val subject = subjectOf(raw, room, typeMatch)
+        return groupSegments.flatMap { segment ->
+            val groups = GROUP_TOKEN.findAll(segment).map { it.value }.distinct().toList()
+            val subgroup = TextPatterns.SUBGROUP_REGEX.find(segment)?.value
+            groups.map { group ->
+                Lesson(
+                    raw = segment,
+                    room = room,
+                    group = group,
+                    subgroup = subgroup,
+                    subject = subject,
+                    type = type,
+                    teacher = teacher
+                )
+            }
+        }
+    }
+
+    private fun subjectOf(raw: String, room: String?, typeMatch: MatchResult?): String? {
+        val end = typeMatch?.range?.first ?: GROUP_TOKEN.find(raw)?.range?.first ?: raw.length
+        val prefix = raw.substring(0, end).trim()
+        val stripped = room?.let { prefix.removePrefix(it).trim() } ?: prefix
+        return stripped.ifEmpty { null }
+    }
+
+    private fun cellText(el: Element): String = el.text().replace('\u00A0', ' ').trim()
+}

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

@@ -0,0 +1,148 @@
+package agzam.vyatsu.data.remote
+
+import agzam.vyatsu.domain.model.DateRange
+import agzam.vyatsu.domain.model.Department
+import agzam.vyatsu.domain.model.ParsedDepartments
+import agzam.vyatsu.domain.model.Season
+import java.io.InputStream
+
+/**
+ * Стриминговый парсер страницы преподавателей: читает тело ответа по чанкам и
+ * разбирает его на лету, не материализуя весь HTML в память.
+ * Страница teacher.html весит ~2.4MB, поэтому весь документ грузить нельзя.
+ */
+object TeachersParser {
+
+    private val fakNameTag = Regex("""<div[^>]*class="fak_name"""")
+    private val fakIdInTag = Regex("""data-fak_id="(\d+)"""")
+    private val kafPeriodTag = Regex("""<div[^>]*class="kafPeriod"""")
+    private val kafIdInTag = Regex("""data-kaf_period_id="(\d+)"""")
+    private val prepodLink = Regex("""href="/reports/schedule/prepod/(\d+)_([12])_(\d{8})_(\d{8})\.html"""")
+    private val tagStrip = Regex("""<[^>]*>""")
+
+    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 — жёсткий потолок буфера
+
+    fun parseStream(input: InputStream): ParsedDepartments {
+        val reader = input.bufferedReader(Charsets.UTF_8)
+        val buf = CharArray(CHUNK_SIZE)
+        val pending = StringBuilder(CHUNK_SIZE * 2)
+        val departments = ArrayList<Department>()
+        val ranges = HashMap<String, HashMap<Season, MutableList<DateRange>>>()
+        var faculty = ""
+
+        fun addRanges(text: String) {
+            for (m in prepodLink.findAll(text)) {
+                val departmentId = m.groupValues[1]
+                val season = if (m.groupValues[2] == "1") Season.AUTUMN else Season.SPRING
+                val range = DateRange(m.groupValues[3], m.groupValues[4])
+                ranges.getOrPut(departmentId) {
+                    hashMapOf(Season.AUTUMN to ArrayList(), Season.SPRING to ArrayList())
+                }.getOrPut(season) { ArrayList() }.add(range)
+            }
+        }
+
+        while (true) {
+            val n = reader.read(buf)
+            if (n < 0) break
+            pending.append(buf, 0, n)
+
+            var pos = 0
+            while (pos < pending.length) {
+                val divAt = pending.indexOf("<div", pos)
+                val aAt = pending.indexOf("<a", pos)
+                val tagStart = when {
+                    divAt < 0 -> aAt
+                    aAt < 0 -> divAt
+                    else -> minOf(divAt, aAt)
+                }
+                if (tagStart < 0) {
+                    pos = keepPartialTagTail(pending, pos)
+                    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 && fakNameTag.containsMatchIn(tagText)
+                val isKafPeriod = isDiv && kafPeriodTag.containsMatchIn(tagText)
+                if (isFakName || isKafPeriod) {
+                    val closeDiv = pending.indexOf("</div>", tagEnd + 1)
+                    if (closeDiv < 0) break
+                    addRanges(tagText)
+                    val content = pending.substring(tagEnd + 1, closeDiv)
+                    if (isFakName) {
+                        val stripped = tagStrip.replace(content, "").trim()
+                        if (stripped.isNotEmpty()) faculty = FacultyNames.shortname(stripped)
+                    } else {
+                        val m = kafIdInTag.find(tagText)
+                        if (m != null) {
+                            departments += Department(
+                                departmentId = m.groupValues[1].dropLast(1),
+                                name = tagStrip.replace(content, "").trim(),
+                                faculty = faculty
+                            )
+                        }
+                    }
+                    pos = closeDiv + 6
+                } else {
+                    addRanges(tagText)
+                    pos = tagEnd + 1
+                }
+
+                if (pos > MAX_SLICE) {
+                    pending.delete(0, pos)
+                    pos = 0
+                }
+            }
+            if (pos > 0 && pos <= pending.length) {
+                pending.delete(0, pos)
+            }
+            if (pending.length > MAX_PENDING) {
+                pending.delete(0, pending.length - MAX_SLICE)
+            }
+        }
+        return ParsedDepartments(departments, 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
+    }
+
+    /**
+     * Хвост буфера может содержать неполное начало тега (<div... разорванный границей чанка).
+     * Сдвиг перемотки назад, чтобы оставить такой префикс в pending до прихода следующего чанка.
+     */
+    private fun keepPartialTagTail(pending: CharSequence, from: Int): Int {
+        var i = from
+        while (i < pending.length) {
+            val c = pending[i]
+            if (c == '<') {
+                val tail = pending.substring(i, pending.length)
+                if (tail == "<" || tail == "<d" || tail == "<di" || tail == "<a") return i
+            }
+            i++
+        }
+        return pending.length
+    }
+}

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
 
 /**
@@ -21,7 +22,7 @@ object VyatsuHttpClient {
 
     suspend fun getText(url: String): String = withContext(Dispatchers.IO) {
         client.newCall(Request.Builder().url(url).build()).execute().use { resp ->
-            Log.d(TAG, "GET $url -> ${resp.code}")
+            if (!resp.isSuccessful) Log.e(TAG, "GET $url -> HTTP ${resp.code}")
             check(resp.isSuccessful) { "HTTP ${resp.code} for $url" }
             resp.body!!.string()
         }
@@ -29,10 +30,21 @@ object VyatsuHttpClient {
 
     suspend fun getBytes(url: String): ByteArray = withContext(Dispatchers.IO) {
         client.newCall(Request.Builder().url(url).build()).execute().use { resp ->
-            Log.d(TAG, "GET $url -> ${resp.code}")
+            if (!resp.isSuccessful) Log.e(TAG, "GET $url -> HTTP ${resp.code}")
             check(resp.isSuccessful) { "HTTP ${resp.code} for $url" }
             resp.body!!.bytes()
         }
     }
 
+    /**
+     * Открывает потоковое тело ответа. Вызывающий обязан закрыть
+     * возвращённый [InputStream], чтобы вернуть соединение в пул.
+     */
+    suspend fun openStream(url: String): InputStream = withContext(Dispatchers.IO) {
+        val resp = client.newCall(Request.Builder().url(url).build()).execute()
+        if (!resp.isSuccessful) Log.e(TAG, "GET $url -> HTTP ${resp.code}")
+        check(resp.isSuccessful) { "HTTP ${resp.code} for $url" }
+        resp.body!!.byteStream()
+    }
+
 }

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

@@ -10,4 +10,9 @@ object VyatsuUrls {
 
     fun groupPdfUrl(groupId: String, season: Season, range: DateRange): String = "$PDF_BASEURL/${groupId}_${season.apiKey}_${range.first}_${range.second}.pdf"
 
+    const val TEACHER_PAGE = "https://www.vyatsu.ru/studentu-1/spravochnaya-informatsiya/teacher.html"
+    const val PREPOD_BASEURL = "https://www.vyatsu.ru/reports/schedule/prepod"
+
+    fun teacherPrepodUrl(departmentId: String, season: Season, range: DateRange): String = "$PREPOD_BASEURL/${departmentId}_${season.apiKey}_${range.first}_${range.second}.html"
+
 }

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

@@ -26,10 +26,6 @@ object PdfScheduleParser {
     private fun timeFrom(timeString: String?): LocalTime? { return runCatching { LocalTime.parse(timeString, TIME_FORMAT) }.getOrNull() }
     private fun dateFrom(dateString: String?): LocalDate? { return runCatching { LocalDate.parse(dateString, DATE_FORMAT) }.getOrNull() }
 
-    private val ROOM_REGEX = Regex("""(?<=^|\s)\d{1,2}-\d{3}[_a-zA-Zа-яА-Я]?(?=\s|$)""")
-    private val LESSON_TYPE_REGEX = Regex(LessonType.entries.joinToString(separator = "|") { Regex.escape(it.label) }.let { """(?<=^|\s)($it)(?=\s|$)""" } )
-    private val SUBGROUP_REGEX = Regex("""\d{2}\sподгруппа""", RegexOption.IGNORE_CASE)
-
     fun parse(pdfBytes: ByteArray): List<Day> {
         Log.d(TAG, "Parsing ${pdfBytes.size} bytes")
         val doc = try {
@@ -108,9 +104,13 @@ object PdfScheduleParser {
 
                 for (dayCell in daysColumn.cells) {
                     val day = content(dayCell).split(' ')
+                    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) {
@@ -141,7 +141,7 @@ object PdfScheduleParser {
                             // Поиск кабинета в строке, ибо он последний, если их несколько - то скорее всего разделение на подгруппы
                             var found = 0
                             var currentStart = 0
-                            for (roomMatch in ROOM_REGEX.findAll(content)) {
+                            for (roomMatch in TextPatterns.ROOM_REGEX.findAll(content)) {
                                 found++
 
                                 val raw = content.substring(currentStart, roomMatch.range.last + 1)
@@ -151,7 +151,7 @@ object PdfScheduleParser {
 
                                 val room = roomMatch.value
 
-                                val typeMatch = LESSON_TYPE_REGEX.findAll(raw).toList()
+                                val typeMatch = TextPatterns.LESSON_TYPE_REGEX.findAll(raw).toList()
                                 if(typeMatch.isEmpty()) {
                                     lessons.add(Lesson(
                                         raw=raw,
@@ -164,9 +164,9 @@ object PdfScheduleParser {
                                 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,")) {
+                                if(group != null && (subject.startsWith("$group,") || subject.startsWith("$group "))) {
                                     subject = subject.substring(group.length + 1).trim()
-                                    val subgroupMatch = SUBGROUP_REGEX.find(subject)
+                                    val subgroupMatch = TextPatterns.SUBGROUP_REGEX.find(subject)
                                     if(subgroupMatch != null) {
                                         subgroup = subgroupMatch.value.trim()
                                         subject = subject.removeRange(subgroupMatch.range).trim()
@@ -197,6 +197,7 @@ object PdfScheduleParser {
 
                 /** Вывод таблички из 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)

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

@@ -0,0 +1,12 @@
+package agzam.vyatsu.data.remote.pdf
+
+import agzam.vyatsu.domain.model.LessonType
+
+object TextPatterns {
+
+    val ROOM_REGEX = Regex("""(?<=^|\s)\d{1,2}-\d{3}[_a-zA-Zа-яА-Я]?(?=\s|$)""")
+
+    val LESSON_TYPE_REGEX = Regex(LessonType.entries.joinToString(separator = "|") { Regex.escape(it.label) }.let { """(?<=^|\s)($it)(?=\s|$)""" })
+
+    val SUBGROUP_REGEX = Regex("""\d{2}\sподгруппа""", RegexOption.IGNORE_CASE)
+}

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,16 +2,18 @@ package agzam.vyatsu.data.repository
 
 import agzam.vyatsu.data.local.GroupDao
 import agzam.vyatsu.data.local.GroupEntity
+import agzam.vyatsu.data.local.GroupPeriodEntity
 import agzam.vyatsu.data.remote.GroupsParser
 import agzam.vyatsu.data.remote.VyatsuHttpClient
 import agzam.vyatsu.data.remote.VyatsuUrls
 import agzam.vyatsu.domain.ScheduleDates
 import agzam.vyatsu.domain.model.Group
-import agzam.vyatsu.domain.model.Season
 import agzam.vyatsu.domain.repository.GroupRepository
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
 
 class GroupRepositoryImpl(
     private val groupDao: GroupDao,
@@ -40,28 +42,35 @@ class GroupRepositoryImpl(
     }
 
     private suspend fun refresh() {
-        val html = VyatsuHttpClient.getText(VyatsuUrls.GROUPS_PAGE)
+        val 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?.let(::epochDay),
+                    lastSyncedAt = now
-                autumnSecond = autumn?.second?.let(::epochDay),
-                springFirst = spring?.first?.let(::epochDay),
-                springSecond = spring?.second?.let(::epochDay),
-                lastSyncedAt = now()
                 )
             }
-        groupDao.insertAll(entities)
+        )
+        val periods = parsed.groups.flatMap { group ->
+            parsed.dateRanges[group.id].orEmpty().flatMap { (season, ranges) ->
+                ranges.map { range ->
+                    GroupPeriodEntity(
+                        groupId = group.id,
+                        season = season,
+                        weekStart = ScheduleDates.asDate(range.first).toEpochDay(),
+                        weekEnd = ScheduleDates.asDate(range.second).toEpochDay()
+                    )
+                }
+            }
+        }
+        groupDao.deleteAllPeriods()
+        groupDao.insertPeriods(periods)
     }
-
-    private fun epochDay(dateStr: String): Long = ScheduleDates.asDate(dateStr).toEpochDay()
 
     private fun now(): Long = System.currentTimeMillis()
 

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

@@ -13,4 +13,20 @@ class PreferencesRepositoryImpl(
     override suspend fun setSelectedWeekStart(weekStart: String) = dao.setSelectedWeekStart(weekStart)
     override suspend fun selectedDayDate(): String? = dao.selectedDayDate()
     override suspend fun setSelectedDayDate(date: String) = dao.setSelectedDayDate(date)
+
+    override suspend fun selectedTeacherId(): String? = dao.selectedTeacherId()
+    override suspend fun setSelectedTeacherId(id: String) = dao.setSelectedTeacherId(id)
+    override suspend fun selectedTeacherWeekStart(): String? = dao.selectedTeacherWeekStart()
+    override suspend fun setSelectedTeacherWeekStart(weekStart: String) =
+        dao.setSelectedTeacherWeekStart(weekStart)
+    override suspend fun selectedTeacherDayDate(): String? = dao.selectedTeacherDayDate()
+    override suspend fun setSelectedTeacherDayDate(date: String) =
+        dao.setSelectedTeacherDayDate(date)
+    override suspend fun clearSelectedTeacher() = dao.clearSelectedTeacher()
+
+    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,7 @@
 package agzam.vyatsu.data.repository
 
 import agzam.vyatsu.data.local.DayEntity
+import agzam.vyatsu.data.local.GroupPeriodEntity
 import agzam.vyatsu.data.local.LessonEntity
 import agzam.vyatsu.data.local.ScheduleDao
 import agzam.vyatsu.data.local.ScheduleEntity
@@ -51,15 +52,38 @@ class ScheduleRepositoryImpl(
             Log.w(TAG, "sync: group $groupId not found in DB")
             return null
         }
-        val season = ScheduleDates.currentSeason()
+        val today = ScheduleDates.moscowToday().toEpochDay()
-        val range = dateRangeFor(group, season) ?: run {
+        val periods = groupDao.getCurrentAndFuturePeriods(groupId, today)
-            Log.w(TAG, "sync: no date range for season $season (group ${group.id})")
+        if (periods.isEmpty()) {
+            Log.w(TAG, "sync: no current/future periods for group ${group.id}")
             return null
         }
-        Log.d(TAG, "sync: season=$season range=[${range.first}, ${range.second}]")
 
-        return try {
+        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")
@@ -67,29 +91,19 @@ class ScheduleRepositoryImpl(
             val days = PdfScheduleParser.parse(bytes)
             Log.d(TAG, "sync: parsed ${days.size} days")
 
-            val weekStart = ScheduleDates.asDate(range.first).toEpochDay()
+            val scheduleId = existing?.id ?: scheduleDao.insertSchedule(
-            val weekEnd = ScheduleDates.asDate(range.second).toEpochDay()
-
-            val existing = scheduleDao.getSchedules(groupId)
-                .firstOrNull { it.season == season && it.weekStart == weekStart }
-            val scheduleId = if (existing != null) existing.id
-            else scheduleDao.insertSchedule(
                 ScheduleEntity(
-                    groupId = groupId,
+                    groupId = group.id,
                     season = season,
-                    weekStart = weekStart,
+                    weekStart = period.weekStart,
-                    weekEnd = weekEnd,
+                    weekEnd = period.weekEnd,
                     lastSyncedAt = now()
                 )
             )
             replaceDays(scheduleId, days)
-
+            Log.d(TAG, "sync: period $range synced")
-            scheduleDao.trim(groupId, MAX_PERIODS)
-
-            getSchedule(groupId)
         } 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
         }
     }
 
@@ -187,30 +201,13 @@ class ScheduleRepositoryImpl(
         teacher = teacher
     )
 
-    private fun dateRangeFor(group: GroupEntity, season: Season): DateRange? {
-        return when (season) {
-            Season.AUTUMN -> if (group.autumnFirst != null && group.autumnSecond != null) {
-                DateRange(
-                    LocalDate.ofEpochDay(group.autumnFirst).format(RANGE_FMT),
-                    LocalDate.ofEpochDay(group.autumnSecond).format(RANGE_FMT)
-                )
-            } else null
-            Season.SPRING -> if (group.springFirst != null && group.springSecond != null) {
-                DateRange(
-                    LocalDate.ofEpochDay(group.springFirst).format(RANGE_FMT),
-                    LocalDate.ofEpochDay(group.springSecond).format(RANGE_FMT)
-                )
-            } else null
-        }
-    }
-
     private fun LocalTime.toMinutesOfDay(): Int = hour * 60 + minute
 
     private fun now(): Long = System.currentTimeMillis()
 
     companion object {
         private const val STALE_WINDOW_MS = 12 * 60 * 60 * 1000L
-        private const val MAX_PERIODS = 3
+        private const val MAX_PERIODS = 24
         private const val TAG = "ScheduleRepo"
         private val RANGE_FMT = java.time.format.DateTimeFormatter.ofPattern("ddMMyyyy")
     }

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

@@ -0,0 +1,86 @@
+package agzam.vyatsu.data.repository
+
+import agzam.vyatsu.data.local.DepartmentEntity
+import agzam.vyatsu.data.local.DepartmentPeriodEntity
+import agzam.vyatsu.data.local.TeacherDao
+import agzam.vyatsu.data.remote.TeachersParser
+import agzam.vyatsu.data.remote.VyatsuHttpClient
+import agzam.vyatsu.data.remote.VyatsuUrls
+import agzam.vyatsu.domain.ScheduleDates
+import agzam.vyatsu.domain.model.Department
+import agzam.vyatsu.domain.repository.TeacherRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+
+class TeacherRepositoryImpl(
+    private val teacherDao: TeacherDao,
+) : TeacherRepository {
+
+    override fun observeDepartments(): Flow<List<Department>> =
+        teacherDao.observeDepartments().map { list -> list.map { it.toDomain() } }
+
+    override suspend fun getDepartments(): List<Department> =
+        teacherDao.observeDepartments().first().map { it.toDomain() }
+
+    override suspend fun getFaculties(): List<String> = teacherDao.getFaculties()
+
+    override suspend fun refreshIfStale(): Boolean {
+        val last = teacherDao.maxSyncedAt()
+        if (last != null && now() - last < STALE_WINDOW_MS) {
+            return true
+        }
+        refresh()
+        return true
+    }
+
+    override suspend fun forceRefresh(): Boolean {
+        refresh()
+        return true
+    }
+
+    private suspend fun refresh() {
+        val parsed = withContext(Dispatchers.IO) {
+            VyatsuHttpClient.openStream(VyatsuUrls.TEACHER_PAGE).use(TeachersParser::parseStream)
+        }
+        val now = now()
+        teacherDao.insertAll(
+            parsed.departments.map { department ->
+                DepartmentEntity(
+                    departmentId = department.departmentId,
+                    name = department.name,
+                    faculty = department.faculty,
+                    lastSyncedAt = now
+                )
+            }
+        )
+        val periods = parsed.departments.flatMap { department ->
+            parsed.dateRanges[department.departmentId].orEmpty().flatMap { (season, ranges) ->
+                ranges.map { range ->
+                    DepartmentPeriodEntity(
+                        departmentId = department.departmentId,
+                        season = season,
+                        weekStart = ScheduleDates.asDate(range.first).toEpochDay(),
+                        weekEnd = ScheduleDates.asDate(range.second).toEpochDay()
+                    )
+                }
+            }
+        }
+        teacherDao.deleteAllPeriods()
+        teacherDao.insertPeriods(periods)
+    }
+
+    private fun now(): Long = System.currentTimeMillis()
+
+    private fun DepartmentEntity.toDomain(): Department = Department(
+        departmentId = departmentId,
+        name = name,
+        faculty = faculty
+    )
+
+    companion object {
+        private const val STALE_WINDOW_MS = 12 * 60 * 60 * 1000L
+    }
+}

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

@@ -0,0 +1,294 @@
+package agzam.vyatsu.data.repository
+
+import agzam.vyatsu.data.local.DepartmentPeriodEntity
+import agzam.vyatsu.data.local.TeacherDao
+import agzam.vyatsu.data.local.TeacherDayEntity
+import agzam.vyatsu.data.local.TeacherLessonEntity
+import agzam.vyatsu.data.local.TeacherScheduleDao
+import agzam.vyatsu.data.local.TeacherScheduleEntity
+import agzam.vyatsu.data.remote.TeacherScheduleParser
+import agzam.vyatsu.data.remote.VyatsuHttpClient
+import agzam.vyatsu.data.remote.VyatsuUrls
+import agzam.vyatsu.domain.model.BulkSyncProgress
+import agzam.vyatsu.domain.model.DateRange
+import agzam.vyatsu.domain.model.Day
+import agzam.vyatsu.domain.model.Lesson
+import agzam.vyatsu.domain.model.SchedulePeriod
+import agzam.vyatsu.domain.model.Teacher
+import agzam.vyatsu.domain.model.TeacherSchedule
+import agzam.vyatsu.domain.model.TimeSlot
+import agzam.vyatsu.domain.repository.TeacherScheduleRepository
+import android.util.Log
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
+import kotlinx.coroutines.withContext
+import java.time.DayOfWeek
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.temporal.TemporalAdjusters
+import kotlin.coroutines.cancellation.CancellationException
+
+class TeacherScheduleRepositoryImpl(
+    private val scheduleDao: TeacherScheduleDao,
+    private val teacherDao: TeacherDao
+) : TeacherScheduleRepository {
+
+    private val syncMutex = Mutex()
+
+    override fun observeSchedule(period: SchedulePeriod): Flow<TeacherSchedule?> =
+        combine(
+            scheduleDao.observeDaysForPeriod(period.season.name, period.weekStart.toEpochDay()),
+            scheduleDao.observeLessonsForPeriod(period.season.name, period.weekStart.toEpochDay())
+        ) { days, lessons ->
+            buildTeacherSchedule(period, days, lessons)
+        }
+
+    override fun observeTeachers(period: SchedulePeriod): Flow<List<Teacher>> =
+        scheduleDao.observeDistinctTeachers(period.season.name, period.weekStart.toEpochDay())
+            .map { names -> names.map { name -> Teacher(name = name) } }
+
+    override suspend fun syncPeriod(date: LocalDate): Flow<BulkSyncProgress> = flow {
+        // Unique index (departmentId, season, weekStart) breaks on interleaved
+        // delete+insert from concurrent syncPeriod() callers.
+        syncMutex.withLock {
+            val targets = withContext(Dispatchers.IO) {
+                teacherDao.getPeriodsForDate(date.toEpochDay())
+            }
+            if (targets.isEmpty()) {
+                emit(BulkSyncProgress(0, 0, 0))
+                return@withLock
+            }
+
+            targets.map { it.season to it.weekStart }
+                .distinct()
+                .forEach { (season, weekStart) ->
+                    withContext(Dispatchers.IO) {
+                        scheduleDao.deletePeriod(season.name, weekStart)
+                    }
+                }
+
+            val total = targets.size
+            val semaphore = Semaphore(PARALLELISM)
+            val jobs = coroutineScope {
+                targets.map { target ->
+                    async {
+                        semaphore.withPermit {
+                            try {
+                                withContext(Dispatchers.IO) { syncDepartment(target) }
+                                true
+                            } catch (e: CancellationException) {
+                                throw e
+                            } catch (e: Throwable) {
+                                Log.e(
+                                    TAG,
+                                    "sync: failed for department ${target.departmentId} " +
+                                        "season ${target.season} week ${target.weekStart} " +
+                                        "(${e::class.simpleName}: ${e.message})",
+                                    e
+                                )
+                                false
+                            }
+                        }
+                    }
+                }
+            }
+
+            var done = 0
+            var failed = 0
+            for (job in jobs) {
+                if (job.await()) done++ else failed++
+                emit(BulkSyncProgress(total, done + failed, failed))
+            }
+
+            withContext(Dispatchers.IO) { trimToRecent(keepDistinctPeriods = 2) }
+        }
+    }
+
+    override suspend fun hasData(period: SchedulePeriod): Boolean =
+        withContext(Dispatchers.IO) {
+            scheduleDao.hasSchedulesForPeriod(period.season.name, period.weekStart.toEpochDay())
+        }
+
+    override suspend fun weeksFor(date: LocalDate): List<SchedulePeriod> =
+        withContext(Dispatchers.IO) {
+            teacherDao.getPeriodsForDate(date.toEpochDay())
+                .distinctBy { it.season to (it.weekStart to it.weekEnd) }
+                .flatMap { window ->
+                    val windowStart = LocalDate.ofEpochDay(window.weekStart)
+                    val windowEnd = LocalDate.ofEpochDay(window.weekEnd)
+                    generateSequence(
+                        windowStart.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
+                    ) { it.plusWeeks(1) }
+                        .takeWhile { it <= windowEnd }
+                        .map { monday ->
+                            val weekEnd = monday.plusDays(6)
+                            SchedulePeriod(
+                                weekStart = monday,
+                                weekEnd = if (weekEnd.isAfter(windowEnd)) windowEnd else weekEnd,
+                                season = window.season
+                            )
+                        }
+                }
+                .distinctBy { it.season to it.weekStart }
+                .sortedBy { it.weekStart }
+        }
+
+    override suspend fun clearAll() = withContext(Dispatchers.IO) {
+        scheduleDao.deleteAll()
+    }
+
+    private suspend fun syncDepartment(target: DepartmentPeriodEntity) {
+        val season = target.season
+        val range = DateRange(
+            LocalDate.ofEpochDay(target.weekStart).format(RANGE_FMT),
+            LocalDate.ofEpochDay(target.weekEnd).format(RANGE_FMT)
+        )
+        val url = VyatsuUrls.teacherPrepodUrl(target.departmentId, season, range)
+        Log.d(TAG, "syncDepartment: dept=${target.departmentId} url=$url")
+        val html = VyatsuHttpClient.getBytes(url).toString(Charsets.UTF_8)
+        val parsed = TeacherScheduleParser.parse(html)
+
+        Log.d(TAG, "syncDepartment: dept=${target.departmentId} parsedDays=${parsed.days.size}")
+        parsed.days.forEach { day ->
+            day.intervals.forEach { slot ->
+                val mel = slot.lessons.filter { it.teacher == "Мельцов В.Ю." }
+                if (mel.isNotEmpty()) {
+                    Log.d(TAG, "syncDepartment: dept=${target.departmentId} date=${day.date} slot=${slot.start}-${slot.end} melLessons=${mel.size}")
+                }
+            }
+        }
+
+        val dayEntities = parsed.days.map {
+            TeacherDayEntity(scheduleId = 0, date = it.date.toEpochDay())
+        }
+        val lessonEntities = parsed.days.flatMap { day ->
+            day.intervals.flatMapIndexed { slotIndex, slot ->
+                slot.lessons.mapIndexedNotNull { lessonIndex, lesson ->
+                    val teacher = lesson.teacher ?: return@mapIndexedNotNull null
+                    TeacherLessonEntity(
+                        dayId = 0,
+                        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 = teacher
+                    )
+                }
+            }
+        }
+        Log.d(TAG, "syncDepartment: dept=${target.departmentId} -> lessons=${lessonEntities.size}")
+        val melLessonEntities = lessonEntities.filter { it.teacher == "Мельцов В.Ю." }
+        melLessonEntities.forEach { le ->
+            Log.d(
+                TAG,
+                "syncDepartment: dept=${target.departmentId} MEL date=${le.date} slotIndex=${le.slotIndex} " +
+                    "start=$le.start end=$le.end raw=${le.raw}"
+            )
+        }
+        scheduleDao.replaceSchedule(
+            TeacherScheduleEntity(
+                departmentId = target.departmentId,
+                season = season,
+                weekStart = target.weekStart,
+                weekEnd = target.weekEnd,
+                lastSyncedAt = now()
+            ),
+            dayEntities,
+            lessonEntities
+        )
+    }
+
+    private suspend fun trimToRecent(keepDistinctPeriods: Int) {
+        val schedules = scheduleDao.getSchedules()
+        schedules
+            .map { it.season to it.weekStart }
+            .distinct()
+            .sortedByDescending { it.second }
+            .drop(keepDistinctPeriods)
+            .forEach { (season, weekStart) ->
+                scheduleDao.deletePeriod(season.name, weekStart)
+            }
+    }
+
+    private fun buildTeacherSchedule(
+        period: SchedulePeriod,
+        dayEntities: List<TeacherDayEntity>,
+        lessonEntities: List<TeacherLessonEntity>
+    ): TeacherSchedule? {
+        val weekDays = dayEntities
+            .filter {
+                it.date >= period.weekStart.toEpochDay() && it.date <= period.weekEnd.toEpochDay()
+            }
+        if (weekDays.isEmpty()) return null
+        val lessonsByDate = lessonEntities.groupBy { it.date }
+        val days = weekDays
+            .sortedBy { it.date }
+            .distinctBy { it.date }
+            .map { day ->
+                val lessons = lessonsByDate[day.date].orEmpty()
+                Log.d(
+                    TAG,
+                    "build: date=${day.date} totalLessons=${lessons.size} " +
+                        "groupedByStart=${lessons.groupBy { it.start }.keys.sorted()}"
+                )
+                val slots = lessons.groupBy { it.start }
+                    .toSortedMap()
+                    .map { (startMin, slotLessons) ->
+                        val first = slotLessons.first()
+                        val times = slotLessons.map { "${it.start}-${it.end}" }.distinct()
+                        val teachers = slotLessons.map { it.teacher }.distinct()
+                        Log.d(
+                            TAG,
+                            "build: date=${day.date} start=$startMin firstEnd=$first.end " +
+                                "times=$times teachers=$teachers"
+                        )
+                        TimeSlot(
+                            start = LocalTime.of(startMin / 60, startMin % 60),
+                            end = LocalTime.of(first.end / 60, first.end % 60),
+                            lessons = slotLessons
+                                .sortedBy { it.lessonIndex }
+                                .map { it.toDomain() }
+                        )
+                    }
+                Day(date = LocalDate.ofEpochDay(day.date), intervals = slots)
+            }
+        return TeacherSchedule(period = period, days = days)
+    }
+
+    private fun TeacherLessonEntity.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()
+
+    companion object {
+        private const val STALE_WINDOW_MS = 12 * 60 * 60 * 1000L
+        private const val PARALLELISM = 2
+        private const val TAG = "TeacherScheduleRepo"
+        private val RANGE_FMT = java.time.format.DateTimeFormatter.ofPattern("ddMMyyyy")
+    }
+}

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

@@ -6,9 +6,14 @@ import agzam.vyatsu.data.remote.VyatsuHttpClient
 import agzam.vyatsu.data.repository.GroupRepositoryImpl
 import agzam.vyatsu.data.repository.PreferencesRepositoryImpl
 import agzam.vyatsu.data.repository.ScheduleRepositoryImpl
+import agzam.vyatsu.data.repository.TeacherRepositoryImpl
+import agzam.vyatsu.data.repository.TeacherScheduleRepositoryImpl
 import agzam.vyatsu.domain.repository.GroupRepository
 import agzam.vyatsu.domain.repository.PreferencesRepository
 import agzam.vyatsu.domain.repository.ScheduleRepository
+import agzam.vyatsu.domain.repository.TeacherRepository
+import agzam.vyatsu.domain.repository.TeacherScheduleRepository
+import agzam.vyatsu.update.AppUpdater
 import android.content.Context
 import androidx.room.Room
 
@@ -18,6 +23,7 @@ class AppContainer(context: Context) {
         AppDatabase::class.java,
         "vyatsu_schedule.db"
     )
+        .addMigrations(AppDatabase.MIGRATION_3_4)
         .fallbackToDestructiveMigration(dropAllTables = true)
         .build()
 
@@ -37,4 +43,19 @@ class AppContainer(context: Context) {
     val preferencesRepository: PreferencesRepository by lazy {
         PreferencesRepositoryImpl(database.preferencesDao())
     }
+
+    val teacherRepository: TeacherRepository by lazy {
+        TeacherRepositoryImpl(teacherDao = database.teacherDao())
+    }
+
+    val teacherScheduleRepository: TeacherScheduleRepository by lazy {
+        TeacherScheduleRepositoryImpl(
+            scheduleDao = database.teacherScheduleDao(),
+            teacherDao = database.teacherDao()
+        )
+    }
+
+    val appUpdater: AppUpdater by lazy {
+        AppUpdater(context.applicationContext, preferencesRepository)
+    }
 }

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

@@ -0,0 +1,7 @@
+package agzam.vyatsu.domain.model
+
+data class BulkSyncProgress(
+    val total: Int,
+    val done: Int,
+    val failed: Int
+)

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

@@ -0,0 +1,11 @@
+package agzam.vyatsu.domain.model
+
+/**
+ * Кафедра ВятГУ.
+ * departmentId — идентификатор кафедры из data-kaf_period_id без последней цифры (как в URL).
+ */
+data class Department(
+    val departmentId: String,
+    val name: String,
+    val faculty: String
+)

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

@@ -0,0 +1,6 @@
+package agzam.vyatsu.domain.model
+
+data class ParsedDepartments(
+    val departments: List<Department>,
+    val dateRanges: Map<String, Map<Season, List<DateRange>>>
+)

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

@@ -0,0 +1,11 @@
+package agzam.vyatsu.domain.model
+
+/**
+ * Преподаватель ВятГУ.
+ * Один и тот же преподаватель может вести занятия в нескольких кафедрах,
+ * поэтому модель не привязана к departmentId — расписание агрегируется
+ * по всем кафедрам периода.
+ */
+data class Teacher(
+    val name: String
+)

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

@@ -0,0 +1,57 @@
+package agzam.vyatsu.domain.model
+
+import java.time.LocalDate
+import java.time.LocalTime
+
+/**
+ * Расписание преподавателя за период, агрегированное по всем кафедрам.
+ */
+data class TeacherSchedule(
+    val period: SchedulePeriod,
+    val days: List<Day>
+) {
+    /**
+     * Возвращает дни периода только с занятиями указанного преподавателя.
+     * Слоты без занятий отбрасываются, порядок [Day] и [TimeSlot] сохраняется.
+     *
+     * Дедупликация — ТОЛЬКО по полному совпадению (дата + слот + аудитория +
+     * группа + предмет + тип + raw): два занятия коллапсируют в одно лишь когда
+     * они идентичны целиком (одно физическое занятие, прочитанное из файлов двух
+     * кафедр). Всё, что отличается хотя бы одним полем, остаётся и показывается.
+     */
+    fun daysForTeacher(teacherName: String): List<Day> =
+        days.mapNotNull { day ->
+            val seen = HashSet<FullMatchKey>()
+            val intervals = day.intervals.mapNotNull { slot ->
+                val lessons = slot.lessons
+                    .filter { it.teacher == teacherName }
+                    .filter {
+                        seen.add(
+                            FullMatchKey(
+                                date = day.date,
+                                start = slot.start,
+                                end = slot.end,
+                                room = it.room,
+                                group = it.group,
+                                subject = it.subject,
+                                type = it.type,
+                                raw = it.raw
+                            )
+                        )
+                    }
+                if (lessons.isEmpty()) null else slot.copy(lessons = lessons)
+            }
+            if (intervals.isEmpty()) null else day.copy(intervals = intervals)
+        }
+
+    private data class FullMatchKey(
+        val date: LocalDate,
+        val start: LocalTime,
+        val end: LocalTime,
+        val room: String?,
+        val group: String?,
+        val subject: String?,
+        val type: LessonType,
+        val raw: String
+    )
+}

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

@@ -8,4 +8,18 @@ interface PreferencesRepository {
     suspend fun setSelectedWeekStart(weekStart: String)
     suspend fun selectedDayDate(): String?
     suspend fun setSelectedDayDate(date: String)
+
+    suspend fun selectedTeacherId(): String? = null
+    suspend fun setSelectedTeacherId(id: String) = Unit
+    suspend fun selectedTeacherWeekStart(): String? = null
+    suspend fun setSelectedTeacherWeekStart(weekStart: String) = Unit
+    suspend fun selectedTeacherDayDate(): String? = null
+    suspend fun setSelectedTeacherDayDate(date: String) = Unit
+    suspend fun clearSelectedTeacher() = Unit
+
+    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/TeacherRepository.kt

@@ -0,0 +1,12 @@
+package agzam.vyatsu.domain.repository
+
+import agzam.vyatsu.domain.model.Department
+import kotlinx.coroutines.flow.Flow
+
+interface TeacherRepository {
+    fun observeDepartments(): Flow<List<Department>>
+    suspend fun getDepartments(): List<Department>
+    suspend fun getFaculties(): List<String>
+    suspend fun refreshIfStale(): Boolean
+    suspend fun forceRefresh(): Boolean
+}

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

@@ -0,0 +1,17 @@
+package agzam.vyatsu.domain.repository
+
+import agzam.vyatsu.domain.model.BulkSyncProgress
+import agzam.vyatsu.domain.model.SchedulePeriod
+import agzam.vyatsu.domain.model.Teacher
+import agzam.vyatsu.domain.model.TeacherSchedule
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
+
+interface TeacherScheduleRepository {
+    fun observeTeachers(period: SchedulePeriod): Flow<List<Teacher>>
+    fun observeSchedule(period: SchedulePeriod): Flow<TeacherSchedule?>
+    suspend fun syncPeriod(date: LocalDate): Flow<BulkSyncProgress>
+    suspend fun hasData(period: SchedulePeriod): Boolean
+    suspend fun weeksFor(date: LocalDate): List<SchedulePeriod>
+    suspend fun clearAll()
+}

app/src/main/java/agzam/vyatsu/ui/groups/GroupPickerScreen.kt

@@ -1,152 +0,0 @@
-package agzam.vyatsu.ui.groups
-
-import agzam.vyatsu.domain.model.Group
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Clear
-import androidx.compose.material.icons.filled.Refresh
-import androidx.compose.material.icons.filled.Search
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SearchBar
-import androidx.compose.material3.SearchBarDefaults
-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
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-/**
- * Страница выбора группы
- * @author Agzam
- */
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun GroupPickerScreen(viewModel: GroupPickerViewModel, onGroupPicked: (Group) -> Unit) {
-    val state by viewModel.uiState.collectAsState()
-    var isSearchActive by remember { mutableStateOf(false) }
-
-    Scaffold { innerPadding ->
-        Column(
-            Modifier
-                .fillMaxSize()
-                .windowInsetsPadding(WindowInsets.systemBars)
-                .padding(innerPadding)
-                .padding(horizontal = 16.dp, vertical = 8.dp)
-        ) {
-            if (!isSearchActive) {
-                Row(
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(bottom = 8.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text(
-                        text = "Выберите группу",
-                        style = MaterialTheme.typography.headlineSmall,
-                        modifier = Modifier.weight(1f)
-                    )
-                    IconButton(onClick = { viewModel.refresh() }) {
-                        Icon(Icons.Default.Refresh, contentDescription = "Обновить")
-                    }
-                }
-            }
-
-            if (state.isLoading && state.groups.isEmpty()) {
-                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
-                    CircularProgressIndicator()
-                }
-                return@Column
-            }
-            if (state.error != null && state.groups.isEmpty()) {
-                Column(Modifier.fillMaxWidth()) {
-                    Text(state.error.orEmpty(), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.error)
-                    TextButton(onClick = { viewModel.retry() }) { Text("Повторить") }
-                }
-                return@Column
-            }
-            SearchBar(
-                modifier = Modifier.fillMaxWidth(),
-                expanded = isSearchActive,
-                onExpandedChange = { isSearchActive = it },
-                inputField = {
-                    SearchBarDefaults.InputField(
-                        query = state.searchQuery,
-                        onQueryChange = { viewModel.search(it) },
-                        onSearch = { isSearchActive = false },
-                        expanded = isSearchActive,
-                        onExpandedChange = { isSearchActive = it },
-                        placeholder = { Text("Поиск группы") },
-                        leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) },
-                        trailingIcon = {
-                            if (isSearchActive && state.searchQuery.isNotEmpty()) {
-                                IconButton(onClick = { viewModel.search("") }) {
-                                    Icon(Icons.Default.Clear, contentDescription = "Очистить")
-                                }
-                            }
-                        }
-                    )
-                }
-            ) {
-                GroupList(
-                    groups = state.filteredGroups,
-                    onPick = { group ->
-                        isSearchActive = false
-                        onGroupPicked(group)
-                    }
-                )
-            }
-
-            if (!isSearchActive) {
-                Spacer(modifier = Modifier.height(8.dp))
-                GroupList(state.filteredGroups, onGroupPicked)
-            }
-        }
-    }
-}
-
-@Composable
-private fun GroupList(groups: List<Group>, onPick: (Group) -> Unit) {
-    LazyColumn(modifier = Modifier.fillMaxSize()) {
-        items(groups) { group ->
-            Column(modifier = Modifier.fillMaxWidth() .clickable { onPick(group) }) {
-                Box(
-                    modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp).padding(horizontal = 16.dp),
-                    contentAlignment = Alignment.CenterStart
-                ) {
-                    Text(group.name, style = MaterialTheme.typography.bodyMedium)
-                    // XXX: стоит ли добавлять факультет или это засорит интерфейс
-                    // Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.Bottom) {
-                    // if (group.faculty.isNotEmpty()) Text(text = group.faculty + " · ", color = MaterialTheme.colorScheme.onSurfaceVariant)
-                    // }
-                }
-            }
-            HorizontalDivider(thickness = 1.dp, color = MaterialTheme.colorScheme.outlineVariant)
-        }
-    }
-}

app/src/main/java/agzam/vyatsu/ui/groups/GroupPickerViewModel.kt

@@ -1,100 +0,0 @@
-package agzam.vyatsu.ui.groups
-
-import agzam.vyatsu.domain.model.Group
-import agzam.vyatsu.domain.repository.GroupRepository
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-/**
- * @author Agzam
- */
-class GroupPickerViewModel(private val repository: GroupRepository) : ViewModel() {
-
-    private val _uiState = MutableStateFlow(GroupPickerUiState())
-    val uiState: StateFlow<GroupPickerUiState> = _uiState.asStateFlow()
-
-    init {
-        load()
-    }
-
-    private fun load() {
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                val ok = try {
-                    repository.refreshIfStale()
-                } catch (e: Exception) {
-                    _uiState.value = _uiState.value.copy(
-                        error = e.message ?: "Не удалось загрузить группы"
-                    )
-                    false
-                }
-                if (!ok && _uiState.value.groups.isEmpty()) {
-                    _uiState.value = _uiState.value.copy(
-                        error = _uiState.value.error ?: "Не удалось обновить список групп"
-                    )
-                }
-            }
-            repository.observeGroups().collect { groups ->
-                val query = _uiState.value.searchQuery
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    groups = groups,
-                    filteredGroups = filterGroups(groups, query),
-                    error = null
-                )
-            }
-        }
-    }
-
-    fun search(query: String) {
-        val groups = _uiState.value.groups
-        _uiState.value = _uiState.value.copy(
-            searchQuery = query,
-            filteredGroups = filterGroups(groups, query)
-        )
-    }
-
-    private fun filterGroups(groups: List<Group>, query: String): List<Group> {
-        if (query.isBlank()) return groups
-        val lowerQuery = query.lowercase()
-        return groups.filter { group ->
-            group.name.lowercase().contains(lowerQuery) || group.faculty.lowercase().contains(lowerQuery)
-        }
-    }
-
-    fun retry() {
-        _uiState.value = _uiState.value.copy(isLoading = true, error = null)
-        load()
-    }
-
-    fun refresh() {
-        _uiState.value = _uiState.value.copy(isLoading = true, error = null)
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                try {
-                    repository.forceRefresh()
-                } catch (e: Exception) {
-                    _uiState.value = _uiState.value.copy(
-                        isLoading = false,
-                        error = e.message ?: "Не удалось обновить список групп"
-                    )
-                    return@withContext
-                }
-            }
-        }
-    }
-}
-
-data class GroupPickerUiState(
-    val isLoading: Boolean = true,
-    val error: String? = null,
-    val groups: List<Group> = emptyList(),
-    val searchQuery: String = "",
-    val filteredGroups: List<Group> = emptyList()
-)

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

@@ -4,18 +4,24 @@ 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 agzam.vyatsu.ui.teacher.TeacherScheduleScreen
+import agzam.vyatsu.ui.teacher.TeacherScheduleViewModel
 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
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -25,15 +31,20 @@ import androidx.compose.ui.Modifier
 private enum class HomeTab(val label: String) {
     SCHEDULE("Расписание"),
     CALLS("Звонки"),
-    BUILDINGS("Корпуса")
+    BUILDINGS("Корпуса"),
+    SETTINGS("Настройки")
 }
 
 @Composable
 fun HomeScreen(
     scheduleViewModel: ScheduleViewModel,
-    onSwitchGroup: () -> Unit
+    teacherScheduleViewModel: TeacherScheduleViewModel,
+    updateViewModel: UpdateViewModel,
+    onSwitchGroup: () -> Unit,
+    onSwitchTeacher: () -> Unit
 ) {
     var tab by rememberSaveable { mutableStateOf(HomeTab.SCHEDULE) }
+    val teacherState by teacherScheduleViewModel.uiState.collectAsState()
 
     Scaffold(
         bottomBar = {
@@ -48,6 +59,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
                             )
@@ -64,9 +76,17 @@ fun HomeScreen(
                 .padding(innerPadding)
         ) {
             when (tab) {
-                HomeTab.SCHEDULE -> ScheduleScreen(viewModel = scheduleViewModel, onSwitchGroup = onSwitchGroup)
+                HomeTab.SCHEDULE -> if (teacherState.teacherName != null) {
+                    TeacherScheduleScreen(
+                        viewModel = teacherScheduleViewModel,
+                        onSwitchTeacher = onSwitchTeacher
+                    )
+                } else {
+                    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/picker/PickerScreen.kt

@@ -0,0 +1,336 @@
+package agzam.vyatsu.ui.picker
+
+import agzam.vyatsu.domain.model.Group
+import agzam.vyatsu.domain.model.Teacher
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SearchBar
+import androidx.compose.material3.SearchBarDefaults
+import androidx.compose.material3.SegmentedButton
+import androidx.compose.material3.SegmentedButtonDefaults
+import androidx.compose.material3.SingleChoiceSegmentedButtonRow
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+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.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun PickerScreen(
+    viewModel: PickerViewModel,
+    onGroupPicked: (Group) -> Unit,
+    onTeacherPicked: (Teacher) -> Unit
+) {
+    val state by viewModel.uiState.collectAsState()
+    var segment by rememberSaveable { mutableStateOf(PickerSegment.GROUPS) }
+    LaunchedEffect(segment) { viewModel.selectSegment(segment) }
+
+    Scaffold { innerPadding ->
+        Column(
+            Modifier
+                .fillMaxSize()
+                .windowInsetsPadding(WindowInsets.systemBars)
+                .padding(innerPadding)
+                .padding(horizontal = 16.dp, vertical = 8.dp)
+        ) {
+            SingleChoiceSegmentedButtonRow(Modifier.fillMaxWidth()) {
+                SegmentedButton(
+                    selected = segment == PickerSegment.GROUPS,
+                    onClick = { segment = PickerSegment.GROUPS },
+                    shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2)
+                ) {
+                    Text("Группы")
+                }
+                SegmentedButton(
+                    selected = segment == PickerSegment.TEACHERS,
+                    onClick = { segment = PickerSegment.TEACHERS },
+                    shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2)
+                ) {
+                    Text("Преподаватели")
+                }
+            }
+
+            Spacer(Modifier.height(16.dp))
+
+            when (segment) {
+                PickerSegment.GROUPS -> GroupSection(
+                    state = state,
+                    onSearch = viewModel::searchGroup,
+                    onRetry = viewModel::retryGroups,
+                    onRefresh = viewModel::refreshGroups,
+                    onGroupPicked = onGroupPicked
+                )
+                PickerSegment.TEACHERS -> TeacherSection(
+                    state = state,
+                    onSearch = viewModel::searchTeacher,
+                    onRetry = viewModel::retryTeachers,
+                    onTeacherPicked = onTeacherPicked
+                )
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun GroupSection(
+    state: PickerUiState,
+    onSearch: (String) -> Unit,
+    onRetry: () -> Unit,
+    onRefresh: () -> Unit,
+    onGroupPicked: (Group) -> Unit
+) {
+    var isSearchActive by remember { mutableStateOf(false) }
+
+    if (!isSearchActive) {
+        Row(
+            Modifier
+                .fillMaxWidth()
+                .padding(bottom = 8.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = "Выберите группу",
+                style = MaterialTheme.typography.headlineSmall,
+                modifier = Modifier.weight(1f)
+            )
+            IconButton(onClick = onRefresh) {
+                Icon(Icons.Default.Refresh, contentDescription = "Обновить")
+            }
+        }
+    }
+
+    if (state.groupsLoading && state.groups.isEmpty()) {
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
+            CircularProgressIndicator()
+        }
+        return
+    }
+    if (state.error != null && state.groups.isEmpty()) {
+        Column(Modifier.fillMaxWidth()) {
+            Text(
+                state.error,
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.error
+            )
+            TextButton(onClick = onRetry) { Text("Повторить") }
+        }
+        return
+    }
+    SearchBar(
+        modifier = Modifier.fillMaxWidth(),
+        expanded = isSearchActive,
+        onExpandedChange = { isSearchActive = it },
+        inputField = {
+            SearchBarDefaults.InputField(
+                query = state.groupQuery,
+                onQueryChange = onSearch,
+                onSearch = { isSearchActive = false },
+                expanded = isSearchActive,
+                onExpandedChange = { isSearchActive = it },
+                placeholder = { Text("Поиск группы") },
+                leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) },
+                trailingIcon = {
+                    if (isSearchActive && state.groupQuery.isNotEmpty()) {
+                        IconButton(onClick = { onSearch("") }) {
+                            Icon(Icons.Default.Clear, contentDescription = "Очистить")
+                        }
+                    }
+                }
+            )
+        }
+    ) {
+        GroupList(
+            groups = state.filteredGroups,
+            onPick = { group ->
+                isSearchActive = false
+                onGroupPicked(group)
+            }
+        )
+    }
+
+    if (!isSearchActive) {
+        Spacer(modifier = Modifier.height(8.dp))
+        GroupList(state.filteredGroups, onGroupPicked)
+    }
+}
+
+@Composable
+private fun GroupList(groups: List<Group>, onPick: (Group) -> Unit) {
+    LazyColumn(modifier = Modifier.fillMaxSize()) {
+        items(groups) { group ->
+            Column(modifier = Modifier.fillMaxWidth().clickable { onPick(group) }) {
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp, vertical = 8.dp),
+                    contentAlignment = Alignment.CenterStart
+                ) {
+                    Text(group.name, style = MaterialTheme.typography.bodyMedium)
+                }
+            }
+            HorizontalDivider(thickness = 1.dp, color = MaterialTheme.colorScheme.outlineVariant)
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun TeacherSection(
+    state: PickerUiState,
+    onSearch: (String) -> Unit,
+    onRetry: () -> Unit,
+    onTeacherPicked: (Teacher) -> Unit
+) {
+    var isSearchActive by remember { mutableStateOf(false) }
+    val progress = state.syncProgress
+    val syncing = progress != null && progress.done < progress.total
+
+    if (!isSearchActive) {
+        Row(
+            Modifier
+                .fillMaxWidth()
+                .padding(bottom = 8.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = "Выберите преподавателя",
+                style = MaterialTheme.typography.headlineSmall,
+                modifier = Modifier.weight(1f)
+            )
+            IconButton(onClick = onRetry) {
+                Icon(Icons.Default.Refresh, contentDescription = "Обновить")
+            }
+        }
+    }
+
+    if (syncing) {
+        Column(Modifier.fillMaxWidth().padding(vertical = 8.dp)) {
+            LinearProgressIndicator(
+                progress = { progress.done / progress.total.toFloat() },
+                modifier = Modifier.fillMaxWidth()
+            )
+            Spacer(Modifier.height(4.dp))
+            Text(
+                text = "Кафедры: ${progress.done}/${progress.total}",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+        }
+    }
+
+    if (state.teachersLoading && state.teachers.isEmpty() && !syncing) {
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
+            CircularProgressIndicator()
+        }
+        return
+    }
+    if (state.error != null && state.teachers.isEmpty() && !syncing) {
+        Column(Modifier.fillMaxWidth()) {
+            Text(
+                state.error,
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.error
+            )
+            TextButton(onClick = onRetry) { Text("Повторить") }
+        }
+        return
+    }
+    SearchBar(
+        modifier = Modifier.fillMaxWidth(),
+        expanded = isSearchActive,
+        onExpandedChange = { isSearchActive = it },
+        inputField = {
+            SearchBarDefaults.InputField(
+                query = state.teacherQuery,
+                onQueryChange = onSearch,
+                onSearch = { isSearchActive = false },
+                expanded = isSearchActive,
+                onExpandedChange = { isSearchActive = it },
+                placeholder = { Text("Поиск преподавателя") },
+                leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) },
+                trailingIcon = {
+                    if (isSearchActive && state.teacherQuery.isNotEmpty()) {
+                        IconButton(onClick = { onSearch("") }) {
+                            Icon(Icons.Default.Clear, contentDescription = "Очистить")
+                        }
+                    }
+                }
+            )
+        }
+    ) {
+        TeacherList(
+            teachers = state.filteredTeachers,
+            onPick = { teacher ->
+                isSearchActive = false
+                onTeacherPicked(teacher)
+            }
+        )
+    }
+
+    if (!isSearchActive) {
+        Spacer(modifier = Modifier.height(8.dp))
+        when {
+            state.teachers.isEmpty() -> Text(
+                text = "Кафедры без расписания на эту неделю",
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
+            )
+            else -> TeacherList(state.filteredTeachers, onTeacherPicked)
+        }
+    }
+}
+
+@Composable
+private fun TeacherList(teachers: List<Teacher>, onPick: (Teacher) -> Unit) {
+    LazyColumn(modifier = Modifier.fillMaxSize()) {
+        items(teachers) { teacher ->
+            Column(modifier = Modifier.fillMaxWidth().clickable { onPick(teacher) }) {
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp, vertical = 8.dp),
+                    contentAlignment = Alignment.CenterStart
+                ) {
+                    Text(teacher.name, style = MaterialTheme.typography.bodyMedium)
+                }
+            }
+            HorizontalDivider(thickness = 1.dp, color = MaterialTheme.colorScheme.outlineVariant)
+        }
+    }
+}

app/src/main/java/agzam/vyatsu/ui/picker/PickerSegment.kt

@@ -0,0 +1,3 @@
+package agzam.vyatsu.ui.picker
+
+enum class PickerSegment { GROUPS, TEACHERS }

app/src/main/java/agzam/vyatsu/ui/picker/PickerViewModel.kt

@@ -0,0 +1,196 @@
+package agzam.vyatsu.ui.picker
+
+import agzam.vyatsu.domain.ScheduleDates
+import agzam.vyatsu.domain.model.BulkSyncProgress
+import agzam.vyatsu.domain.model.Group
+import agzam.vyatsu.domain.model.SchedulePeriod
+import agzam.vyatsu.domain.model.Teacher
+import agzam.vyatsu.domain.repository.GroupRepository
+import agzam.vyatsu.domain.repository.PreferencesRepository
+import agzam.vyatsu.domain.repository.TeacherRepository
+import agzam.vyatsu.domain.repository.TeacherScheduleRepository
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import java.time.DayOfWeek
+import java.time.temporal.TemporalAdjusters
+import kotlin.coroutines.cancellation.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+data class PickerUiState(
+    val segment: PickerSegment = PickerSegment.GROUPS,
+    val groups: List<Group> = emptyList(),
+    val groupQuery: String = "",
+    val filteredGroups: List<Group> = emptyList(),
+    val groupsLoading: Boolean = true,
+    val teachers: List<Teacher> = emptyList(),
+    val teacherQuery: String = "",
+    val filteredTeachers: List<Teacher> = emptyList(),
+    val teachersLoading: Boolean = true,
+    val syncProgress: BulkSyncProgress? = null,
+    val error: String? = null
+)
+
+class PickerViewModel(
+    private val groupRepository: GroupRepository,
+    private val teacherRepository: TeacherRepository,
+    private val teacherScheduleRepository: TeacherScheduleRepository,
+    private val preferencesRepository: PreferencesRepository
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(PickerUiState())
+    val uiState: StateFlow<PickerUiState> = _uiState.asStateFlow()
+
+    private var teachersJob: kotlinx.coroutines.Job? = null
+    private var syncJob: kotlinx.coroutines.Job? = null
+
+    init {
+        groupsLoad()
+        teachersLoad()
+    }
+
+    fun selectSegment(segment: PickerSegment) {
+        _uiState.value = _uiState.value.copy(segment = segment)
+    }
+
+    private fun groupsLoad() {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                try {
+                    groupRepository.refreshIfStale()
+                } catch (e: Exception) {
+                    _uiState.value = _uiState.value.copy(
+                        error = e.message ?: "Не удалось загрузить группы"
+                    )
+                }
+            }
+            groupRepository.observeGroups().collect { groups ->
+                val query = _uiState.value.groupQuery
+                _uiState.value = _uiState.value.copy(
+                    groupsLoading = false,
+                    groups = groups,
+                    filteredGroups = filterGroups(groups, query),
+                    error = null
+                )
+            }
+        }
+    }
+
+    fun searchGroup(query: String) {
+        val groups = _uiState.value.groups
+        _uiState.value = _uiState.value.copy(
+            groupQuery = query,
+            filteredGroups = filterGroups(groups, query)
+        )
+    }
+
+    private fun filterGroups(groups: List<Group>, query: String): List<Group> {
+        if (query.isBlank()) return groups
+        val lowerQuery = query.lowercase()
+        return groups.filter { group ->
+            group.name.lowercase().contains(lowerQuery) || group.faculty.lowercase().contains(lowerQuery)
+        }
+    }
+
+    fun retryGroups() {
+        _uiState.value = _uiState.value.copy(groupsLoading = true, error = null)
+        groupsLoad()
+    }
+
+    fun refreshGroups() {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                try {
+                    groupRepository.forceRefresh()
+                } catch (e: Exception) {
+                    _uiState.value = _uiState.value.copy(
+                        error = e.message ?: "Не удалось обновить список групп"
+                    )
+                }
+            }
+        }
+    }
+
+    private fun teachersLoad() {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                try {
+                    teacherRepository.refreshIfStale()
+                } catch (e: Exception) {
+                    _uiState.value = _uiState.value.copy(
+                        error = e.message ?: "Не удалось загрузить кафедры"
+                    )
+                }
+            }
+            syncAndObserveTeachers()
+        }
+    }
+
+    private fun syncAndObserveTeachers() {
+        val today = ScheduleDates.moscowToday()
+        val weekStart = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
+        val period = SchedulePeriod(
+            weekStart = weekStart,
+            weekEnd = weekStart.plusDays(6),
+            season = ScheduleDates.currentSeason(today)
+        )
+
+        _uiState.value = _uiState.value.copy(syncProgress = null, teachersLoading = true)
+
+        syncJob?.cancel()
+        syncJob = viewModelScope.launch {
+            try {
+                teacherScheduleRepository.syncPeriod(today).collect { progress ->
+                    _uiState.value = _uiState.value.copy(syncProgress = progress)
+                }
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: Throwable) {
+                _uiState.value = _uiState.value.copy(
+                    error = e.message ?: "Не удалось загрузить расписание преподавателей"
+                )
+            } finally {
+                _uiState.value = _uiState.value.copy(teachersLoading = false)
+            }
+        }
+
+        teachersJob?.cancel()
+        teachersJob = viewModelScope.launch {
+            teacherScheduleRepository.observeTeachers(period)
+                .debounce(300)
+                .collect { teachers ->
+                    val query = _uiState.value.teacherQuery
+                    val isLoading = _uiState.value.teachersLoading
+                    _uiState.value = _uiState.value.copy(
+                        teachers = teachers,
+                        filteredTeachers = filterTeachers(teachers, query),
+                        teachersLoading = isLoading && teachers.isEmpty(),
+                        error = null
+                    )
+                }
+        }
+    }
+
+    fun searchTeacher(query: String) {
+        val teachers = _uiState.value.teachers
+        _uiState.value = _uiState.value.copy(
+            teacherQuery = query,
+            filteredTeachers = filterTeachers(teachers, query)
+        )
+    }
+
+    private fun filterTeachers(teachers: List<Teacher>, query: String): List<Teacher> {
+        if (query.isBlank()) return teachers
+        val lowerQuery = query.lowercase()
+        return teachers.filter { teacher -> teacher.name.lowercase().contains(lowerQuery) }
+    }
+
+    fun retryTeachers() {
+        syncAndObserveTeachers()
+    }
+}

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

@@ -1,35 +1,29 @@
 package agzam.vyatsu.ui.schedule
 
-import agzam.vyatsu.domain.model.Day
+import agzam.vyatsu.ui.schedule.components.DayChips
-import agzam.vyatsu.domain.model.LessonType
+import agzam.vyatsu.ui.schedule.components.FULL_DATE
-import agzam.vyatsu.domain.model.SchedulePeriod
+import agzam.vyatsu.ui.schedule.components.LessonSlot
-import agzam.vyatsu.domain.model.TimeSlot
+import agzam.vyatsu.ui.schedule.components.WeekSelector
-import androidx.compose.foundation.clickable
+import agzam.vyatsu.ui.schedule.components.dayName
+import agzam.vyatsu.ui.schedule.components.hPadding
 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.systemBars
+import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
 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
@@ -38,28 +32,30 @@ 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.snapshotFlow
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import java.time.DayOfWeek
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
+
     val state by viewModel.uiState.collectAsState()
 
     Column(Modifier.fillMaxSize()) {
         TopAppBar(
             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("Сменить группу")
                 }
@@ -69,18 +65,9 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
             },
             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
@@ -95,6 +82,15 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                     }
                 }
 
+                state.schedule == null -> {
+                    Row(
+                        Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.Center
+                    ) {
+                        CircularProgressIndicator()
+                    }
+                }
+
                 else -> {
                     val schedule = state.schedule!!
                     val weekDays = state.weekStart
@@ -106,11 +102,37 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                     if (day == null) {
                         Text("Занятий нет", style = MaterialTheme.typography.bodyLarge)
                     } else {
+
+                        val schedule = state.schedule!!
+                        val weekDays = state.weekStart
+                            ?.let { ws -> schedule.periods.firstOrNull { it.weekStart == ws } }
+                            ?.let { schedule.daysOf(it) }
+                            .orEmpty()
+
+                        val selectedDayIndex = weekDays.indexOfFirst { it.date == state.dayDate }.coerceAtLeast(0)
+                        val pagerState = rememberPagerState(
+                            initialPage = selectedDayIndex,
+                            pageCount = { weekDays.size }
+                        )
+                        LaunchedEffect(state.dayDate) {
+                            val targetPage = weekDays.indexOfFirst { it.date == state.dayDate }
+                            if (targetPage != -1 && targetPage != pagerState.currentPage) {
+                                pagerState.scrollToPage(targetPage) // Мгновенное переключение без анимации
+                            }
+                        }
+                        LaunchedEffect(pagerState) {
+                            snapshotFlow { pagerState.currentPage }.collect { page ->
+                                if (pagerState.isScrollInProgress && page in weekDays.indices) {
+                                    viewModel.selectDay(weekDays[page].date)
+                                }
+                            }
+                        }
+
                         val isTodayDay = day.date == state.todayDate
                         val dayLabel = if (isTodayDay) "Сегодня " else ""
 
                         Row(
-                            Modifier.fillMaxWidth(),
+                            Modifier.fillMaxWidth().padding(horizontal = hPadding),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
                             Text(
@@ -125,23 +147,33 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                                 onSelect = viewModel::selectWeek
                             )
                         }
-                        HorizontalDivider(Modifier.padding(top = 8.dp, bottom = 0.dp))
+                        HorizontalDivider(Modifier.padding(top = 8.dp, bottom = 0.dp, start = hPadding, end = hPadding))
 
                         DayChips(
                             days = weekDays,
                             selectedDate = state.dayDate,
                             todayDate = state.todayDate,
-                            onSelect = viewModel::selectDay
+                            onSelect = viewModel::selectDay,
+                            pagerState = pagerState
                         )
 
-                        HorizontalDivider(Modifier.padding(top=0.dp, bottom = 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)
@@ -154,196 +186,4 @@ 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)
-                    }
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun DayChips(
-    days: List<Day>,
-    selectedDate: LocalDate?,
-    todayDate: LocalDate?,
-    onSelect: (LocalDate) -> Unit
-) {
-    LazyRow(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
-        items(days, key = { it.date.toEpochDay() }) { day ->
-            val selected = selectedDate == day.date
-            val isTodayChip = todayDate == day.date
-            FilterChip(
-                selected = selected,
-                onClick = { onSelect(day.date) },
-                label = {
-                    Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                        Text(
-                            dayName(day.date.dayOfWeek),
-                            style = MaterialTheme.typography.labelMedium
-                        )
-                        Text(
-                            day.date.format(CHIP_DATE),
-                            style = MaterialTheme.typography.labelSmall,
-                            color = if (selected) {
-                                MaterialTheme.colorScheme.onSecondaryContainer
-                            } else {
-                                MaterialTheme.colorScheme.onSurfaceVariant
-                            }
-                        )
-                    }
-                },
-                modifier = Modifier.padding(vertical = 2.dp),
-                border = if (isTodayChip && !selected) {
-                    FilterChipDefaults.filterChipBorder(
-                        borderColor = MaterialTheme.colorScheme.primary,
-                        borderWidth = 1.dp,
-                        enabled = true,
-                        selected = false
-                    )
-                } else {
-                    FilterChipDefaults.filterChipBorder(enabled = true, selected = selected)
-                },
-                shape = RoundedCornerShape(8.dp)
-            )
-        }
-    }
-}
-
-private fun weekLabel(period: SchedulePeriod): String {
-    val first = period.weekStart
-    return "с ${first.format(CHIP_DATE)}"
-}
-
-@Composable
-private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
-    Column(Modifier.fillMaxWidth()) {
-        Text(
-            "${slotIndex + 1} пара · ${slot.start.format(TIME)}–${slot.end.format(TIME)}",
-            style = MaterialTheme.typography.labelMedium,
-            color = MaterialTheme.colorScheme.primary
-        )
-        if (slot.lessons.isEmpty()) {
-            Text("—", style = MaterialTheme.typography.bodyMedium)
-        } else {
-            slot.lessons.forEach { lesson ->
-                Column(Modifier.fillMaxWidth().padding(vertical = 2.dp)) {
-                    var any = false
-                    if(lesson.type != LessonType.OTHER) {
-                        Text(
-                            lesson.type.label,
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
-                        )
-                        any = true
-                    }
-
-                    val subject = lesson.subject?.takeIf { it.isNotBlank() } ?: lesson.raw
-                    if(subject.isNotEmpty()) {
-                        Text(
-                            subject,
-                            style = MaterialTheme.typography.bodyLarge
-                        )
-                        any = true
-                    }
-
-                    val meta = listOfNotNull(
-                        lesson.subgroup,
-                        lesson.teacher,
-                        lesson.room
-                    ).filter { it.isNotBlank() }.joinToString(" · ")
-
-                    if(meta.isNotEmpty()) {
-                        Text(
-                            meta,
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
-                        )
-                        any = true
-                    }
-
-                    if(!any) {
-                        Text(
-                            "-",
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
-                        )
-                    }
-
-                }
-            }
-        }
-    }
-}
-
-private fun dayName(dayOfWeek: DayOfWeek): String = when (dayOfWeek) {
-    DayOfWeek.MONDAY -> "Пн"
-    DayOfWeek.TUESDAY -> "Вт"
-    DayOfWeek.WEDNESDAY -> "Ср"
-    DayOfWeek.THURSDAY -> "Чт"
-    DayOfWeek.FRIDAY -> "Пт"
-    DayOfWeek.SATURDAY -> "Сб"
-    DayOfWeek.SUNDAY -> "Вс"
-}
-
-private val FULL_DATE: DateTimeFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
-private val CHIP_DATE: DateTimeFormatter = DateTimeFormatter.ofPattern("dd.MM")
-private val TIME: DateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm")

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

@@ -37,6 +37,7 @@ class ScheduleViewModel(
 
     fun selectGroup(groupId: String) {
         currentGroupId = groupId
+        _uiState.value = _uiState.value.copy(noGroup = false, isLoading = true, loadError = false)
         viewModelScope.launch {
             preferencesRepository.setSelectedGroup(groupId)
             val groupName = groupRepository.getGroups().firstOrNull { it.id == groupId }?.name
@@ -61,7 +62,7 @@ class ScheduleViewModel(
             }
 
             launch {
-                syncIfMissingToday(groupId)
+                syncIfMissing(groupId)
             }
         }
     }
@@ -96,7 +97,9 @@ class ScheduleViewModel(
             schedule = schedule,
             weekStart = weekStart,
             dayDate = dayDate,
-            todayDate = todayDate
+            todayDate = todayDate,
+            isLoading = false,
+            loadError = false
         )
     }
 
@@ -128,30 +131,39 @@ class ScheduleViewModel(
         }
     }
 
-    private suspend fun syncIfMissingToday(groupId: String) {
+    private suspend fun syncIfMissing(groupId: String) {
-        val schedule = scheduleRepository.getSchedule(groupId)
+        if (scheduleRepository.getSchedule(groupId) != null) {
-        val today = ScheduleDates.moscowToday()
+            _uiState.value = _uiState.value.copy(isLoading = false)
-        val hasTodayPeriod = schedule?.periodOf(today) != null
+            return
-        if (hasTodayPeriod) return
+        }
-        _uiState.value = _uiState.value.copy(isSyncing = true)
+        loadSchedule(groupId)
-        scheduleRepository.sync(groupId)
+    }
-        _uiState.value = _uiState.value.copy(isSyncing = false)
+
+    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 (периоды), появившиеся на сайте.
-            _uiState.value = _uiState.value.copy(isRefreshing = false)
+            runCatching { groupRepository.forceRefresh() }
+            loadSchedule(groupId)
         }
     }
 
@@ -175,8 +187,8 @@ class ScheduleViewModel(
 
 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 groupName: String? = null,
     val weekStart: LocalDate? = null,

app/src/main/java/agzam/vyatsu/ui/schedule/components/DayChips.kt

@@ -0,0 +1,133 @@
+package agzam.vyatsu.ui.schedule.components
+
+import agzam.vyatsu.domain.model.Day
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+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.rememberLazyListState
+import androidx.compose.foundation.pager.PagerState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.FilterChipDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.flow.collectLatest
+import java.time.LocalDate
+import kotlin.math.max
+import kotlin.math.min
+
+internal 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
+internal fun DayChips(
+    days: List<Day>,
+    selectedDate: LocalDate?,
+    todayDate: LocalDate?,
+    pagerState: PagerState,
+    onSelect: (LocalDate) -> Unit
+) {
+    val listState = rememberLazyListState()
+
+    val density = LocalDensity.current
+
+    val paddingPx = with(density) { hPadding.toPx() }
+
+
+    LaunchedEffect(pagerState, days) {
+        snapshotFlow {
+            pagerState.currentPage
+        }.collectLatest { targetPage ->
+
+            if (targetPage in days.indices) {
+                val layoutInfo = listState.layoutInfo
+                val visibleItems = layoutInfo.visibleItemsInfo
+                val targetItem = visibleItems.firstOrNull { it.index == targetPage }
+
+                if (targetItem != null) {
+                    val visiblePercentage = getVisiblePercentage(targetItem, layoutInfo)
+                    val minVisibleThreshold = 0.9f
+
+                    if (visiblePercentage < minVisibleThreshold) {
+                        val viewPortWidth = layoutInfo.viewportEndOffset - layoutInfo.viewportStartOffset
+                        val halfViewport = viewPortWidth / 2f
+                        val centerOffset = (halfViewport - (targetItem.size / 2f) - paddingPx).toInt()
+
+                        listState.animateScrollToItem(index = targetPage, scrollOffset = -centerOffset)
+                    }
+                } else {
+                    val viewPortWidth = layoutInfo.viewportEndOffset - layoutInfo.viewportStartOffset
+                    val halfViewport = viewPortWidth / 2f
+
+                    val averageSize = visibleItems.map { it.size }.average().toInt().coerceAtLeast(150)
+                    val centerOffset = (halfViewport - (averageSize / 2f) - paddingPx).toInt()
+
+                    listState.animateScrollToItem(index = targetPage, scrollOffset = -centerOffset)
+                }
+            }
+        }
+    }
+
+    LazyRow(state = listState, horizontalArrangement = Arrangement.spacedBy(6.dp), contentPadding = PaddingValues(horizontal = hPadding, vertical = 2.dp),) {
+        items(days, key = { it.date.toEpochDay() }) { day ->
+            val selected = selectedDate == day.date
+            val isTodayChip = todayDate == day.date
+            FilterChip(
+                selected = selected,
+                onClick = { onSelect(day.date) },
+                label = {
+                    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                        Text(
+                            dayName(day.date.dayOfWeek),
+                            style = MaterialTheme.typography.labelMedium
+                        )
+                        Text(
+                            day.date.format(CHIP_DATE),
+                            style = MaterialTheme.typography.labelSmall,
+                            color = if (selected) {
+                                MaterialTheme.colorScheme.onSecondaryContainer
+                            } else {
+                                MaterialTheme.colorScheme.onSurfaceVariant
+                            }
+                        )
+                    }
+                },
+                modifier = Modifier.padding(vertical = 2.dp),
+                border = if (isTodayChip && !selected) {
+                    FilterChipDefaults.filterChipBorder(
+                        borderColor = MaterialTheme.colorScheme.primary,
+                        borderWidth = 1.dp,
+                        enabled = true,
+                        selected = false
+                    )
+                } else {
+                    FilterChipDefaults.filterChipBorder(enabled = true, selected = selected)
+                },
+                shape = RoundedCornerShape(8.dp)
+            )
+        }
+    }
+}

app/src/main/java/agzam/vyatsu/ui/schedule/components/LessonSlot.kt

@@ -0,0 +1,118 @@
+package agzam.vyatsu.ui.schedule.components
+
+import agzam.vyatsu.domain.model.LessonType
+import agzam.vyatsu.domain.model.TimeSlot
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+
+@Composable
+internal fun LessonSlot(slotIndex: Int, slot: TimeSlot, showTeacher: Boolean = true) {
+    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,
+                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.forEachIndexed { index, lesson ->
+                var baseSurface = Modifier.fillMaxWidth().padding(vertical = 2.dp)
+                if ((indexColor) % 2 != 0) {
+                    baseSurface = baseSurface.background(
+                        MaterialTheme.colorScheme.surfaceContainer
+                    );
+                }
+                indexColor++
+                // XXX:
+                // Убрать SelectionContainer?
+                // Режим редактирования расписания?
+                // Меню на onClick?
+                // Меню на onLongClick?
+                SelectionContainer() {
+                    Column(
+                        baseSurface
+                        // XXX: combinedClickable?
+                        //.combinedClickable(
+                        //    onClick = {
+                        //        Toast.makeText(
+                        //            context,
+                        //            lesson.raw,
+                        //            Toast.LENGTH_SHORT
+                        //        ).show()
+                        //    },
+                        //    onLongClick = {},
+                        //    // TODO: onLongClickLabel = "(Accessibility)"
+                        //),
+                    ) {
+                        var any = false
+
+                        val meta = listOfNotNull(
+                            if (lesson.type == LessonType.OTHER) {
+                                null
+                            } else {
+                                lesson.type.label
+                            },
+                            lesson.subgroup,
+                            if (showTeacher) lesson.teacher else lesson.group,
+                            lesson.room
+                        ).filter { it.isNotBlank() }.joinToString(" · ")
+
+                        if (meta.isNotEmpty()) {
+                            Text(
+                                meta,
+                                style = MaterialTheme.typography.bodySmall,
+                                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/components/ScheduleUi.kt

@@ -0,0 +1,21 @@
+package agzam.vyatsu.ui.schedule.components
+
+import androidx.compose.ui.unit.dp
+import java.time.DayOfWeek
+import java.time.format.DateTimeFormatter
+
+internal val hPadding = 16.dp
+
+internal fun dayName(dayOfWeek: DayOfWeek): String = when (dayOfWeek) {
+    DayOfWeek.MONDAY -> "Пн"
+    DayOfWeek.TUESDAY -> "Вт"
+    DayOfWeek.WEDNESDAY -> "Ср"
+    DayOfWeek.THURSDAY -> "Чт"
+    DayOfWeek.FRIDAY -> "Пт"
+    DayOfWeek.SATURDAY -> "Сб"
+    DayOfWeek.SUNDAY -> "Вс"
+}
+
+internal val FULL_DATE: DateTimeFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
+internal val CHIP_DATE: DateTimeFormatter = DateTimeFormatter.ofPattern("dd.MM")
+internal val TIME: DateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm")

app/src/main/java/agzam/vyatsu/ui/schedule/components/WeekSelector.kt

@@ -0,0 +1,96 @@
+package agzam.vyatsu.ui.schedule.components
+
+import agzam.vyatsu.domain.model.SchedulePeriod
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+import java.time.LocalDate
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+internal 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)
+                    }
+                )
+            }
+        }
+    }
+}
+
+internal fun weekLabel(period: SchedulePeriod): String {
+    val first = period.weekStart
+    return "с ${first.format(CHIP_DATE)}"
+}

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/ui/teacher/TeacherScheduleScreen.kt

@@ -0,0 +1,188 @@
+package agzam.vyatsu.ui.teacher
+
+import agzam.vyatsu.ui.schedule.components.DayChips
+import agzam.vyatsu.ui.schedule.components.FULL_DATE
+import agzam.vyatsu.ui.schedule.components.LessonSlot
+import agzam.vyatsu.ui.schedule.components.WeekSelector
+import agzam.vyatsu.ui.schedule.components.dayName
+import agzam.vyatsu.ui.schedule.components.hPadding
+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.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+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.snapshotFlow
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun TeacherScheduleScreen(viewModel: TeacherScheduleViewModel, onSwitchTeacher: () -> Unit) {
+
+    val state by viewModel.uiState.collectAsState()
+
+    Column(Modifier.fillMaxSize()) {
+        TopAppBar(
+            title = { Text(state.teacherName ?: "Расписание преподавателя", style = MaterialTheme.typography.titleMedium) },
+            actions = {
+                if (state.isLoading && state.schedule != null) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(24.dp),
+                        strokeWidth = 2.dp
+                    )
+                }
+                TextButton(onClick = { onSwitchTeacher() }) {
+                    Text("Сменить преподавателя")
+                }
+                IconButton(onClick = { viewModel.refresh() }) {
+                    Icon(Icons.Default.Refresh, contentDescription = "Обновить")
+                }
+            },
+            windowInsets = WindowInsets(0.dp)
+        )
+        Column(Modifier.fillMaxSize().padding(horizontal = 0.dp, vertical = 0.dp)) {
+            when {
+                state.schedule == null && state.loadError -> {
+                    Column(
+                        Modifier.fillMaxWidth(),
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        Text(
+                            "Не удалось загрузить расписание",
+                            style = MaterialTheme.typography.bodyLarge
+                        )
+                        TextButton(onClick = { viewModel.refresh() }) {
+                            Text("Повторить")
+                        }
+                    }
+                }
+
+                state.schedule == null -> {
+                    Row(
+                        Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.Center
+                    ) {
+                        CircularProgressIndicator()
+                    }
+                }
+
+                else -> {
+                    val schedule = state.schedule!!
+                    val weekDays = schedule.days
+                    val day = weekDays.firstOrNull { it.date == state.dayDate }
+
+                    if (day == null) {
+                        Text("Занятий нет", style = MaterialTheme.typography.bodyLarge)
+                    } else {
+
+                        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,
+                                modifier = Modifier.weight(1f)
+                            )
+                            WeekSelector(
+                                periods = state.weeks.ifEmpty { listOf(schedule.period) },
+                                selectedWeekStart = state.weekStart,
+                                todayWeekStart = state.todayDate
+                                    ?.let { todayDate ->
+                                        state.weeks.firstOrNull { period ->
+                                            !todayDate.isBefore(period.weekStart) && !todayDate.isAfter(period.weekEnd)
+                                        }?.weekStart
+                                    }
+                                    ?: schedule.period.weekStart.takeIf {
+                                        state.todayDate?.let { today -> !today.isBefore(it) && !today.isAfter(it.plusDays(6)) } == true
+                                    },
+                                onSelect = viewModel::selectWeek
+                            )
+                        }
+                        HorizontalDivider(Modifier.padding(top = 8.dp, bottom = 0.dp, start = hPadding, end = hPadding))
+
+                        DayChips(
+                            days = weekDays,
+                            selectedDate = state.dayDate,
+                            todayDate = state.todayDate,
+                            onSelect = viewModel::selectDay,
+                            pagerState = pagerState
+                        )
+
+                        HorizontalDivider(Modifier.padding(top = 0.dp, start = hPadding, end = hPadding))
+
+                        HorizontalPager(state = pagerState, modifier = Modifier.weight(1f)) { page ->
+                            val pagerDay = weekDays.getOrNull(page)
+
+                            if (pagerDay == null || pagerDay.intervals.all { it.lessons.isEmpty() }) {
+                                Box(
+                                    modifier = Modifier.fillMaxSize(),
+                                    contentAlignment = Alignment.Center
+                                ) {
+                                    Text("Занятий нет", style = MaterialTheme.typography.bodyLarge)
+                                }
+                            } else {
+                                LazyColumn(
+                                    modifier = Modifier.fillMaxSize(),
+                                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                                    contentPadding = PaddingValues(vertical = 8.dp)
+                                ) {
+                                    itemsIndexed(pagerDay.intervals) { slotIndex, slot ->
+                                        LessonSlot(slotIndex = slotIndex, slot = slot, showTeacher = false)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/agzam/vyatsu/ui/teacher/TeacherScheduleViewModel.kt

@@ -0,0 +1,241 @@
+package agzam.vyatsu.ui.teacher
+
+import agzam.vyatsu.domain.ScheduleDates
+import agzam.vyatsu.domain.model.SchedulePeriod
+import agzam.vyatsu.domain.model.TeacherSchedule
+import agzam.vyatsu.domain.repository.PreferencesRepository
+import agzam.vyatsu.domain.repository.TeacherScheduleRepository
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import java.time.DayOfWeek
+import java.time.LocalDate
+import java.time.temporal.TemporalAdjusters
+import kotlin.coroutines.cancellation.CancellationException
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+class TeacherScheduleViewModel(
+    private val scheduleRepository: TeacherScheduleRepository,
+    private val preferencesRepository: PreferencesRepository
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(TeacherScheduleUiState())
+    val uiState: StateFlow<TeacherScheduleUiState> = _uiState.asStateFlow()
+
+    private var currentTeacherName: String? = null
+    private var currentPeriod: SchedulePeriod? = null
+    private var scheduleJob: Job? = null
+    private var weeksJob: Job? = null
+    private var loadRevision = 0
+
+    init {
+        viewModelScope.launch {
+            val teacherId = preferencesRepository.selectedTeacherId()
+            if (teacherId != null) {
+                selectTeacher(teacherId)
+            } else {
+                _uiState.value = _uiState.value.copy(noTeacher = true, teacherName = null)
+            }
+        }
+    }
+
+    fun selectTeacher(name: String) {
+        val revision = ++loadRevision
+        currentTeacherName = name
+        _uiState.value = _uiState.value.copy(noTeacher = false, teacherName = name, isLoading = true, loadError = false)
+        viewModelScope.launch {
+            try {
+                preferencesRepository.setSelectedTeacherId(name)
+
+                val savedWeekStart = runCatching {
+                    preferencesRepository.selectedTeacherWeekStart()?.let(LocalDate::parse)
+                }.getOrNull()
+                val savedDayDate = runCatching {
+                    preferencesRepository.selectedTeacherDayDate()?.let(LocalDate::parse)
+                }.getOrNull()
+
+                val today = ScheduleDates.moscowToday()
+                val weekStart = savedWeekStart
+                    ?: today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
+                if (revision != loadRevision) return@launch
+                _uiState.value = _uiState.value.copy(
+                    noTeacher = false,
+                    teacherName = name,
+                    weekStart = weekStart,
+                    dayDate = savedDayDate
+                )
+
+                val period = SchedulePeriod(
+                    weekStart = weekStart,
+                    weekEnd = weekStart.plusDays(6),
+                    season = ScheduleDates.currentSeason(today)
+                )
+                loadSchedule(period, revision)
+            } catch (e: CancellationException) {
+                throw e
+            }
+        }
+    }
+
+    private suspend fun loadSchedule(period: SchedulePeriod, revision: Int) {
+        if (revision != loadRevision) return
+        scheduleJob?.cancel()
+        scheduleJob = null
+        currentPeriod = period
+
+        if (!scheduleRepository.hasData(period)) {
+            _uiState.value = _uiState.value.copy(isLoading = true, loadError = false)
+            try {
+                scheduleRepository.syncPeriod(period.weekStart).collect { }
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: Exception) {
+            }
+            if (revision != loadRevision) return
+            if (!scheduleRepository.hasData(period)) {
+                _uiState.value = _uiState.value.copy(isLoading = false, loadError = true)
+                return
+            }
+        }
+
+        weeksJob?.cancel()
+        weeksJob = viewModelScope.launch {
+            val weeks = scheduleRepository.weeksFor(period.weekStart)
+            if (revision != loadRevision) return@launch
+            _uiState.value = _uiState.value.copy(weeks = weeks)
+        }
+
+        scheduleJob = viewModelScope.launch {
+            scheduleRepository.observeSchedule(period).collect { schedule ->
+                if (revision != loadRevision) {
+                    throw CancellationException("stale schedule observation")
+                }
+                currentTeacherName?.let { applySchedule(schedule, it) }
+            }
+        }
+    }
+
+    private suspend fun applySchedule(schedule: TeacherSchedule?, teacherName: String) {
+        val current = _uiState.value
+        if (schedule == null) return
+
+        val filteredDays = schedule.daysForTeacher(teacherName)
+        android.util.Log.d("TeacherSchedDebug", "apply: teacher=$teacherName periodWeek=$schedule.period rawDays=${schedule.days.size} filteredDays=${filteredDays.size}")
+        filteredDays.forEach { d ->
+            android.util.Log.d(
+                "TeacherSchedDebug",
+                "apply: filteredDay=${d.date} slots=${d.intervals.map { "${it.start}-${it.end}:${it.lessons.size}" }}"
+            )
+        }
+
+        val today = ScheduleDates.moscowToday()
+        val todayDate = if (isInPeriod(today, schedule.period)) today else null
+
+        val dayDate = when {
+            filteredDays.any { it.date == current.dayDate } -> current.dayDate
+            filteredDays.any { it.date == todayDate } -> todayDate
+            else -> filteredDays.firstOrNull()?.date
+        }
+
+        preferencesRepository.setSelectedTeacherWeekStart(schedule.period.weekStart.toString())
+        dayDate?.let { preferencesRepository.setSelectedTeacherDayDate(it.toString()) }
+
+        _uiState.value = current.copy(
+            schedule = schedule.copy(days = filteredDays),
+            weekStart = schedule.period.weekStart,
+            dayDate = dayDate,
+            todayDate = todayDate,
+            isLoading = false,
+            loadError = false
+        )
+    }
+
+    fun selectWeek(weekStart: LocalDate) {
+        val state = _uiState.value
+        val name = state.teacherName ?: return
+        if (state.weekStart == weekStart) return
+        val revision = ++loadRevision
+        viewModelScope.launch {
+            try {
+                preferencesRepository.setSelectedTeacherWeekStart(weekStart.toString())
+                if (revision != loadRevision) return@launch
+                _uiState.value = _uiState.value.copy(
+                    weekStart = weekStart,
+                    dayDate = null,
+                    schedule = null,
+                    isLoading = true,
+                    loadError = false
+                )
+                val period = SchedulePeriod(
+                    weekStart = weekStart,
+                    weekEnd = weekStart.plusDays(6),
+                    season = ScheduleDates.currentSeason(weekStart)
+                )
+                loadSchedule(period, revision)
+            } catch (e: CancellationException) {
+                throw e
+            }
+        }
+    }
+
+    fun selectDay(date: LocalDate) {
+        val state = _uiState.value
+        val schedule = state.schedule ?: return
+        if (date.isBefore(schedule.period.weekStart) || date.isAfter(schedule.period.weekEnd)) return
+        viewModelScope.launch {
+            preferencesRepository.setSelectedTeacherWeekStart(schedule.period.weekStart.toString())
+            preferencesRepository.setSelectedTeacherDayDate(date.toString())
+            _uiState.value = _uiState.value.copy(weekStart = schedule.period.weekStart, dayDate = date)
+        }
+    }
+
+    fun refresh() {
+        val period = currentPeriod ?: return
+        val revision = ++loadRevision
+        viewModelScope.launch {
+            try {
+                _uiState.value = _uiState.value.copy(isLoading = true, loadError = false)
+                try {
+                    scheduleRepository.syncPeriod(ScheduleDates.moscowToday()).collect { }
+                } catch (e: CancellationException) {
+                    throw e
+                } catch (e: Exception) {
+                }
+                if (revision != loadRevision) return@launch
+                loadSchedule(period, revision)
+            } catch (e: CancellationException) {
+                throw e
+            }
+        }
+    }
+
+    fun switchTeacher() {
+        loadRevision++
+        viewModelScope.launch {
+            currentTeacherName = null
+            currentPeriod = null
+            scheduleJob?.cancel()
+            scheduleJob = null
+            preferencesRepository.clearSelectedTeacher()
+            _uiState.value = TeacherScheduleUiState(noTeacher = true)
+        }
+    }
+
+    private fun isInPeriod(date: LocalDate, period: SchedulePeriod): Boolean =
+        !date.isBefore(period.weekStart) && !date.isAfter(period.weekEnd)
+}
+
+data class TeacherScheduleUiState(
+    val noTeacher: Boolean = true,
+    val isLoading: Boolean = false,
+    val loadError: Boolean = false,
+    val schedule: TeacherSchedule? = null,
+    val teacherName: String? = null,
+    val weekStart: LocalDate? = null,
+    val dayDate: LocalDate? = null,
+    val todayDate: LocalDate? = null,
+    val weeks: List<SchedulePeriod> = emptyList()
+)

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>

app/src/test/java/agzam/vyatsu/GroupsPipelineMemoryTest.kt

@@ -0,0 +1,19 @@
+package agzam.vyatsu
+
+import agzam.vyatsu.data.remote.GroupsParser
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class GroupsPipelineMemoryTest {
+
+    @Test
+    fun streamingUnderSmallHeap() {
+        val fixture = checkNotNull(javaClass.getResourceAsStream("/groups.html")) {
+            "Fixture groups.html not found in src/test/resources"
+        }
+        val result = fixture.use(GroupsParser::parseStream)
+        assertTrue(result.groups.size > 400)
+        assertTrue(result.groups.any { it.id == "26981" && it.name.contains("ПОДб-1701-08-00") })
+        assertTrue(result.dateRanges.size > 400)
+    }
+}

app/src/test/java/agzam/vyatsu/TeacherScheduleDomainTest.kt

@@ -0,0 +1,127 @@
+package agzam.vyatsu
+
+import agzam.vyatsu.domain.model.Day
+import agzam.vyatsu.domain.model.Lesson
+import agzam.vyatsu.domain.model.LessonType
+import agzam.vyatsu.domain.model.SchedulePeriod
+import agzam.vyatsu.domain.model.Season
+import agzam.vyatsu.domain.model.TeacherSchedule
+import agzam.vyatsu.domain.model.TimeSlot
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import java.time.LocalDate
+import java.time.LocalTime
+
+class TeacherScheduleDomainTest {
+
+    @Test
+    fun daysForTeacherFiltersAndPreservesOrder() {
+        val date1 = LocalDate.of(2026, 9, 14)
+        val date2 = LocalDate.of(2026, 9, 15)
+        val slot1 = TimeSlot(
+            LocalTime.of(8, 20),
+            LocalTime.of(9, 50),
+            listOf(lesson(room = "4-302", teacher = "A"), lesson(room = "5-100", teacher = "B"))
+        )
+        val slot2 = TimeSlot(
+            LocalTime.of(10, 0),
+            LocalTime.of(11, 30),
+            listOf(lesson(room = "5-100", teacher = "B"))
+        )
+        val day2Slot = TimeSlot(
+            LocalTime.of(8, 20),
+            LocalTime.of(9, 50),
+            listOf(lesson(room = "5-100", teacher = "B"))
+        )
+        val schedule = TeacherSchedule(
+            period = SchedulePeriod(date1, date2, Season.AUTUMN),
+            days = listOf(Day(date1, listOf(slot1, slot2)), Day(date2, listOf(day2Slot)))
+        )
+
+        val result = schedule.daysForTeacher("A")
+
+        assertEquals(1, result.size)
+        assertEquals(date1, result[0].date)
+        assertEquals(1, result[0].intervals.size)
+        assertEquals(LocalTime.of(8, 20), result[0].intervals[0].start)
+        assertEquals(1, result[0].intervals[0].lessons.size)
+        assertEquals("A", result[0].intervals[0].lessons[0].teacher)
+    }
+
+    @Test
+    fun daysForTeacherDropsDayWithoutTeacher() {
+        val date1 = LocalDate.of(2026, 9, 14)
+        val date2 = LocalDate.of(2026, 9, 15)
+        val schedule = TeacherSchedule(
+            period = SchedulePeriod(date1, date2, Season.AUTUMN),
+            days = listOf(
+                Day(date1, listOf(slotOf(lesson(room = "4-302", teacher = "A")))),
+                Day(date2, listOf(slotOf(lesson(room = "5-100", teacher = "B"))))
+            )
+        )
+
+        val result = schedule.daysForTeacher("A")
+
+        assertEquals(1, result.size)
+        assertEquals(date1, result[0].date)
+    }
+
+    @Test
+    fun dedupCollapsesOnlyIdenticalLessons() {
+        val date = LocalDate.of(2026, 9, 14)
+        val raw = "4-302 Программирование Лекция ИВТб-3304-01-00"
+        val identical = lesson(
+            room = "4-302",
+            group = "ИВТб-3304-01-00",
+            teacher = "A",
+            raw = raw,
+            subject = "Программирование"
+        )
+        val differsInGroup = identical.copy(group = "ИВТб-3304-02-00")
+        val differsInRoom = identical.copy(room = "5-102")
+
+        val schedule = TeacherSchedule(
+            period = SchedulePeriod(date, date, Season.AUTUMN),
+            days = listOf(
+                Day(
+                    date,
+                    listOf(
+                        TimeSlot(
+                            LocalTime.of(8, 20),
+                            LocalTime.of(9, 50),
+                            listOf(identical, identical, differsInGroup, differsInRoom)
+                        )
+                    )
+                )
+            )
+        )
+
+        val result = schedule.daysForTeacher("A")
+
+        val lessons = result[0].intervals[0].lessons
+        assertEquals(3, lessons.size)
+        assertEquals(1, lessons.count { it == identical })
+        assertEquals(1, lessons.count { it.room == "4-302" && it.group == "ИВТб-3304-01-00" })
+        assertTrue(lessons.any { it.group == "ИВТб-3304-02-00" })
+        assertTrue(lessons.any { it.room == "5-102" })
+    }
+
+    private fun slotOf(lesson: Lesson) =
+        TimeSlot(LocalTime.of(8, 20), LocalTime.of(9, 50), listOf(lesson))
+
+    private fun lesson(
+        room: String,
+        group: String = "ИВТб-3304-01-00",
+        teacher: String,
+        raw: String = "$room Программирование Лекция $group",
+        subject: String = "Программирование"
+    ) = Lesson(
+        raw = raw,
+        room = room,
+        group = group,
+        subject = subject,
+        type = LessonType.LECTURE,
+        teacher = teacher
+    )
+}

app/src/test/java/agzam/vyatsu/TeacherScheduleParserTest.kt

@@ -0,0 +1,86 @@
+package agzam.vyatsu
+
+import agzam.vyatsu.data.remote.TeacherScheduleParser
+import agzam.vyatsu.domain.model.LessonType
+import java.time.LocalDate
+import java.time.LocalTime
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class TeacherScheduleParserTest {
+
+    private fun fixture(): String =
+        checkNotNull(javaClass.getResourceAsStream("/prepod.html"))
+            .readBytes().toString(Charsets.UTF_8)
+
+    @Test
+    fun teachersHeaderParsedInOrderAndDeduped() {
+        val parsed = TeacherScheduleParser.parse(fixture())
+        assertEquals(listOf("Лелекова Е.В.", "Иванов И.И.", "Петрова А.С."), parsed.teachers)
+    }
+
+    @Test
+    fun daysWithCorrectDates() {
+        val parsed = TeacherScheduleParser.parse(fixture())
+        assertEquals(2, parsed.days.size)
+        assertEquals(LocalDate.of(2026, 9, 14), parsed.days[0].date)
+        assertEquals(LocalDate.of(2026, 9, 15), parsed.days[1].date)
+    }
+
+    @Test
+    fun intervalTimesParsed() {
+        val parsed = TeacherScheduleParser.parse(fixture())
+        val day0 = parsed.days[0]
+        assertEquals(2, day0.intervals.size)
+        assertEquals(LocalTime.of(8, 20), day0.intervals[0].start)
+        assertEquals(LocalTime.of(9, 50), day0.intervals[0].end)
+        assertEquals(LocalTime.of(10, 0), day0.intervals[1].start)
+        assertEquals(LocalTime.of(11, 30), day0.intervals[1].end)
+    }
+
+    @Test
+    fun multiGroupCellSplitsIntoPerGroupLessons() {
+        val parsed = TeacherScheduleParser.parse(fixture())
+        val cell = parsed.days[0].intervals[0].lessons.filter { it.teacher == "Лелекова Е.В." }
+        assertEquals(2, cell.size)
+        val lesson0 = cell[0]
+        val lesson1 = cell[1]
+        assertEquals("Бб-1101-04-00", lesson0.group)
+        assertNull(lesson0.subgroup)
+        assertEquals("01 подгруппа", lesson1.subgroup)
+        assertEquals("4-302", lesson0.room)
+        assertEquals("Биоразнообразие", lesson0.subject)
+        assertEquals(LessonType.LECTURE, lesson0.type)
+        assertEquals("Лелекова Е.В.", lesson0.teacher)
+    }
+
+    @Test
+    fun emptyCellContributesNoLesson() {
+        val parsed = TeacherScheduleParser.parse(fixture())
+        val threeSlots = (0..6).map { slot ->
+            parsed.days[0].intervals.firstOrNull { it.start.hour == 8 && it.start.minute == 20 } ?: return@map true
+        }
+        val petrovLessons = parsed.days[0].intervals[0].lessons.filter { it.teacher == "Петрова А.С." }
+        assertEquals(0, petrovLessons.size)
+        assertTrue(threeSlots.isEmpty() || threeSlots.size == 7)
+    }
+
+    @Test
+    fun noRoomCellKeepsRawAndNullRoom() {
+        val parsed = TeacherScheduleParser.parse(fixture())
+        val cell = parsed.days[0].intervals[1].lessons.filter { it.teacher == "Лелекова Е.В." }
+        assertEquals(2, cell.size)
+        assertNull(cell[0].room)
+        assertTrue(cell[0].raw.contains("Бб-1101-04-00"))
+        assertNull(cell[0].subject)
+    }
+
+    @Test
+    fun exactTotalLessonCount() {
+        val parsed = TeacherScheduleParser.parse(fixture())
+        val total = parsed.days.sumOf { day -> day.intervals.sumOf { it.lessons.size } }
+        assertEquals(11, total)
+    }
+}

app/src/test/java/agzam/vyatsu/TeachersPipelineMemoryTest.kt

@@ -0,0 +1,76 @@
+package agzam.vyatsu
+
+import agzam.vyatsu.data.remote.TeachersParser
+import agzam.vyatsu.domain.model.DateRange
+import agzam.vyatsu.domain.model.Season
+import java.io.InputStream
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class TeachersPipelineMemoryTest {
+
+    private fun fixture(): InputStream =
+        checkNotNull(javaClass.getResourceAsStream("/teacher.html")) {
+            "Fixture teacher.html not found in src/test/resources"
+        }
+
+    @Test
+    fun parsesDepartmentsAndFaculties() {
+        val result = fixture().use(TeachersParser::parseStream)
+        assertTrue("expected >=4 departments", result.departments.size >= 4)
+
+        val ids = result.departments.map { it.departmentId }.toSet()
+        assertEquals(setOf("11111", "22222", "33333", "44444"), ids)
+
+        val names = result.departments.map { it.name }
+        assertTrue(
+            "nested tags must be stripped from kafPeriod names",
+            names.contains("Кафедра технологий и конструирования машин и аппаратов")
+        )
+
+        val avt = result.departments.first { it.departmentId == "11111" }
+        assertTrue("faculty must be mapped via shortname", avt.faculty.contains("ФАВТ"))
+    }
+
+    @Test
+    fun chunkBoundarySafe() {
+        val full = fixture().use(TeachersParser::parseStream)
+        val limited = limitReads(fixture(), 64).use(TeachersParser::parseStream)
+        assertEquals(full, limited)
+    }
+
+    @Test
+    fun seasonAndRanges() {
+        val result = fixture().use(TeachersParser::parseStream)
+
+        val hasAutumn = result.dateRanges.values.any { it[Season.AUTUMN]?.isNotEmpty() == true }
+        val hasSpring = result.dateRanges.values.any { it[Season.SPRING]?.isNotEmpty() == true }
+        assertTrue("AUTUMN season must be present", hasAutumn)
+        assertTrue("SPRING season must be present", hasSpring)
+
+        val autumn = result.dateRanges["11111"]?.get(Season.AUTUMN).orEmpty()
+        assertTrue(
+            "DateRange must be parsed from URL groups",
+            autumn.contains(DateRange("01092026", "13092026"))
+        )
+        assertTrue(
+            "second AUTUMN range must be present",
+            autumn.contains(DateRange("14092026", "27092026"))
+        )
+
+        val spring = result.dateRanges["44444"]?.get(Season.SPRING).orEmpty()
+        assertTrue(
+            "SPRING DateRange must be parsed from URL groups",
+            spring.contains(DateRange("02022026", "27022026"))
+        )
+    }
+
+    private fun limitReads(input: InputStream, maxBytes: Int): InputStream =
+        object : InputStream() {
+            override fun read(): Int = input.read()
+
+            override fun read(b: ByteArray, off: Int, len: Int): Int =
+                input.read(b, off, minOf(len, maxBytes))
+        }
+}

app/src/test/resources/prepod.html

@@ -0,0 +1,102 @@
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+<body>
+<TABLE>
+<TR>
+<TD><SPAN>День</SPAN></TD>
+<TD><SPAN>Интервал</SPAN></TD>
+<TD><SPAN>Лелекова Е.В.</SPAN></TD>
+<TD><SPAN>Иванов И.И.</SPAN></TD>
+<TD><SPAN>Петрова А.С.</SPAN></TD>
+</TR>
+<TR>
+<TD ROWSPAN=7><SPAN>понедельник 14.09.26</SPAN></TD>
+<TD><SPAN>08:20-09:50</SPAN></TD>
+<TD><SPAN>4-302 Биоразнообразие Лекция Бб-1101-04-00 Бб-1101-04-00, 01 подгруппа</SPAN></TD>
+<TD><SPAN>4-308 Методика познания (учитель биологии) Практическое занятие ПОДб-4701-08-00</SPAN></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD><SPAN>10:00-11:30</SPAN></TD>
+<TD><SPAN>Бб-1101-04-00 Бб-1101-04-00, 01 подгруппа</SPAN></TD>
+<TD><SPAN>Методическое совещание</SPAN></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD><SPAN>12:00-13:30</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD><SPAN>14:00-15:30</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD><SPAN>15:40-17:10</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD><SPAN>17:15-18:45</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD><SPAN>18:55-20:25</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD ROWSPAN=7><SPAN>вторник 15.09.26</SPAN></TD>
+<TD><SPAN>08:20-09:50</SPAN></TD>
+<TD><SPAN>4-507 Биоразнообразие Лабораторная работа Бб-1102-04-00 Бб-1102-04-00, 01 подгруппа</SPAN></TD>
+<TD></TD>
+<TD><SPAN>1-116 Статистическая обработка экспериментальных данных Практическое занятие БТб-2101-03-00 БТб-2101-03-00, 02 подгруппа</SPAN></TD>
+</TR>
+<TR>
+<TD><SPAN>10:00-11:30</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD><SPAN>4-402a Фиторесурсы Лекция Бм-2102-03-00</SPAN></TD>
+</TR>
+<TR>
+<TD><SPAN>12:00-13:30</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD><SPAN>14:00-15:30</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD><SPAN>15:40-17:10</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD><SPAN>17:15-18:45</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD></TD>
+</TR>
+<TR>
+<TD><SPAN>18:55-20:25</SPAN></TD>
+<TD></TD>
+<TD></TD>
+<TD></TD>
+</TR>
+</TABLE>
+</body>
+</html>

app/src/test/resources/teacher.html

@@ -0,0 +1,90 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="content-language" content="ru">
+	<title>Расписание занятий преподавателей - Официальный сайт ВятГУ</title>
+</head>
+<body>
+<div id="headerEduPrograms">
+	<div class="block-content">
+		<h2>Планируемое расписание занятий преподавателей</h2>
+		<div class="fak_name" data-fak_id="fak_avt_41"><span>Факультет автоматики</span> и вычислительной техники (ОРУ)</div>
+		<div class="block-content" id="fak_avt_41" style="display: none;">
+			<table>
+				<tbody>
+					<tr>
+						<td>
+							<div 
+								class="kafPeriod"
+								data-kaf_period_id="111111" 
+							>
+								Кафедра алгоритмов и программ	                            </div>
+							<div 
+								class="listPeriod"
+								id="listPeriod_111111" 
+								style="display: none;"
+							>
+								<a target="_blank" href="/reports/schedule/prepod/11111_1_01092026_13092026.html">с 01 09 2026 по 13 09 2026</a>
+								<br/>
+								<a target="_blank" href="/reports/schedule/prepod/11111_1_14092026_27092026.html">с 14 09 2026 по 27 09 2026</a>
+								<br/>
+							</div>
+						</td>
+						<td>
+							<div 
+								class="kafPeriod"
+								data-kaf_period_id="222221" 
+							>
+								Кафедра <b>технологий и конструирования</b> машин и аппаратов                            </div>
+							<div 
+								class="listPeriod"
+								id="listPeriod_222221" 
+								style="display: none;"
+							>
+							</div>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+		<div class="fak_name" data-fak_id="fak_phil_21"><b>Философский</b> факультет</div>
+		<div class="block-content" id="fak_phil_21" style="display: none;">
+			<table>
+				<tbody>
+					<tr>
+						<td>
+							<div class="kafPeriod" data-kaf_period_id="333331">
+								Кафедра философии                            </div>
+							<div 
+								class="listPeriod"
+								id="listPeriod_333331" 
+								style="display: none;"
+							>
+								<a target="_blank" href="/reports/schedule/prepod/33333_1_01092026_13092026.html">с 01 09 2026 по 13 09 2026</a>
+								<br/>
+								<a target="_blank" href="/reports/schedule/prepod/33333_1_14092026_27092026.html">с 14 09 2026 по 27 09 2026</a>
+								<br/>
+							</div>
+						</td>
+						<td>
+							<div 
+								class="kafPeriod"
+								data-kaf_period_id="444441" 
+							>
+								Кафедра логики и методологии науки                            </div>
+							<div 
+								class="listPeriod"
+								id="listPeriod_444441" 
+								style="display: none;"
+							>
+								<a target="_blank" href="/reports/schedule/prepod/44444_2_02022026_27022026.html">с 02 02 2027 по 27 02 2026</a>
+								<br/>
+							</div>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+</body>
+</html>