🚀 release: promote develop to main for v1.0.4-beta.1

Author: topanim

README.md

@@ -71,6 +71,7 @@ Room              // Надёжная и типобезопасная просл
 - [x] Виджеты на главный экран
 - [x] Темы
 - [x] Интеграция новостей
+- [x] Личные кабинеты
 
 ## 💚 Стань садовником проекта
 
@@ -79,7 +80,7 @@ Room              // Надёжная и типобезопасная просл
 3. **Дизайнер экосистемы** → [Написать](https://t.me/whatrushik)
 
 ```text
-MIT License · © 2026 whatrushik
+MIT License · © 2024 whatrushik
 Свободно расти и процветать 🌍
 ```
 

app/build.gradle.kts

@@ -29,7 +29,7 @@ android {
         minSdk = 26
         targetSdk = 36
         versionCode = generateVersionCode()
-        versionName = "1.0.3"
+        versionName = "1.0.4-beta.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -106,7 +106,6 @@ dependencies {
     implementation(project(":core:foundation"))
     implementation(project(":core:navigation"))
 
-
     ksp(libs.room.compiler)
 
     implementation(platform(libs.firebase.bom))
@@ -118,6 +117,7 @@ dependencies {
     implementation(libs.bundles.room)
     implementation(libs.bundles.coil)
 
+    implementation(libs.qrose)
     implementation(libs.poi)
     implementation(libs.poi.ooxml)
     implementation(libs.process.phoenix)

app/src/main/java/app/what/schedule/CrashActivity.kt

@@ -8,12 +8,27 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.MaterialTheme.colorScheme
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
 import androidx.core.content.FileProvider
 import app.what.foundation.services.AppLogger.Companion.Auditor
 import app.what.foundation.services.crash.CrashScreen
+import app.what.foundation.ui.Show
+import app.what.foundation.ui.controllers.rememberDialogController
 import app.what.foundation.utils.ShareUtils
+import app.what.navigation.core.ProvideGlobalDialog
 import app.what.schedule.data.local.settings.AppValues
+import app.what.schedule.features.dev.DevFeature
 import app.what.schedule.ui.theme.AppTheme
+import app.what.schedule.ui.theme.icons.WHATIcons
+import app.what.schedule.ui.theme.icons.filled.FrameBug
 import org.koin.compose.koinInject
 import java.io.File
 
@@ -31,11 +46,30 @@ class CrashActivity : ComponentActivity() {
             }
 
             AppTheme(koinInject<AppValues>()) {
-                CrashScreen(
-                    crashReport = intent.getStringExtra("CRASH_REPORT") ?: "",
-                    onRestart = { restartApp() },
-                    onShare = { shareCrashReport() }
-                )
+                ProvideGlobalDialog {
+                    val dialog = rememberDialogController()
+
+                    Box {
+                        FloatingActionButton(
+                            modifier = Modifier
+                                .align(Alignment.BottomEnd)
+                                .zIndex(2f)
+                                .systemBarsPadding()
+                                .padding(bottom = 20.dp, end = 20.dp),
+                            onClick = {
+                                dialog.open(full = true) { DevFeature() }
+                            }
+                        ) {
+                            WHATIcons.FrameBug.Show(color = colorScheme.onSecondaryContainer)
+                        }
+
+                        CrashScreen(
+                            crashReport = intent.getStringExtra("CRASH_REPORT") ?: "",
+                            onRestart = { restartApp() },
+                            onShare = { shareCrashReport() }
+                        )
+                    }
+                }
             }
         }
     }

app/src/main/java/app/what/schedule/ScheduleApp.kt

@@ -1,8 +1,8 @@
 package app.what.schedule
 
 import android.app.Application
-import android.widget.Toast
 import androidx.room.Room
+import app.what.foundation.data.settings.PreferenceStorage
 import app.what.foundation.services.AppLogger
 import app.what.foundation.services.AppLogger.Companion.Auditor
 import app.what.foundation.services.auto_update.AppUpdateManager
@@ -16,9 +16,11 @@ import app.what.foundation.services.crash.CrashHandler
 import app.what.schedule.data.local.database.AppDatabase
 import app.what.schedule.data.local.settings.AppValues
 import app.what.schedule.data.remote.api.InstitutionManager
+import app.what.schedule.data.remote.providers.dgtu.services.DGTUAccountService
 import app.what.schedule.domain.NewsRepository
 import app.what.schedule.domain.ScheduleRepository
 import app.what.schedule.features.dev.presentation.NetworkMonitorPlugin
+import app.what.schedule.features.insts.dgtu.domain.DgtuController
 import app.what.schedule.features.main.domain.MainController
 import app.what.schedule.features.news.domain.NewsController
 import app.what.schedule.features.newsDetail.domain.NewsDetailController
@@ -53,6 +55,8 @@ import kotlinx.serialization.json.Json
 import org.koin.android.ext.android.getKoin
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.bind
 import org.koin.dsl.module
 import java.security.cert.X509Certificate
 import java.util.UUID
@@ -107,29 +111,37 @@ class ScheduleApp : Application() {
         val source = getInstallSource(this)
 
         when (source) {
-            InstallSource.APK -> Auditor.debug("d", "Apk")
-            InstallSource.RuStore -> Auditor.debug("d", "RuStore")
+            InstallSource.APK -> Auditor.debug("d", "install source Apk")
+            InstallSource.RuStore -> Auditor.debug("d", "install source RuStore")
         }
     }
 }
 
 val controllers = module {
-    single<SettingsController> { SettingsController(get(), get()) }
-    single<NewsController> { NewsController(get(), get()) }
+    singleOf(::SettingsController)
+    singleOf(::NewsController)
+    singleOf(::ScheduleController)
+    singleOf(::OnboardingController)
+    singleOf(::MainController)
+    singleOf(::DgtuController)
     factory<NewsDetailController> { params -> NewsDetailController(params.get(), get()) }
-    single<ScheduleController> { ScheduleController(get(), get()) }
-    single<OnboardingController> { OnboardingController(get(), get()) }
-    single<MainController> { MainController() }
 }
 
 val generalModule = module {
     single<CoroutineScope> { CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) }
