wip: group highlight

app/src/main/AndroidManifest.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2025 Gleb Zaharov. License: GPLv3 (see LICENSE). -->
+<!-- Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE). -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:name=".UNNApp"
+        android:name=".app.UNNApp"
         android:allowBackup="true"
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
@@ -45,11 +46,11 @@
             android:value="0.1" />
 
         <activity
-            android:name=".ui.layout.MainActivity"
+            android:name=".app.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.UNN" />
         <activity
-            android:name=".ui.layout.LoginActivity"
+            android:name=".app.LoginActivity"
             android:exported="true"
             android:theme="@style/Theme.UNN">
             <intent-filter>

app/src/main/java/ru/sweetbread/unn/app/LoginActivity.kt

@@ -1,6 +1,6 @@
 // Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
 
-package ru.sweetbread.unn.ui.layout
+package ru.sweetbread.unn.app
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -38,9 +38,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import ru.sweetbread.unn.R
-import ru.sweetbread.unn.UNNApp
 import ru.sweetbread.unn.core.AuthRepository
 import ru.sweetbread.unn.ui.theme.UNNTheme
 import splitties.activities.start
@@ -52,12 +50,10 @@ class LoginActivity : ComponentActivity() {
 
         val authRepo = (application as UNNApp).container.authRepo
 
-
+        if (authRepo.hasSavedCredentials()) {
-        runBlocking {
-            if (authRepo.restoreSession()) {
             start<MainActivity>()
             finish()
-            }
+            return
         }
 
         setContent {
@@ -163,11 +159,3 @@ fun LoginPanel(
         }
     }
 }
-
-//@Preview(showBackground = true)
-//@Composable
-//fun LoginPreview() {
-//    UNNTheme {
-//        LoginPanel(ok = { _, _ -> }, error = {})
-//    }
-//}

app/src/main/java/ru/sweetbread/unn/app/MainActivity.kt

@@ -1,7 +1,10 @@
 // Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
 
-package ru.sweetbread.unn.ui.layout
+package ru.sweetbread.unn.app
 
+import android.content.Intent
+import android.net.ConnectivityManager
+import android.net.Network
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -52,24 +55,33 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.core.view.WindowCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import coil3.compose.AsyncImage
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import ru.sweetbread.unn.R
-import ru.sweetbread.unn.UNNApp
+import ru.sweetbread.unn.core.network.LoginResult
 import ru.sweetbread.unn.core.network.portalURL
+import ru.sweetbread.unn.feature.About
 import ru.sweetbread.unn.feature.news.Blogposts
 import ru.sweetbread.unn.feature.schedule.Schedule
-import ru.sweetbread.unn.ui.composes.About
 import ru.sweetbread.unn.ui.theme.UNNTheme
 import splitties.resources.appStr
 import splitties.toast.toast
 
 class MainActivity : ComponentActivity() {
+    private lateinit var connectivityManager: ConnectivityManager
+    private var restoreSessionJob: Job? = null
+    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
+        override fun onAvailable(network: Network) {
+            restoreSavedSession()
+        }
+    }
 
     @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -77,9 +89,21 @@ class MainActivity : ComponentActivity() {
 
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
+        val authRepo = (application as UNNApp).container.authRepo
+        lifecycleScope.launch {
+            authRepo.authenticationFailures.collect {
+                openLogin()
+            }
+        }
+        connectivityManager = getSystemService(ConnectivityManager::class.java)
+        restoreSavedSession()
+
         setContent {
             UNNTheme {
-                Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
                     val navController = rememberNavController()
                     val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
                     val scope = rememberCoroutineScope()
@@ -176,7 +200,6 @@ class MainActivity : ComponentActivity() {
                             Box(Modifier.padding(innerPadding)) {
                                 NavHost(navController, startDestination = "journal/schedule") {
                                     composable("portal/blogposts") {
-//                                        Text("Not implemented")
                                         Blogposts()
                                     }
                                     composable("journal/schedule") {
@@ -194,6 +217,44 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        connectivityManager.registerDefaultNetworkCallback(networkCallback)
+    }
+
+    override fun onStop() {
+        connectivityManager.unregisterNetworkCallback(networkCallback)
+        super.onStop()
+    }
+
+    private fun restoreSavedSession() {
+        val container = (application as UNNApp).container
+
+        if (
+            container.sessionManager.sessionId != null ||
+            restoreSessionJob?.isActive == true
+        ) {
+            return
+        }
+
+        restoreSessionJob = lifecycleScope.launch {
+            if (container.authRepo.restoreSession() == LoginResult.InvalidCredentials) {
+                openLogin()
+            }
+        }
+    }
+
+    private fun openLogin() {
+        if (isFinishing) return
+
+        startActivity(
+            Intent(this, LoginActivity::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+            }
+        )
+        finish()
+    }
+
     @Composable
     fun DrawerContent(modifier: Modifier = Modifier, navController: NavController) {
         val me = (application as UNNApp).container.sessionManager.user.collectAsState().value

app/src/main/java/ru/sweetbread/unn/app/UNNApp.kt

@@ -1,15 +1,17 @@
 // Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
 
-package ru.sweetbread.unn
+package ru.sweetbread.unn.app
 
 import android.app.Application
 import android.content.Context
 import ru.sweetbread.unn.core.AuthRepository
 import ru.sweetbread.unn.core.CredentialsStore
 import ru.sweetbread.unn.core.SessionManager
+import ru.sweetbread.unn.core.db.AppDatabase
+import ru.sweetbread.unn.core.network.LoginResult
 import ru.sweetbread.unn.core.network.PortalApi
+import ru.sweetbread.unn.core.network.SessionRefreshHandler
 import ru.sweetbread.unn.core.network.createHttpClient
-import ru.sweetbread.unn.db.AppDatabase
 import ru.sweetbread.unn.feature.news.NewsRepository
 import ru.sweetbread.unn.feature.profile.UserRepository
 import ru.sweetbread.unn.feature.schedule.ScheduleRepository
@@ -33,8 +35,9 @@ class UNNApp : Application() {
 class AppContainer(context: Context) {
     val credentialsStore = CredentialsStore(context)
     val sessionManager = SessionManager()
+    val sessionRefreshHandler = SessionRefreshHandler()
 
-    val httpClient = createHttpClient()
+    val httpClient = createHttpClient(sessionRefreshHandler)
 
     val portalApi = PortalApi(
         client = httpClient,
@@ -43,6 +46,12 @@ class AppContainer(context: Context) {
 
     val authRepo = AuthRepository(credentialsStore, portalApi)
 
+    init {
+        sessionRefreshHandler.setRefreshAction {
+            authRepo.restoreSession() == LoginResult.Success
+        }
+    }
+
     val database = roomDb<AppDatabase>(name = "cache") {
         fallbackToDestructiveMigration(dropAllTables = true)
     }
@@ -60,6 +69,5 @@ class AppContainer(context: Context) {
     val scheduleRepository = ScheduleRepository(
         api = portalApi,
         db = database,
-        session = sessionManager
     )
 }

app/src/main/java/ru/sweetbread/unn/core/AuthRepository.kt

@@ -2,8 +2,10 @@
 
 package ru.sweetbread.unn.core
 
-import android.util.Log
+import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.io.IOException
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import ru.sweetbread.unn.core.network.LoginResult
 import ru.sweetbread.unn.core.network.PortalApi
 
@@ -11,6 +13,10 @@ class AuthRepository(
     private val credentialsStore: CredentialsStore,
     private val api: PortalApi
 ) {
+    private val restoreMutex = Mutex()
+    private val _authenticationFailures = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    val authenticationFailures = _authenticationFailures.asSharedFlow()
+
     suspend fun login(
         login: String,
         password: String
@@ -26,21 +32,22 @@ class AuthRepository(
         return res
     }
 
-    suspend fun restoreSession(): Boolean {
+    fun hasSavedCredentials(): Boolean = credentialsStore.get() != null
-        val credentials =
-            credentialsStore.get()
-                ?: return false
 
-        return try {
+    suspend fun restoreSession(): LoginResult? = restoreMutex.withLock {
-            val res = api.login(
+        val credentials = credentialsStore.get() ?: return@withLock null
+
+        val result = api.login(
             credentials.login,
             credentials.password
         )
 
-            res != LoginResult.InvalidCredentials
+        if (result == LoginResult.InvalidCredentials) {
-        } catch (e: IOException) {
+            credentialsStore.clear()
-            Log.e("AuthRepo", "restoreSession error", e)
+            api.session.clear()
-            false
+            _authenticationFailures.emit(Unit)
         }
+
+        result
     }
 }

app/src/main/java/ru/sweetbread/unn/core/CredentialsStore.kt

@@ -7,6 +7,7 @@ import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import android.util.Base64
 import androidx.core.content.edit
+import java.security.GeneralSecurityException
 import java.security.KeyStore
 import javax.crypto.Cipher
 import javax.crypto.KeyGenerator
@@ -97,6 +98,7 @@ class CredentialsStore(
     }
 
     fun get(): Credentials? {
+        return try {
             val encryptedString =
                 prefs.getString("data", null)
                     ?: return null
@@ -130,12 +132,18 @@ class CredentialsStore(
             val parts = plainText.split('\u0000', limit = 2)
 
             if (parts.size != 2)
-            return null
+                null
-
+            else Credentials(
-        return Credentials(
                 login = parts[0],
                 password = parts[1]
             )
+        } catch (_: GeneralSecurityException) {
+            clear()
+            null
+        } catch (_: IllegalArgumentException) {
+            clear()
+            null
+        }
     }
 
     fun clear() {

app/src/main/java/ru/sweetbread/unn/core/db/DB.kt

@@ -1,11 +1,24 @@
 // Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
 
-package ru.sweetbread.unn.db
+package ru.sweetbread.unn.core.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import ru.sweetbread.unn.core.db.NewsDao
+import ru.sweetbread.unn.core.db.dao.AuditoriumDao
+import ru.sweetbread.unn.core.db.dao.BuildingDao
+import ru.sweetbread.unn.core.db.dao.DisciplineDao
+import ru.sweetbread.unn.core.db.dao.KindOfWorkDao
+import ru.sweetbread.unn.core.db.dao.LecturerDao
+import ru.sweetbread.unn.core.db.dao.NewsDao
+import ru.sweetbread.unn.core.db.dao.ScheduleItemDao
+import ru.sweetbread.unn.core.db.dao.UserDao
+import ru.sweetbread.unn.core.db.entity.AuditoriumDB
+import ru.sweetbread.unn.core.db.entity.BuildingDB
+import ru.sweetbread.unn.core.db.entity.DisciplineDB
+import ru.sweetbread.unn.core.db.entity.KindOfWorkDB
+import ru.sweetbread.unn.core.db.entity.LecturerDB
 import ru.sweetbread.unn.core.db.entity.NewsDB
+import ru.sweetbread.unn.core.db.entity.ScheduleUnitDB
 import ru.sweetbread.unn.core.db.entity.UserDB
 
 @Database(entities = [

app/src/main/java/ru/sweetbread/unn/core/db/dao/AuditoriumDao.kt

@@ -0,0 +1,22 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import ru.sweetbread.unn.core.db.entity.AuditoriumDB
+
+@Dao
+interface AuditoriumDao {
+    @Query("SELECT * FROM auditoriumdb WHERE oid = :oid LIMIT 1")
+    suspend fun get(oid: Int): AuditoriumDB?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(auditoriums: List<AuditoriumDB>)
+
+    @Delete
+    fun delete(auditorium: AuditoriumDB)
+}

app/src/main/java/ru/sweetbread/unn/core/db/dao/BuildingDao.kt

@@ -0,0 +1,22 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import ru.sweetbread.unn.core.db.entity.BuildingDB
+
+@Dao
+interface BuildingDao {
+    @Query("SELECT * FROM buildingdb WHERE oid = :oid LIMIT 1")
+    suspend fun get(oid: Int): BuildingDB?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(buildings: List<BuildingDB>)
+
+    @Delete
+    fun delete(building: BuildingDB)
+}

app/src/main/java/ru/sweetbread/unn/core/db/dao/DisciplineDao.kt

@@ -0,0 +1,22 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import ru.sweetbread.unn.core.db.entity.DisciplineDB
+
+@Dao
+interface DisciplineDao {
+    @Query("SELECT * FROM disciplinedb WHERE oid = :oid LIMIT 1")
+    suspend fun get(oid: Int): DisciplineDB?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(disciplines: List<DisciplineDB>)
+
+    @Delete
+    fun delete(discipline: DisciplineDB)
+}

app/src/main/java/ru/sweetbread/unn/core/db/dao/KindOfWorkDao.kt

@@ -0,0 +1,22 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import ru.sweetbread.unn.core.db.entity.KindOfWorkDB
+
+@Dao
+interface KindOfWorkDao {
+    @Query("SELECT * FROM kindofworkdb WHERE oid = :oid LIMIT 1")
+    suspend fun get(oid: Int): KindOfWorkDB?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(kindOfWork: List<KindOfWorkDB>)
+
+    @Delete
+    fun delete(kindOfWork: KindOfWorkDB)
+}

app/src/main/java/ru/sweetbread/unn/core/db/dao/LecturerDao.kt

@@ -0,0 +1,22 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import ru.sweetbread.unn.core.db.entity.LecturerDB
+
+@Dao
+interface LecturerDao {
+    @Query("SELECT * FROM lecturerdb WHERE unnId = :unnId LIMIT 1")
+    suspend fun get(unnId: Int): LecturerDB?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(lecturers: List<LecturerDB>)
+
+    @Delete
+    fun delete(lecturer: LecturerDB)
+}

app/src/main/java/ru/sweetbread/unn/core/db/dao/NewsDao.kt

@@ -1,6 +1,6 @@
 // Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
 
-package ru.sweetbread.unn.core.db
+package ru.sweetbread.unn.core.db.dao
 
 import androidx.paging.PagingSource
 import androidx.room.Dao
@@ -22,6 +22,9 @@ interface NewsDao {
     @Query("SELECT * FROM newsDB ORDER BY `publishedAt` DESC")
     fun paging(): PagingSource<Int, NewsDB>
 
+    @Query("DELETE FROM newsDB")
+    suspend fun clear()
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(news: List<NewsDB>)
 

app/src/main/java/ru/sweetbread/unn/core/db/dao/ScheduleItemDao.kt

@@ -0,0 +1,38 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+import ru.sweetbread.unn.core.db.entity.ScheduleUnitDB
+
+@Dao
+interface ScheduleItemDao {
+    @Query("SELECT * FROM scheduleUnitDB WHERE oid = :oid LIMIT 1")
+    suspend fun getSchedule(oid: Int): ScheduleUnitDB?
+
+    @Query("SELECT * FROM scheduleUnitDB WHERE date = :date ORDER BY `begin`")
+    suspend fun getSchedule(date: String): List<ScheduleUnitDB>
+
+    @Query("SELECT * FROM scheduleUnitDB WHERE date = :date ORDER BY `begin`")
+    fun getScheduleFlow(date: String): Flow<List<ScheduleUnitDB>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(units: List<ScheduleUnitDB>)
+
+    @Delete
+    suspend fun delete(unit: ScheduleUnitDB)
+
+    @Query("DELETE FROM scheduleUnitDB WHERE date = :date")
+    suspend fun deleteByDate(date: String)
+
+    @Query("SELECT * FROM scheduleUnitDB WHERE date = :date ORDER BY `begin`")
+    fun observe(date: String): Flow<List<ScheduleUnitDB>>
+
+    @Query("SELECT * FROM scheduleUnitDB")
+    suspend fun getAll(): List<ScheduleUnitDB>
+}

app/src/main/java/ru/sweetbread/unn/core/db/dao/UserDao.kt

@@ -0,0 +1,21 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import ru.sweetbread.unn.core.db.entity.UserDB
+
+@Dao
+interface UserDao {
+    @Query("SELECT * FROM userDB WHERE userId = :userId LIMIT 1")
+    suspend fun get(userId: Int): UserDB?
+
+    @Insert
+    suspend fun insert(user: UserDB)
+
+    @Delete
+    fun delete(user: UserDB)
+}

app/src/main/java/ru/sweetbread/unn/core/db/entity/Auditorium.kt

@@ -0,0 +1,51 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import androidx.room.withTransaction
+import ru.sweetbread.unn.core.db.AppDatabase
+import ru.sweetbread.unn.model.Auditorium
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+@Entity
+data class AuditoriumDB(
+    @PrimaryKey val oid: Int,
+    @ColumnInfo val name: String,
+    @ColumnInfo val floor: Int?,
+    @ColumnInfo val buildingOid: Int,
+    @ColumnInfo val updatedAt: String
+)
+
+
+suspend fun AuditoriumDB.toModel(db: AppDatabase): Auditorium? {
+    return Auditorium(
+        name,
+        oid,
+        floor ?: 0,
+        db.buildingDao().get(buildingOid)?.toModel() ?: return null
+    )
+}
+
+fun Auditorium.toEntity() = AuditoriumDB(
+    oid,
+    name,
+    floor,
+    building.oid,
+    LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)
+)
+
+suspend fun cacheAuditorium(db: AppDatabase, auditoriums: List<Auditorium>) {
+    db.withTransaction {
+        db.buildingDao().insert(
+            auditoriums.map { it.building }.map { it.toEntity() }
+        )
+
+        db.auditoriumDao().insert(
+            auditoriums.map { it.toEntity() }
+        )
+    }
+}

app/src/main/java/ru/sweetbread/unn/core/db/entity/Building.kt

@@ -0,0 +1,21 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import ru.sweetbread.unn.model.Building
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+@Entity
+data class BuildingDB(
+    @PrimaryKey val oid: Int,
+    @ColumnInfo val name: String,
+    @ColumnInfo val gid: Int,
+    @ColumnInfo val updatedAt: String
+)
+
+fun BuildingDB.toModel() = Building(name, gid, oid)
+fun Building.toEntity() = BuildingDB(oid, name, gid, LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))

app/src/main/java/ru/sweetbread/unn/core/db/entity/Discipline.kt

@@ -0,0 +1,22 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import ru.sweetbread.unn.model.Discipline
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+@Entity
+data class DisciplineDB(
+    @PrimaryKey val oid: Int,
+    @ColumnInfo val name: String,
+    @ColumnInfo val type: Int,
+    @ColumnInfo val updatedAt: String
+)
+
+fun DisciplineDB.toModel() = Discipline(name, oid, type)
+fun Discipline.toEntity() = DisciplineDB(oid, name, type, LocalDateTime.now().format(
+    DateTimeFormatter.ISO_DATE_TIME))

app/src/main/java/ru/sweetbread/unn/core/db/entity/KindOfWork.kt

@@ -0,0 +1,28 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import ru.sweetbread.unn.model.KindOfWork
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+@Entity
+data class KindOfWorkDB(
+    @PrimaryKey val oid: Int,
+    @ColumnInfo val name: String,
+    @ColumnInfo val uid: String,
+    @ColumnInfo val complexity: Int,
+    @ColumnInfo val updatedAt: String
+)
+
+fun KindOfWorkDB.toModel() = KindOfWork(name, oid, uid, complexity)
+fun KindOfWork.toEntity() = KindOfWorkDB(
+    oid,
+    name,
+    uid,
+    complexity,
+    LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)
+)

app/src/main/java/ru/sweetbread/unn/core/db/entity/Lecturer.kt

@@ -0,0 +1,31 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import ru.sweetbread.unn.model.Lecturer
+import ru.sweetbread.unn.model.LecturerRank
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+@Entity
+data class LecturerDB(
+    @PrimaryKey val unnId: Int,
+    @ColumnInfo val name: String,
+    @ColumnInfo val rank: LecturerRank,
+    @ColumnInfo val email: String,
+    @ColumnInfo val uid: String,
+    @ColumnInfo val updatedAt: String
+)
+
+fun LecturerDB.toModel() = Lecturer(name, rank, email, unnId, uid)
+fun Lecturer.toEntity() = LecturerDB(
+    unnId,
+    name,
+    rank,
+    email,
+    uid,
+    LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)
+)

app/src/main/java/ru/sweetbread/unn/core/db/entity/News.kt

@@ -18,6 +18,7 @@ data class NewsDB(
     @ColumnInfo val authorId: Int
 )
 
+
 suspend fun NewsDB.toModel(userRepo: UserRepository): News = News(
     id,
     LocalDateTime.parse(publishedAt, DateTimeFormatter.ISO_DATE_TIME),

app/src/main/java/ru/sweetbread/unn/core/db/entity/ScheduleUnit.kt

@@ -0,0 +1,70 @@
+// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
+
+package ru.sweetbread.unn.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import androidx.room.withTransaction
+import ru.sweetbread.unn.core.db.AppDatabase
+import ru.sweetbread.unn.model.ScheduleUnit
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+
+@Entity
+data class ScheduleUnitDB(
+    @PrimaryKey val oid: Int,
+    @ColumnInfo val date: String,
+    @ColumnInfo val stream: String,
+    @ColumnInfo val begin: String,
+    @ColumnInfo val end: String,
+
+    @ColumnInfo val auditoriumOid: Int,
+    @ColumnInfo val disciplineOid: Int,
+    @ColumnInfo val kindOfWorkOid: Int,
+    @ColumnInfo val lecturersId: String,
+
+    @ColumnInfo val updatedAt: String
+)
+
+
+suspend fun ScheduleUnitDB.toModel(db: AppDatabase): ScheduleUnit? {
+    return ScheduleUnit(
+        oid,
+        db.auditoriumDao().get(auditoriumOid)?.toModel(db) ?: return null,
+        LocalDate.parse(date, DateTimeFormatter.ISO_DATE),
+        db.disciplineDao().get(disciplineOid)?.toModel() ?: return null,
+        db.kindOfWorkDao().get(kindOfWorkOid)?.toModel() ?: return null,
+        lecturersId.split(",").map { db.lecturerDao().get(it.toInt())?.toModel() ?: return null },
+        stream,
+        LocalTime.parse(begin, DateTimeFormatter.ISO_TIME),
+        LocalTime.parse(end, DateTimeFormatter.ISO_TIME),
+        LocalDateTime.parse(updatedAt, DateTimeFormatter.ISO_DATE_TIME),
+    )
+}
+
+fun ScheduleUnit.toEntity() = ScheduleUnitDB(
+    oid,
+    date.format(DateTimeFormatter.ISO_DATE),
+    stream,
+    begin.format(DateTimeFormatter.ISO_TIME),
+    end.format(DateTimeFormatter.ISO_TIME),
+    auditorium.oid,
+    discipline.oid,
+    kindOfWork.oid,
+    lecturers.map { it.unnId }.joinToString(","),
+    LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)
+)
+
+
+suspend fun cacheSchedule(db: AppDatabase, units: List<ScheduleUnit>) {
+    db.withTransaction {
+        cacheAuditorium(db, units.map { it.auditorium })
+        db.disciplineDao().insert(units.map { it.discipline.toEntity() })
+        db.kindOfWorkDao().insert(units.map { it.kindOfWork.toEntity() })
+        db.lecturerDao().insert(units.flatMap { it.lecturers }.map { it.toEntity() })
+        db.scheduleDao().insert(units.map { it.toEntity() })
+    }
+}

app/src/main/java/ru/sweetbread/unn/core/db/entity/User.kt

@@ -6,7 +6,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import io.ktor.util.reflect.instanceOf
-import ru.sweetbread.unn.api.AvatarSet
+import ru.sweetbread.unn.model.AvatarSet
 import ru.sweetbread.unn.model.Student
 import ru.sweetbread.unn.model.Type
 import ru.sweetbread.unn.model.User
@@ -29,6 +29,7 @@ data class UserDB(
     @ColumnInfo val updatedAt: String
 )
 
+
 fun User.toEntity(): UserDB = UserDB(
     userId,
     if (this.instanceOf(Student::class)) (this as Student).uns else null,
@@ -45,7 +46,7 @@ fun User.toEntity(): UserDB = UserDB(
 )
 
 fun UserDB.toModel(): User {
-    var user = User(
+    val user = User(
         userId,
         type,
         email,

app/src/main/java/ru/sweetbread/unn/core/network/PortalAPI.kt

@@ -11,9 +11,9 @@ class PortalApi (
     val client: HttpClient,
     val session: SessionManager
 ) {
-    public val auth = Auth(client, session)
+    public val auth = Auth(client)
     public val ruzapi = Ruzapi(client, session)
-    public val bitrix = Bitrix(client, session)
+    public val bitrix = Bitrix(client)
 
     /**
      * Authorize user by [login] and [password]
@@ -40,60 +40,6 @@ class PortalApi (
             LoginResult.NetworkError
         }
     }
-
-//    /**
-//     * Save info about current [User] in memory
-//     */
-//    private suspend fun getMyself(login: String): User = coroutineScope {
-//        val idDeferred = async { getId(login) }
-//        val userDeferred = async { getUser() }
-//
-//        val id = idDeferred.await()
-//        val user = userDeferred.await()
-//
-//        return@coroutineScope User(
-//            bx_id = null,
-//            ra_id = null,
-//            type = Type.student,
-//            email = user.email,
-//            nameRu = user.nameRu,
-//            nameEn = user.nameEn,
-//            isMale = user.isMale,
-//            birthday = user.birthday,
-//            avatar = user.avatar
-//        )
-//    }
-
-
-
-//    suspend fun getScheduleDay(
-//        date: LocalDate,
-//        type: Type = session.user.value!!.type,
-//        id: Int = ME.unnId!!
-//    ): List<ScheduleUnit> {
-//        if ((type == ME.type) and (id == ME.unnId!!)) {
-//            val schedule = withContext(Dispatchers.IO) { loadSchedule(date) }
-//            Log.d("Schedule", schedule.joinToString())
-//            if (schedule.isNotEmpty())
-//                return schedule
-//        }
-//
-//        return getSchedule(type, id, date, date)
-//    }
-//
-//    suspend fun getSchedule(
-//        type: Type = ME.type,
-//        id: Int = ME.unnId!!,
-//        start: LocalDate,
-//        finish: LocalDate
-//    ): ArrayList<ScheduleUnit> {
-//        val schedule = downloadSchedule(type, id, start, finish)
-//
-//        if ((type == ME.type) and (id == ME.unnId!!))
-//            cacheSchedule(schedule)
-//
-//        return schedule
-//    }
 }
 
 sealed interface LoginResult {

app/src/main/java/ru/sweetbread/unn/core/network/client.kt

@@ -6,14 +6,37 @@ import android.util.Log
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.android.Android
 import io.ktor.client.plugins.HttpRequestRetry
+import io.ktor.client.plugins.HttpSend
 import io.ktor.client.plugins.HttpTimeout
 import io.ktor.client.plugins.cache.HttpCache
 import io.ktor.client.plugins.cookies.HttpCookies
 import io.ktor.client.plugins.logging.LogLevel
 import io.ktor.client.plugins.logging.Logger
 import io.ktor.client.plugins.logging.Logging
+import io.ktor.client.plugins.plugin
+import io.ktor.client.request.HttpRequestBuilder
+import io.ktor.http.HttpStatusCode
+import io.ktor.util.AttributeKey
 
-fun createHttpClient() = HttpClient(Android) {
+private val SkipSessionRefresh = AttributeKey<Unit>("SkipSessionRefresh")
+private val SessionRefreshAttempted = AttributeKey<Unit>("SessionRefreshAttempted")
+
+fun HttpRequestBuilder.skipSessionRefresh() {
+    attributes.put(SkipSessionRefresh, Unit)
+}
+
+class SessionRefreshHandler {
+    @Volatile
+    private var refresh: suspend () -> Boolean = { false }
+
+    fun setRefreshAction(action: suspend () -> Boolean) {
+        refresh = action
+    }
+
+    suspend fun refreshSession(): Boolean = refresh()
+}
+
+fun createHttpClient(sessionRefreshHandler: SessionRefreshHandler) = HttpClient(Android) {
     install(HttpCache)
     install(HttpCookies)
     install(Logging) {
@@ -34,4 +57,24 @@ fun createHttpClient() = HttpClient(Android) {
             request.headers.append("x-retry-count", retryCount.toString())
         }
     }
+}.apply {
+    plugin(HttpSend).intercept { request ->
+        val call = execute(request)
+
+        if (
+            call.response.status == HttpStatusCode.Forbidden &&
+            request.attributes.getOrNull(SkipSessionRefresh) == null &&
+            request.attributes.getOrNull(SessionRefreshAttempted) == null
+        ) {
+            request.attributes.put(SessionRefreshAttempted, Unit)
+
+            if (sessionRefreshHandler.refreshSession()) {
+                execute(request)
+            } else {
+                call
+            }
+        } else {
+            call
+        }
+    }
 }

app/src/main/java/ru/sweetbread/unn/core/network/endpoints.kt

@@ -11,15 +11,15 @@ import io.ktor.client.statement.bodyAsText
 import io.ktor.http.parameters
 import org.json.JSONArray
 import org.json.JSONObject
-import ru.sweetbread.unn.api.Auditorium
-import ru.sweetbread.unn.api.Building
-import ru.sweetbread.unn.api.Discipline
-import ru.sweetbread.unn.api.KindOfWork
-import ru.sweetbread.unn.api.Lecturer
-import ru.sweetbread.unn.api.LecturerRank
-import ru.sweetbread.unn.api.ScheduleUnit
 import ru.sweetbread.unn.core.SessionManager
+import ru.sweetbread.unn.model.Auditorium
+import ru.sweetbread.unn.model.Building
+import ru.sweetbread.unn.model.Discipline
+import ru.sweetbread.unn.model.KindOfWork
+import ru.sweetbread.unn.model.Lecturer
+import ru.sweetbread.unn.model.LecturerRank
 import ru.sweetbread.unn.model.NewsDto
+import ru.sweetbread.unn.model.ScheduleUnit
 import ru.sweetbread.unn.model.User
 import java.time.LocalDate
 import java.time.LocalDateTime
@@ -37,7 +37,6 @@ const val restURL = "$portalURL/rest"
 
 class Auth (
     val client: HttpClient,
-    val session: SessionManager
 ) {
     /**
      * Get token (phpsessid header) from portal
@@ -51,7 +50,10 @@ class Auth (
                 append("USER_LOGIN", login)
                 append("USER_PASSWORD", password)
             }
-        ) { retry { noRetry() } }
+        ) {
+            retry { noRetry() }
+            skipSessionRefresh()
+        }
 
         if (r.status.value == 302)
             return """PHPSESSID=([\w\d]+)""".toRegex().find(r.headers["Set-Cookie"]!!)!!.groupValues[1]
@@ -181,10 +183,11 @@ class Ruzapi(
 
 class Bitrix(
     val client: HttpClient,
-    val session: SessionManager
 ) {
     suspend fun getCurrentUser(): User {
-        val r = client.get("$vuzapiURL/profile/current")
+        val r = client.get("$vuzapiURL/profile/current") {
+            skipSessionRefresh()
+        }
         return User.fromProfile(JSONObject(r.bodyAsText()))
     }
 
@@ -201,176 +204,3 @@ class Bitrix(
         return NewsDto.fromJsonArray(JSONArray(r.bodyAsText()))
     }
 }
-
-//suspend fun getId(login: String): Int {
-//    return JSONObject(client.get("$ruzapiURL/studentinfo/") {
-//        header("Cookie", "PHPSESSID=${PHPSESSID}")
-//        parameter("uns", login.drop(1))
-//    }.bodyAsText()).getString("id").toInt()
-//}
-//
-//suspend fun getUser(userId: Int? = null): User {
-//    // WARNING: trailing / is important, 'cuz API devs are eating shit
-//    // TODO: make up another way to get unnId: this is not useful for lectures
-//    val json = JSONObject(
-//        client.get("$vuzapiURL/user/${userId ?: ""}") {
-//            header("Cookie", "PHPSESSID=$PHPSESSID")
-//        }.bodyAsText()
-//    )
-//
-//    return User(
-//        unnId = null,
-//        userId = json.getInt("id"),
-//        type = if (json.getJSONArray("profiles").getJSONObject(0)
-//                .getString("type") == "employee"
-//        ) Type.employee else Type.student,
-//        email = json.getString("email"),
-//        nameRu = json.getString("fullname"),
-//        nameEn = json.getString("fullname_en"),
-//        isMale = json.getString("sex") == "M",
-//        birthday = Instant
-//            .parse(json.getString("birthdate"))
-//            .atZone(ZoneId.of("Europe/Moscow"))
-//            .toLocalDate(),
-//        avatar = json.getJSONObject("photo").let {
-//            AvatarSet(
-//                it.getString("orig"),
-//                it.getString("thumbnail"),
-//                it.getString("small"),
-//            )
-//        }
-//    )
-//}
-//
-//suspend fun getProfile
-//
-///**
-// * Fetch schedule from Uni API
-// *
-// * @return [ArrayList] of all [ru.sweetbread.unn.api.ScheduleUnit]s between [start] and [finish]
-// */
-//suspend fun downloadSchedule(
-//    type: Type = ME.type,
-//    id: Int = ME.unnId!!,
-//    start: LocalDate,
-//    finish: LocalDate
-//): ArrayList<ScheduleUnit> {
-//    val unnDatePattern = DateTimeFormatter.ofPattern("yyyy-MM-dd")
-//
-//    val r = client.get("$ruzapiURL/schedule/${type.name}/$id") {
-//        parameter("start", start.format(unnDatePattern))
-//        parameter("finish", finish.format(unnDatePattern))
-//        parameter("lng", "1")
-//    }
-//
-//    val json = JSONArray(r.bodyAsText())
-//    val out = arrayListOf<ScheduleUnit>()
-//    for (i in 0 until json.length()) {
-//        val unit = json.getJSONObject(i)
-//        val lecturesJson = unit.getJSONArray("listOfLecturers")
-//        val lecturers = arrayListOf<Lecturer>()
-//
-//        for (j in 0 until lecturesJson.length()) {
-//            val lecturer = lecturesJson.getJSONObject(j)
-//            lecturers.add(
-//                Lecturer(
-//                    name = lecturer.getString("lecturer"),
-//                    email = lecturer.getString("lecturerEmail"),
-//                    unnId = lecturer.getInt("lecturerOid"),
-//                    uid = lecturer.getString("lecturerUID"),
-//                    rank = when (lecturer.getString("lecturer_rank")) {
-//                        "АССИСТ" -> LecturerRank.Assistant
-//                        "СТПРЕП" -> LecturerRank.SLecturer
-//                        "ДОЦЕНТ" -> LecturerRank.AProfessor
-//                        else -> LecturerRank.Lecturer
-//                    }
-//                )
-//            )
-//        }
-//
-//        out.add(
-//            ScheduleUnit(
-//                oid = unit.getInt("lessonOid"),
-//                auditorium = Auditorium(
-//                    name = unit.getString("auditorium"),
-//                    oid = unit.getInt("auditoriumOid"),
-//                    floor = unit.getInt("auditoriumfloor"),
-//                    building = Building(
-//                        name = unit.getString("building"),
-//                        gid = unit.getInt("buildingGid"),
-//                        oid = unit.getInt("buildingOid")
-//                    )
-//                ),
-//                date = LocalDate.parse(unit.getString("date"), unnDatePattern),
-//                discipline = Discipline(
-//                    name = unit.getString("discipline"),
-//                    oid = unit.getInt("disciplineOid"),
-//                    type = unit.getInt("disciplinetypeload")
-//                ),
-//                kindOfWork = KindOfWork(
-//                    name = unit.getString("kindOfWork"),
-//                    complexity = unit.getInt("kindOfWorkComplexity"),
-//                    oid = unit.getInt("kindOfWorkOid"),
-//                    uid = unit.getString("kindOfWorkUid")
-//                ),
-//                lecturers = lecturers,
-//                stream = unit.getString("stream"),
-//                begin = LocalTime.parse(
-//                    unit.getString("beginLesson"),
-//                    DateTimeFormatter.ofPattern("HH:mm")
-//                ),
-//                end = LocalTime.parse(
-//                    unit.getString("endLesson"),
-//                    DateTimeFormatter.ofPattern("HH:mm")
-//                )
-//            )
-//        )
-//    }
-//
-//    return out
-//}
-//
-//
-//suspend fun getUserByBitrixId(id: Int): User {
-//    withContext(Dispatchers.IO) {
-//        loadUserByBitrixId(id)
-//    }?.let { return it }
-//
-//    val userId = JSONObject(client.get("$vuzapiURL/user/bx/$id") {
-//        header("Cookie", "PHPSESSID=${PHPSESSID}")
-//    }.bodyAsText()).getInt("id")
-//
-//    getUser(userId).let { user ->
-//        withContext(Dispatchers.IO) {
-//            cacheUser(user)
-//        }
-//        return user
-//    }
-//}
-//
-//suspend fun getBlogposts(): ArrayList<Post> {
-//    val r = client.get("$prtl2URL/news.php") {
-//        header("Cookie", "PHPSESSID=${PHPSESSID}")
-//        header("x-bitrix-sessid-token", CSRF)
-//    }
-//    val result = JSONArray(r.bodyAsText())
-//
-//    val out = arrayListOf<Post>()
-//    for (i in 0 until result.length()) {
-//        val el = result.getJSONObject(i)
-//        out.add(
-//            Post(
-//                id = el.getString("id").toInt(),
-//                authorId = el.getJSONObject("author").getInt("id").toInt(),
-//                enableComments = true, // FIXME: Delete the field or get correct value
-//                numComments = el.getString("commentsnum").toInt(),
-//                date = LocalDateTime.parse(
-//                    el.getString("time"),
-//                    DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss")
-//                ),
-//                content = el.getString("fulltext")
-//            )
-//        )
-//    }
-//    return out
-//}

app/src/main/java/ru/sweetbread/unn/db/Schedule.kt

@@ -1,269 +0,0 @@
-// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
-
-package ru.sweetbread.unn.db
-
-import androidx.room.ColumnInfo
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Entity
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.PrimaryKey
-import androidx.room.Query
-import androidx.room.withTransaction
-import kotlinx.coroutines.flow.Flow
-import ru.sweetbread.unn.api.Auditorium
-import ru.sweetbread.unn.api.Building
-import ru.sweetbread.unn.api.Discipline
-import ru.sweetbread.unn.api.KindOfWork
-import ru.sweetbread.unn.api.Lecturer
-import ru.sweetbread.unn.api.LecturerRank
-import ru.sweetbread.unn.api.ScheduleUnit
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
-import java.time.format.DateTimeFormatter
-
-@Entity
-data class BuildingDB(
-    @PrimaryKey val oid: Int,
-    @ColumnInfo val name: String,
-    @ColumnInfo val gid: Int,
-    @ColumnInfo val updatedAt: String
-)
-
-@Dao
-interface BuildingDao {
-    @Query("SELECT * FROM buildingdb WHERE oid = :oid LIMIT 1")
-    suspend fun get(oid: Int): BuildingDB?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(buildings: List<BuildingDB>)
-
-    @Delete
-    fun delete(building: BuildingDB)
-}
-
-fun BuildingDB.toModel() = Building(name, gid, oid)
-fun Building.toEntity() = BuildingDB(oid, name, gid, LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
-
-
-@Entity
-data class AuditoriumDB(
-    @PrimaryKey val oid: Int,
-    @ColumnInfo val name: String,
-    @ColumnInfo val floor: Int?,
-    @ColumnInfo val buildingOid: Int,
-    @ColumnInfo val updatedAt: String
-)
-
-@Dao
-interface AuditoriumDao {
-    @Query("SELECT * FROM auditoriumdb WHERE oid = :oid LIMIT 1")
-    suspend fun get(oid: Int): AuditoriumDB?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(auditoriums: List<AuditoriumDB>)
-
-    @Delete
-    fun delete(auditorium: AuditoriumDB)
-}
-
-suspend fun AuditoriumDB.toModel(db: AppDatabase): Auditorium? {
-    return Auditorium(
-        name,
-        oid,
-        floor ?: 0,
-        db.buildingDao().get(buildingOid)?.toModel() ?: return null
-    )
-}
-fun Auditorium.toEntity() = AuditoriumDB(
-    oid,
-    name,
-    floor,
-    building.oid,
-    LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)
-)
-
-suspend fun cacheAuditorium(db: AppDatabase, auditoriums: List<Auditorium>) {
-    db.withTransaction {
-        db.buildingDao().insert(
-            auditoriums.map { it.building }.map { it.toEntity() }
-        )
-
-        db.auditoriumDao().insert(
-            auditoriums.map { it.toEntity() }
-        )
-    }
-}
-
-@Entity
-data class DisciplineDB(
-    @PrimaryKey val oid: Int,
-    @ColumnInfo val name: String,
-    @ColumnInfo val type: Int,
-    @ColumnInfo val updatedAt: String
-)
-
-@Dao
-interface DisciplineDao {
-    @Query("SELECT * FROM disciplinedb WHERE oid = :oid LIMIT 1")
-    suspend fun get(oid: Int): DisciplineDB?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(disciplines: List<DisciplineDB>)
-
-    @Delete
-    fun delete(discipline: DisciplineDB)
-}
-
-fun DisciplineDB.toModel() = Discipline(name, oid, type)
-fun Discipline.toEntity() = DisciplineDB(oid, name, type, LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
-
-
-@Entity
-data class KindOfWorkDB(
-    @PrimaryKey val oid: Int,
-    @ColumnInfo val name: String,
-    @ColumnInfo val uid: String,
-    @ColumnInfo val complexity: Int,
-    @ColumnInfo val updatedAt: String
-)
-
-@Dao
-interface KindOfWorkDao {
-    @Query("SELECT * FROM kindofworkdb WHERE oid = :oid LIMIT 1")
-    suspend fun get(oid: Int): KindOfWorkDB?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(kindOfWork: List<KindOfWorkDB>)
-
-    @Delete
-    fun delete(kindOfWork: KindOfWorkDB)
-}
-
-fun KindOfWorkDB.toModel() = KindOfWork(name, oid, uid, complexity)
-fun KindOfWork.toEntity() = KindOfWorkDB(
-    oid,
-    name,
-    uid,
-    complexity,
-    LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)
-)
-
-
-@Entity
-data class LecturerDB(
-    @PrimaryKey val unnId: Int,
-    @ColumnInfo val name: String,
-    @ColumnInfo val rank: LecturerRank,
-    @ColumnInfo val email: String,
-    @ColumnInfo val uid: String,
-    @ColumnInfo val updatedAt: String
-)
-
-@Dao
-interface LecturerDao {
-    @Query("SELECT * FROM lecturerdb WHERE unnId = :unnId LIMIT 1")
-    suspend fun get(unnId: Int): LecturerDB?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(lecturers: List<LecturerDB>)
-
-    @Delete
-    fun delete(lecturer: LecturerDB)
-}
-
-fun LecturerDB.toModel() = Lecturer(name, rank, email, unnId, uid)
-fun Lecturer.toEntity() = LecturerDB(
-    unnId,
-    name,
-    rank,
-    email,
-    uid,
-    LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)
-)
-
-
-@Entity
-data class ScheduleUnitDB(
-    @PrimaryKey val oid: Int,
-    @ColumnInfo val date: String,
-    @ColumnInfo val stream: String,
-    @ColumnInfo val begin: String,
-    @ColumnInfo val end: String,
-
-    @ColumnInfo val auditoriumOid: Int,
-    @ColumnInfo val disciplineOid: Int,
-    @ColumnInfo val kindOfWorkOid: Int,
-    @ColumnInfo val lecturersId: String,
-
-    @ColumnInfo val updatedAt: String
-)
-@Dao
-interface ScheduleItemDao {
-    @Query("SELECT * FROM scheduleUnitDB WHERE oid = :oid LIMIT 1")
-    suspend fun getSchedule(oid: Int): ScheduleUnitDB?
-
-    @Query("SELECT * FROM scheduleUnitDB WHERE date = :date ORDER BY `begin`")
-    suspend fun getSchedule(date: String): List<ScheduleUnitDB>
-
-    @Query("SELECT * FROM scheduleUnitDB WHERE date = :date ORDER BY `begin`")
-    fun getScheduleFlow(date: String): Flow<List<ScheduleUnitDB>>
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(units: List<ScheduleUnitDB>)
-
-    @Delete
-    suspend fun delete(unit: ScheduleUnitDB)
-
-    @Query("DELETE FROM scheduleUnitDB WHERE date = :date")
-    suspend fun deleteByDate(date: String)
-
-    @Query("SELECT * FROM scheduleUnitDB WHERE date = :date ORDER BY `begin`")
-    fun observe(date: String): Flow<List<ScheduleUnitDB>>
-
-    @Query("SELECT * FROM scheduleUnitDB")
-    suspend fun getAll(): List<ScheduleUnitDB>
-}
-
-suspend fun ScheduleUnitDB.toModel(db: AppDatabase): ScheduleUnit? {
-    return ScheduleUnit(
-        oid,
-        db.auditoriumDao().get(auditoriumOid)?.toModel(db) ?: return null,
-        LocalDate.parse(date, DateTimeFormatter.ISO_DATE),
-        db.disciplineDao().get(disciplineOid)?.toModel() ?: return null,
-        db.kindOfWorkDao().get(kindOfWorkOid)?.toModel() ?: return null,
-        lecturersId.split(",").map { db.lecturerDao().get(it.toInt())?.toModel() ?: return null },
-        stream,
-        LocalTime.parse(begin, DateTimeFormatter.ISO_TIME),
-        LocalTime.parse(end, DateTimeFormatter.ISO_TIME),
-        LocalDateTime.parse(updatedAt, DateTimeFormatter.ISO_DATE_TIME),
-    )
-}
-fun ScheduleUnit.toEntity() = ScheduleUnitDB(
-    oid,
-    date.format(DateTimeFormatter.ISO_DATE),
-    stream,
-    begin.format(DateTimeFormatter.ISO_TIME),
-    end.format(DateTimeFormatter.ISO_TIME),
-    auditorium.oid,
-    discipline.oid,
-    kindOfWork.oid,
-    lecturers.map { it.unnId }.joinToString(","),
-    LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)
-)
-
-suspend fun cacheSchedule(db: AppDatabase, units: List<ScheduleUnit>) {
-    db.withTransaction {
-        cacheAuditorium(db, units.map { it.auditorium })
-        db.disciplineDao().insert(units.map { it.discipline.toEntity() })
-        db.kindOfWorkDao().insert(units.map { it.kindOfWork.toEntity() })
-        db.lecturerDao().insert(units.flatMap { it.lecturers }.map { it.toEntity() })
-        db.scheduleDao().insert(units.map { it.toEntity() })
-    }
-}
-
-//fun loadSchedule(db: AppDatabase, date: LocalDate): List<ScheduleUnit> =
-//    db.scheduleDao().getSchedule(date.format(DateTimeFormatter.ISO_DATE))
-//        .mapNotNull { it.toModel(db) }

app/src/main/java/ru/sweetbread/unn/db/UserDB.kt

@@ -1,74 +0,0 @@
-// Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
-
-package ru.sweetbread.unn.db
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import ru.sweetbread.unn.core.db.entity.UserDB
-
-@Dao
-interface UserDao {
-    @Query("SELECT * FROM userDB WHERE userId = :userId LIMIT 1")
-    suspend fun get(userId: Int): UserDB?
-
-    @Insert
-    suspend fun insert(user: UserDB)
-
-    @Delete
-    fun delete(user: UserDB)
-}
-
-
-//fun cacheUser(user: User) {
-//    try {
-//        cacheDb.userDao().insert(
-//            UserDB(
-//                user.userId,
-//                user.unnId,
-//                user.type,
-//                user.email,
-//                user.nameRu,
-//                user.nameEn,
-//                user.isMale,
-//                user.birthday.format(DateTimeFormatter.ISO_LOCAL_DATE),
-//                user.avatar.original,
-//                user.avatar.thumbnail,
-//                user.avatar.small,
-//                LocalDateTime.now().plusDays(1).format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
-//            )
-//        )
-//    } catch (_: android.database.sqlite.SQLiteConstraintException) {
-//    }
-//}
-//
-//fun loadUserByBitrixId(bitrixId: Int): User? {
-//    val user = cacheDb.userDao().getUserById(bitrixId)
-//    Log.d("UserDB", user?.nameEn ?: "None")
-//    if (user == null) return null
-//    if (LocalDateTime.parse(
-//            user.expiredAt,
-//            DateTimeFormatter.ISO_LOCAL_DATE_TIME
-//        ) < LocalDateTime.now()
-//    ) {
-//        cacheDb.userDao().delete(user)
-//        return null
-//    } else {
-//        return User(
-//            user.unnId,
-//            user.userId,
-//            user.type,
-//            user.email,
-//            user.nameRu,
-//            user.nameEn,
-//            user.isMale,
-//            LocalDate.parse(user.birthday, DateTimeFormatter.ISO_LOCAL_DATE),
-//            AvatarSet(
-//                user.origAvatar,
-//                user.thumbAvatar,
-//                user.smallAvatar
-//            )
-//        )
-//    }
-//}

app/src/main/java/ru/sweetbread/unn/feature/About.kt

@@ -1,6 +1,6 @@
 // Copyright (c) 2025 Gleb Zaharov. License: GPLv3 (see LICENSE).
 
-package ru.sweetbread.unn.ui.composes
+package ru.sweetbread.unn.feature
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column

app/src/main/java/ru/sweetbread/unn/feature/news/News.kt

@@ -48,23 +48,6 @@ import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 
 
-//val defUser = User(
-//    null,
-//    123,
-//    Type.student,
-//    "cool.email@domain.com",
-//    "Джон Сигма Омегович",
-//    "Jon Sigma Omega",
-//    true,
-//    LocalDate.now(),
-//    AvatarSet(
-//        "https://upload.wikimedia.org/wikipedia/ru/thumb/9/94/%D0%93%D0%B8%D0%B3%D0%B0%D1%87%D0%B0%D0%B4.jpg/500px-%D0%93%D0%B8%D0%B3%D0%B0%D1%87%D0%B0%D0%B4.jpg",
-//        "https://upload.wikimedia.org/wikipedia/ru/thumb/9/94/%D0%93%D0%B8%D0%B3%D0%B0%D1%87%D0%B0%D0%B4.jpg/500px-%D0%93%D0%B8%D0%B3%D0%B0%D1%87%D0%B0%D0%B4.jpg",
-//        "https://upload.wikimedia.org/wikipedia/ru/thumb/9/94/%D0%93%D0%B8%D0%B3%D0%B0%D1%87%D0%B0%D0%B4.jpg/500px-%D0%93%D0%B8%D0%B3%D0%B0%D1%87%D0%B0%D0%B4.jpg"
-//    )
-//)
-//
-//
 @Composable
 fun Blogposts(viewModel: NewsViewModel = viewModel(factory = NewsViewModel.Factory)) {
     val news = viewModel.news.collectAsLazyPagingItems()
@@ -168,47 +151,6 @@ fun PostItem(modifier: Modifier = Modifier, post: News, extended: Boolean = fals
         ))
     }
 }
-//
-//
-//@Preview
-//@Composable
-//fun UserItemPreview() {
-//    UNNTheme {
-//        Surface {
-//            UserItem(
-//                Modifier
-//                    .width(300.dp)
-//                    .clip(RoundedCornerShape(8.dp))
-//                    .background(MaterialTheme.colorScheme.primaryContainer),
-//                defUser,
-//                Type.student.s
-//            )
-//        }
-//    }
-//}
-//
-//@Preview
-//@Composable
-//fun PostItemPreview() {
-//    val post = Post(
-//        id = 154923,
-//        authorId = 165945,
-//        enableComments = true,
-//        numComments = 0,
-//        date = LocalDateTime.of(2024, 3, 20, 18, 55, 20),
-//        content = stringResource(id = R.string.lorem)
-//    )
-//
-//    UNNTheme {
-//        Surface {
-//            PostItem(
-//                Modifier
-//                    .clip(RoundedCornerShape(8.dp))
-//                    .background(MaterialTheme.colorScheme.primaryContainer), post
-//            )
-//        }
-//    }
-//}
 
 
 class CoilImageGetter(

app/src/main/java/ru/sweetbread/unn/feature/news/NewsRemoteMediator.kt

@@ -11,10 +11,10 @@ import androidx.paging.PagingState
 import androidx.paging.RemoteMediator
 import androidx.room.withTransaction
 import kotlinx.io.IOException
+import ru.sweetbread.unn.core.db.AppDatabase
 import ru.sweetbread.unn.core.db.entity.NewsDB
 import ru.sweetbread.unn.core.db.entity.toEntity
 import ru.sweetbread.unn.core.network.PortalApi
-import ru.sweetbread.unn.db.AppDatabase
 import ru.sweetbread.unn.feature.profile.UserRepository
 import ru.sweetbread.unn.model.News
 
@@ -64,9 +64,9 @@ class NewsRemoteMediator(
             }
 
             db.withTransaction {
-//                if (loadType == LoadType.REFRESH) {
+                if (loadType == LoadType.REFRESH) {
-//                    db.newsDao().clear()
+                    db.newsDao().clear()
-//                }
+                }
 
                 db.newsDao().insertAll(
                     news.map { it.toEntity() }

app/src/main/java/ru/sweetbread/unn/feature/news/NewsRepository.kt

@@ -10,9 +10,9 @@ import androidx.paging.map
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import ru.sweetbread.unn.core.SessionManager
+import ru.sweetbread.unn.core.db.AppDatabase
 import ru.sweetbread.unn.core.db.entity.toModel
 import ru.sweetbread.unn.core.network.PortalApi
-import ru.sweetbread.unn.db.AppDatabase
 import ru.sweetbread.unn.feature.profile.UserRepository
 import ru.sweetbread.unn.model.News
 

app/src/main/java/ru/sweetbread/unn/feature/news/NewsViewModel.kt

@@ -8,7 +8,7 @@ import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import androidx.paging.cachedIn
-import ru.sweetbread.unn.UNNApp
+import ru.sweetbread.unn.app.UNNApp
 
 class NewsViewModel(
     repository: NewsRepository

app/src/main/java/ru/sweetbread/unn/feature/profile/UserRepository.kt

@@ -3,10 +3,10 @@
 package ru.sweetbread.unn.feature.profile
 
 import android.util.Log
+import ru.sweetbread.unn.core.db.AppDatabase
 import ru.sweetbread.unn.core.db.entity.toEntity
 import ru.sweetbread.unn.core.db.entity.toModel
 import ru.sweetbread.unn.core.network.PortalApi
-import ru.sweetbread.unn.db.AppDatabase
 import ru.sweetbread.unn.model.User
 
 class UserRepository (

app/src/main/java/ru/sweetbread/unn/feature/schedule/Schedule.kt

@@ -44,16 +44,20 @@ import androidx.compose.ui.zIndex
 import androidx.lifecycle.viewmodel.compose.viewModel
 import kotlinx.coroutines.delay
 import ru.sweetbread.unn.R
-import ru.sweetbread.unn.api.Auditorium
+import ru.sweetbread.unn.app.UNNApp
-import ru.sweetbread.unn.api.Building
+import ru.sweetbread.unn.feature.schedule.components.BoundedWeekPicker
-import ru.sweetbread.unn.api.Discipline
+import ru.sweetbread.unn.feature.schedule.components.GroupsNameText
-import ru.sweetbread.unn.api.KindOfWork
+import ru.sweetbread.unn.model.Auditorium
-import ru.sweetbread.unn.api.Lecturer
+import ru.sweetbread.unn.model.Building
-import ru.sweetbread.unn.api.LecturerRank
+import ru.sweetbread.unn.model.Discipline
-import ru.sweetbread.unn.api.ScheduleUnit
+import ru.sweetbread.unn.model.KindOfWork
-import ru.sweetbread.unn.ui.composes.BoundedWeekPicker
+import ru.sweetbread.unn.model.Lecturer
-import ru.sweetbread.unn.ui.composes.GroupsNameText
+import ru.sweetbread.unn.model.LecturerRank
+import ru.sweetbread.unn.model.ScheduleUnit
+import ru.sweetbread.unn.model.Student
+import ru.sweetbread.unn.model.Type
 import ru.sweetbread.unn.ui.theme.UNNTheme
+import splitties.init.appCtx
 import splitties.resources.appStr
 import java.time.LocalDate
 import java.time.LocalDateTime
@@ -113,6 +117,9 @@ fun ScheduleDay(modifier: Modifier = Modifier, viewModel: ScheduleViewModel) {
 
 @Composable
 fun ScheduleItem(modifier: Modifier = Modifier, unit: ScheduleUnit, expanded: Boolean = false) {
+    val me = (appCtx as UNNApp).container.sessionManager.user.collectAsState().value
+    val currentGroup = if (me?.type == Type.Student) (me as Student).group else null
+
     fun getRatio(): Float {
         val begin = LocalDateTime.of(unit.date, unit.begin).atZone(ZoneId.of("Europe/Moscow")).toEpochSecond()
         val end = LocalDateTime.of(unit.date, unit.end).atZone(ZoneId.of("Europe/Moscow")).toEpochSecond()
@@ -202,7 +209,9 @@ fun ScheduleItem(modifier: Modifier = Modifier, unit: ScheduleUnit, expanded: Bo
                 AnimatedVisibility (expanded) {
                     GroupsNameText(
                         unit.stream,
-                        highlightColor = MaterialTheme.colorScheme.inversePrimary
+                        highlightColor = MaterialTheme.colorScheme.inversePrimary,
+                        currentGroupName = currentGroup,
+                        currentGroupColor = MaterialTheme.colorScheme.inverseSurface
                     )
                 }
             }

app/src/main/java/ru/sweetbread/unn/feature/schedule/ScheduleRepository.kt

@@ -5,12 +5,11 @@ package ru.sweetbread.unn.feature.schedule
 import androidx.room.withTransaction
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import ru.sweetbread.unn.api.ScheduleUnit
+import ru.sweetbread.unn.core.db.AppDatabase
-import ru.sweetbread.unn.core.SessionManager
+import ru.sweetbread.unn.core.db.entity.cacheSchedule
+import ru.sweetbread.unn.core.db.entity.toModel
 import ru.sweetbread.unn.core.network.PortalApi
-import ru.sweetbread.unn.db.AppDatabase
+import ru.sweetbread.unn.model.ScheduleUnit
-import ru.sweetbread.unn.db.cacheSchedule
-import ru.sweetbread.unn.db.toModel
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
@@ -18,7 +17,6 @@ import java.time.format.DateTimeFormatter
 class ScheduleRepository (
     val api: PortalApi,
     val db: AppDatabase,
-    val session: SessionManager
 ) {
     fun observeSchedule(date: LocalDate): Flow<List<ScheduleUnit>> =
         db.scheduleDao()

app/src/main/java/ru/sweetbread/unn/feature/schedule/ScheduleViewModel.kt

@@ -14,8 +14,8 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
-import ru.sweetbread.unn.UNNApp
+import ru.sweetbread.unn.app.UNNApp
-import ru.sweetbread.unn.api.ScheduleUnit
+import ru.sweetbread.unn.model.ScheduleUnit
 import java.time.LocalDate
 
 data class ScheduleUiState(

app/src/main/java/ru/sweetbread/unn/feature/schedule/components/GroupsNameText.kt

@@ -1,6 +1,6 @@
 // Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
 
-package ru.sweetbread.unn.ui.composes
+package ru.sweetbread.unn.feature.schedule.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -20,14 +20,25 @@ import androidx.compose.ui.unit.dp
 fun GroupsNameText(
     text: String,
     modifier: Modifier = Modifier,
-    highlightColor: Color = MaterialTheme.colorScheme.secondaryContainer,
+    highlightColor: Color = MaterialTheme.colorScheme.tertiaryContainer,
     highlightPadding: PaddingValues = PaddingValues(horizontal = 6.dp, vertical = 2.dp),
     highlightShape: Shape = MaterialTheme.shapes.small,
+    currentGroupName: String? = null,
+    currentGroupColor: Color = MaterialTheme.colorScheme.secondaryContainer,
     horizontalArrangement: Arrangement.Horizontal = Arrangement.Start,
 ) {
     val suffix = if (text.endsWith("-В-OUP")) "-В-OUP" else null
     val mainPart = if (suffix != null) text.dropLast(6) else text
-    val blocks = mainPart.split('|')
+    val blocks = if (mainPart.startsWith("Поток_(") && mainPart.endsWith(')')) {
+        mainPart
+            .removePrefix("Поток_(")
+            .dropLast(1)
+            .split(';')
+            .map(String::trim)
+            .filter(String::isNotEmpty)
+    } else {
+        mainPart.split('|')
+    }
 
     FlowRow(
         modifier = modifier,
@@ -38,7 +49,10 @@ fun GroupsNameText(
             Box(
                 modifier = Modifier
                     .padding(end = 2.dp)
-                    .background(highlightColor, highlightShape)
+                    .background(
+                        if (currentGroupName == block) currentGroupColor
+                        else highlightColor, highlightShape
+                    )
                     .padding(highlightPadding)
             ) {
                 Text(text = block)

app/src/main/java/ru/sweetbread/unn/feature/schedule/components/Week.kt

@@ -1,5 +1,5 @@
 // Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
-package ru.sweetbread.unn.ui.composes
+package ru.sweetbread.unn.feature.schedule.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable

app/src/main/java/ru/sweetbread/unn/model/Schedule.kt

@@ -1,19 +1,12 @@
 // Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
 
-package ru.sweetbread.unn.api
+package ru.sweetbread.unn.model
 
 import ru.sweetbread.unn.R
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
 
-enum class LecturerRank(val id: Int) {
-    Assistant(R.string.assistant),
-    Lecturer(R.string.lecturer),
-    SLecturer(R.string.slecturer),
-    AProfessor(R.string.aprofessor)
-}
-
 class ScheduleUnit(
     val oid: Int,
     val auditorium: Auditorium,
@@ -27,6 +20,13 @@ class ScheduleUnit(
     val lastUpdated: LocalDateTime,
 )
 
+enum class LecturerRank(val id: Int) {
+    Assistant(R.string.assistant),
+    Lecturer(R.string.lecturer),
+    SLecturer(R.string.slecturer),
+    AProfessor(R.string.aprofessor)
+}
+
 class Auditorium(
     val name: String,
     val oid: Int,
@@ -60,18 +60,3 @@ class Lecturer(
     val unnId: Int,
     val uid: String
 )
-
-class Post(
-    val id: Int,
-    val authorId: Int,
-    val enableComments: Boolean,
-    val numComments: Int,
-    val date: LocalDateTime,
-    val content: String
-)
-
-class AvatarSet(
-    val original: String,
-    val thumbnail: String,
-    val small: String
-)

app/src/main/java/ru/sweetbread/unn/model/User.kt

@@ -4,15 +4,12 @@ package ru.sweetbread.unn.model
 
 import org.json.JSONObject
 import ru.sweetbread.unn.R
-import ru.sweetbread.unn.api.AvatarSet
 import splitties.resources.appStr
 
 enum class Type(val s: String) {
-    student(appStr(R.string.student)),
+    Student(appStr(R.string.student)),
-    // group("group"),
+    Lecturer(appStr(R.string.lecturer)),
-    lecturer(appStr(R.string.lecturer)),
+    Employee(appStr(R.string.employee))
-    // auditorium("auditorium"),
-    employee(appStr(R.string.employee))
 }
 
 open class User(
@@ -32,8 +29,8 @@ open class User(
                 .getJSONObject(0)
                 .getString("type")
         ) {
-            "student" -> Type.student
+            "student" -> Type.Student
-            else -> Type.employee
+            else -> Type.Employee
         },
         json.getString("email"),
         json.getString("fullname"),
@@ -49,17 +46,17 @@ open class User(
 
     companion object {
         fun fromProfile(json: JSONObject): User {
-            val user = json.getJSONObject("user")
+            val userField = json.getJSONObject("user")
-            return User(
+            val user = User(
-                user.getInt("id"),
+                userField.getInt("id"),
                 when (json.getString("type")) {
-                    "student" -> Type.student
+                    "student" -> Type.Student
-                    else -> Type.employee
+                    else -> Type.Employee
                 },
-                user.getString("email"),
+                userField.getString("email"),
-                user.getString("fullname"),
+                userField.getString("fullname"),
-                user.getString("fullname_en"),
+                userField.getString("fullname_en"),
-                user.getJSONObject("photo").let {
+                userField.getJSONObject("photo").let {
                     AvatarSet(
                         it.getString("orig"),
                         it.getString("thumbnail"),
@@ -67,11 +64,16 @@ open class User(
                     )
                 }
             )
+
+            if (user.type == Type.Student)
+                user = Student()
+
+            return user
         }
 
         fun getPlaceholder() = User(
             0,
-            Type.employee,
+            Type.Employee,
             "",
             "Удалённый пользователь",
             "Deleted user",
@@ -108,3 +110,9 @@ class Student(
         group
     )
 }
+
+class AvatarSet(
+    val original: String,
+    val thumbnail: String,
+    val small: String
+)