-    single { AppValues(get()) }
-    single { AppUtils(get()) }
-    single { GoogleDriveParser(get()) }
-    single { FileManager(get()) }
-    single<AppUpdateManager> {
 
+    singleOf(::AppValues) bind PreferenceStorage::class
+    singleOf(::AppUtils)
+    singleOf(::GoogleDriveParser)
+    singleOf(::FileManager)
+
+    singleOf(::DGTUAccountService)
+
+    singleOf(::InstitutionManager)
+    singleOf(::ScheduleRepository)
+    singleOf(::NewsRepository)
+
+    single<AppUpdateManager> {
         val context = androidContext()
         val source = getInstallSource(context)
 
@@ -149,11 +161,6 @@ val generalModule = module {
         }
     }
 
-
-    single { InstitutionManager(get(), get()) }
-    single { ScheduleRepository(get(), get(), get()) }
-    single { NewsRepository(get(), get()) }
-
     single {
         Room.databaseBuilder(
             androidContext(),
@@ -178,10 +185,11 @@ val generalModule = module {
 
             install(ContentNegotiation) {
                 json(Json {
-                    ignoreUnknownKeys = true
-                    isLenient = true
                     classDiscriminator = "type"
+                    ignoreUnknownKeys = true
                     prettyPrint = true
+                    isLenient = true
+                    explicitNulls = false
                 })
             }
 

app/src/main/java/app/what/schedule/data/local/settings/AppValues.kt

@@ -11,13 +11,6 @@ import app.what.schedule.data.remote.api.models.ScheduleSearch
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.serializer
 
-@Serializable
-class ScheduleProvider(
-    val inst: String,
-    val filial: String,
-    val provider: String
-)
-
 @Serializable
 enum class ThemeType(override val displayName: String) : Named {
     Light("Светлая"),
@@ -115,5 +108,18 @@ class AppValues(context: Context) : PreferenceStorage(
         "debug_mode", false, Boolean.serializer(),
         "Режим отладки", "Включение дополнительной информации для разработки"
     )
+
+    // DGTU ---------------
+    val dgtuToken = createValue(
+        "dgtu_token",
+        null,
+        String.serializer(),
+    )
+
+    val dgtuStudentId = createValue(
+        "dgtu_userId",
+        null,
+        Int.serializer(),
+    )
 }
 

app/src/main/java/app/what/schedule/data/remote/api/ScheduleApi.kt

@@ -1,15 +1,17 @@
 package app.what.schedule.data.remote.api
 
+import app.what.foundation.core.Feature
+import app.what.foundation.core.UIComponent
 import app.what.schedule.data.local.settings.AppValues
 import app.what.schedule.data.remote.api.models.DaySchedule
 import app.what.schedule.data.remote.api.models.Group
 import app.what.schedule.data.remote.api.models.NewItem
 import app.what.schedule.data.remote.api.models.NewListItem
 import app.what.schedule.data.remote.api.models.Teacher
-import app.what.schedule.data.remote.providers.DGTU
-import app.what.schedule.data.remote.providers.IUBIP
-import app.what.schedule.data.remote.providers.RINH
-import app.what.schedule.data.remote.providers.RKSI
+import app.what.schedule.data.remote.providers.dgtu.DGTU
+import app.what.schedule.data.remote.providers.iubip.IUBIP
+import app.what.schedule.data.remote.providers.rinh.RINH
+import app.what.schedule.data.remote.providers.rksi.RKSI
 import kotlinx.coroutines.CoroutineScope
 import java.time.LocalDateTime
 
@@ -54,6 +56,47 @@ sealed interface ScheduleResponse {
     }
 }
 
+fun List<ScheduleResponse>.sum(): ScheduleResponse {
+    if (isEmpty()) return ScheduleResponse.Empty
+
+    val allSchedules = mutableListOf<DaySchedule>()
+    var latestModified: LocalDateTime? = null
+
+    for (response in this) {
+        when (response) {
+            ScheduleResponse.Empty -> {
+
+            }
+
+            ScheduleResponse.UpToDate -> {
+
+            }
+
+            is ScheduleResponse.Available -> {
+                allSchedules.addAll(response.schedules)
+                if (latestModified == null || response.lastModified > latestModified) {
+                    latestModified = response.lastModified
+                }
+            }
+        }
+    }
+
+    if (allSchedules.isEmpty()) {
+        return ScheduleResponse.Empty
+    }
+
+    val hasFromSource = this.any { it is ScheduleResponse.Available.FromSource }
+    val hasFromCache = this.any { it is ScheduleResponse.Available.FromCache }
+
+    val lastModified = latestModified ?: LocalDateTime.now()
+
+    return when {
+        hasFromSource -> ScheduleResponse.Available.FromSource(allSchedules, lastModified)
+        hasFromCache -> ScheduleResponse.Available.FromCache(allSchedules, lastModified)
+        else -> ScheduleResponse.Available.FromSource(allSchedules, lastModified)
+    }
+}
+
 
 typealias AdditionalData = Map<String, Any?>
 
@@ -65,6 +108,20 @@ interface Institution {
 
     val metadata: MetaInfo
 
+    val scheduleService: ScheduleService
+    val newsService: NewsService
+
+    val accountFeature: Feature<*, *>?
+
+    fun generateFileName(
+        additional: AdditionalData,
+        fileExtension: String
+    ) = "${metadata.id}_${
+        additional.map { (k, v) -> "$k&$v" }.joinToString("_")
+    }.$fileExtension"
+}
+
+interface ScheduleService {
     suspend fun getGroupSchedule(
         group: String,
         showReplacements: Boolean = false,
@@ -79,20 +136,20 @@ interface Institution {
 
     suspend fun getGroups(): List<Group>
     suspend fun getTeachers(): List<Teacher>
+}
 
+interface NewsService {
     suspend fun getNews(page: Int): List<NewListItem> = emptyList()
     suspend fun getNewDetail(id: String): NewItem {
         error("Not implemented")
     }
+}
 
-    fun generateFileName(
-        additional: AdditionalData,
-        fileExtension: String
-    ) = "${metadata.id}_${
-        additional.map { (k, v) -> "$k&$v" }.joinToString("_")
-    }.$fileExtension"
+interface AccountService {
+    val ui: UIComponent
 }
 
+
 val insts: List<Institution.Factory> by lazy {
     listOf(
         RKSI.Factory,