the most important changes of all time

.gitea/workflows/release.yml

@@ -30,17 +30,9 @@ jobs:
         # Ставим JDK вручную и явно прописываем JAVA_HOME.
         # actions/setup-java не всегда передаёт JAVA_HOME дальше в Gitea Actions.
         run: |
-          set -euxo pipefail
-          cd /tmp
-          wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz
-          tar -xzf OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz -C /opt
-          mv /opt/jdk-17.0.12+7 /opt/java17
-          export JAVA_HOME=/opt/java17
-          export PATH=$JAVA_HOME/bin:$PATH
-          echo "JAVA_HOME=/opt/java17" >> $GITHUB_ENV
-          echo "$JAVA_HOME/bin" >> $GITHUB_PATH
-          java -version
-          javac -version
+          apt-get update
+          apt-get install -y openjdk-17-jdk-headless unzip wget
+          echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64" >> "$GITHUB_ENV"
 
       - name: Install Android SDK
         # Устанавливаем command-line tools и нужные компоненты SDK,

README.md

@@ -1,2 +1,6 @@
-# vyatsu-schedule
+# vyatsu-schedulegit
 
+## settings-branch
+blank settings at first, soon will add update feature. 
+
+settings will be presetned as fourth button on the bottom of the screen.

app/src/main/AndroidManifest.xml

@@ -3,14 +3,13 @@
     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="@drawable/icon"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
@@ -26,16 +25,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
     </application>
 
 </manifest>

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

@@ -5,10 +5,6 @@ import agzam.vyatsu.ui.groups.GroupPickerScreen
 import agzam.vyatsu.ui.groups.GroupPickerViewModel
 import agzam.vyatsu.ui.home.HomeScreen
 import agzam.vyatsu.ui.schedule.ScheduleViewModel
-import agzam.vyatsu.ui.settings.UpdateViewModel
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -24,33 +20,8 @@ fun AppRoot() {
 
     val scheduleViewModel: ScheduleViewModel = viewModel(factory = scheduleFactory(container))
     val groupPickerViewModel: GroupPickerViewModel = viewModel(factory = groupPickerFactory(container))
-    val updateViewModel: UpdateViewModel = viewModel(factory = updateFactory(container))
 
     val state by scheduleViewModel.uiState.collectAsState()
-    val showFirstRunDialog by updateViewModel.showFirstRunDialog.collectAsState()
-
-    if (showFirstRunDialog) {
-        AlertDialog(
-            onDismissRequest = { updateViewModel.onFirstRunDecision(false) },
-            title = { Text("Автоматические обновления") },
-            text = {
-                Text(
-                    "Разрешить автоматически проверять и устанавливать " +
-                        "новые версии приложения?"
-                )
-            },
-            confirmButton = {
-                TextButton(onClick = { updateViewModel.onFirstRunDecision(true) }) {
-                    Text("Разрешить")
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { updateViewModel.onFirstRunDecision(false) }) {
-                    Text("Не надо")
-                }
-            }
-        )
-    }
 
     if (state.noGroup) {
         GroupPickerScreen(
@@ -61,7 +32,6 @@ fun AppRoot() {
     }
     HomeScreen(
         scheduleViewModel = scheduleViewModel,
-        updateViewModel = updateViewModel,
         onSwitchGroup = { scheduleViewModel.switchGroup() }
     )
 }
@@ -73,4 +43,3 @@ 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 updateFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { UpdateViewModel(c.appUpdater, c.preferencesRepository) }

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

@@ -10,8 +10,6 @@ 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/PreferencesDao.kt

@@ -27,16 +27,4 @@ interface PreferencesDao {
 
     @Query("INSERT OR REPLACE INTO preferences(key, value) VALUES('selectedDayDate', :date)")
     suspend fun setSelectedDayDate(date: String)
-
-    @Query("SELECT value FROM preferences WHERE key = 'autoUpdateEnabled'")
-    suspend fun autoUpdateEnabled(): String?
-
-    @Query("INSERT OR REPLACE INTO preferences(key, value) VALUES('autoUpdateEnabled', :enabled)")
-    suspend fun setAutoUpdateEnabled(enabled: String)
-
-    @Query("SELECT value FROM preferences WHERE key = 'autoUpdateAsked'")
-    suspend fun autoUpdateAsked(): String?
-
-    @Query("INSERT OR REPLACE INTO preferences(key, value) VALUES('autoUpdateAsked', :asked)")
-    suspend fun setAutoUpdateAsked(asked: String)
 }

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

@@ -1,56 +0,0 @@
-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/PreferencesRepositoryImpl.kt

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

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

@@ -9,7 +9,6 @@ import agzam.vyatsu.data.repository.ScheduleRepositoryImpl
 import agzam.vyatsu.domain.repository.GroupRepository
 import agzam.vyatsu.domain.repository.PreferencesRepository
 import agzam.vyatsu.domain.repository.ScheduleRepository
-import agzam.vyatsu.update.AppUpdater
 import android.content.Context
 import androidx.room.Room
 
@@ -38,8 +37,4 @@ class AppContainer(context: Context) {
     val preferencesRepository: PreferencesRepository by lazy {
         PreferencesRepositoryImpl(database.preferencesDao())
     }
-
-    val appUpdater: AppUpdater by lazy {
-        AppUpdater(context.applicationContext, preferencesRepository)
-    }
 }

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

@@ -8,10 +8,4 @@ interface PreferencesRepository {
     suspend fun setSelectedWeekStart(weekStart: String)
     suspend fun selectedDayDate(): String?
     suspend fun setSelectedDayDate(date: String)
-
-    suspend fun autoUpdateEnabled(): Boolean
-    suspend fun setAutoUpdateEnabled(enabled: Boolean)
-
-    suspend fun autoUpdateAsked(): Boolean
-    suspend fun setAutoUpdateAsked(asked: Boolean)
 }

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

@@ -5,7 +5,6 @@ import agzam.vyatsu.ui.info.CallsScreen
 import agzam.vyatsu.ui.schedule.ScheduleScreen
 import agzam.vyatsu.ui.schedule.ScheduleViewModel
 import agzam.vyatsu.ui.settings.SettingsScreen
-import agzam.vyatsu.ui.settings.UpdateViewModel
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
@@ -35,7 +34,6 @@ private enum class HomeTab(val label: String) {
 @Composable
 fun HomeScreen(
     scheduleViewModel: ScheduleViewModel,
-    updateViewModel: UpdateViewModel,
     onSwitchGroup: () -> Unit
 ) {
     var tab by rememberSaveable { mutableStateOf(HomeTab.SCHEDULE) }
@@ -73,7 +71,7 @@ fun HomeScreen(
                 HomeTab.SCHEDULE -> ScheduleScreen(viewModel = scheduleViewModel, onSwitchGroup = onSwitchGroup)
                 HomeTab.CALLS -> CallsScreen()
                 HomeTab.BUILDINGS -> BuildingsScreen()
-                HomeTab.SETTINGS -> SettingsScreen(viewModel = updateViewModel)
+                HomeTab.SETTINGS -> SettingsScreen()
             }
         }
     }

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

@@ -4,31 +4,23 @@ import agzam.vyatsu.domain.model.Day
 import agzam.vyatsu.domain.model.LessonType
 import agzam.vyatsu.domain.model.SchedulePeriod
 import agzam.vyatsu.domain.model.TimeSlot
-import android.widget.Toast
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.Refresh
@@ -41,7 +33,6 @@ import androidx.compose.material3.FilterChipDefaults
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -55,20 +46,14 @@ 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.graphics.compositeOver
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import java.time.DayOfWeek
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 
-
-val hPadding = 16.dp
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
-
     val state by viewModel.uiState.collectAsState()
 
     Column(Modifier.fillMaxSize()) {
@@ -84,7 +69,7 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
             },
             windowInsets = WindowInsets(0.dp)
         )
-        Column(Modifier.fillMaxSize().padding(horizontal = 0.dp, vertical = 0.dp)) {
+        Column(Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 0.dp)) {
             when {
                 state.isSyncing && state.schedule == null -> {
                     Row(
@@ -125,7 +110,7 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                         val dayLabel = if (isTodayDay) "Сегодня " else ""
 
                         Row(
-                            Modifier.fillMaxWidth().padding(horizontal = hPadding),
+                            Modifier.fillMaxWidth(),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
                             Text(
@@ -140,7 +125,7 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                                 onSelect = viewModel::selectWeek
                             )
                         }
-                        HorizontalDivider(Modifier.padding(top = 8.dp, bottom = 0.dp, start = hPadding, end = hPadding))
+                        HorizontalDivider(Modifier.padding(top = 8.dp, bottom = 0.dp))
 
                         DayChips(
                             days = weekDays,
@@ -149,14 +134,14 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
                             onSelect = viewModel::selectDay
                         )
 
-                        HorizontalDivider(Modifier.padding(top=0.dp, start = hPadding, end = hPadding))
+                        HorizontalDivider(Modifier.padding(top=0.dp, bottom = 8.dp))
+
                         if (day.intervals.all { it.lessons.isEmpty() }) {
                             Text("Занятий нет", style = MaterialTheme.typography.bodyLarge)
                         } else {
                             LazyColumn(
                                 modifier = Modifier.weight(1f),
-                                verticalArrangement = Arrangement.spacedBy(8.dp),
-                                contentPadding = PaddingValues(vertical = 8.dp)
+                                verticalArrangement = Arrangement.spacedBy(8.dp)
                             ) {
                                 itemsIndexed(day.intervals) { slotIndex, slot ->
                                     LessonSlot(slotIndex = slotIndex, slot = slot)
@@ -242,7 +227,7 @@ private fun DayChips(
     todayDate: LocalDate?,
     onSelect: (LocalDate) -> Unit
 ) {
-    LazyRow(horizontalArrangement = Arrangement.spacedBy(6.dp), contentPadding = PaddingValues(horizontal = hPadding, vertical = 2.dp),) {
+    LazyRow(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
         items(days, key = { it.date.toEpochDay() }) { day ->
             val selected = selectedDate == day.date
             val isTodayChip = todayDate == day.date
@@ -290,97 +275,59 @@ private fun weekLabel(period: SchedulePeriod): String {
 
 @Composable
 private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
-    val context = LocalContext.current
-    var indexColor = 0
     Column(Modifier.fillMaxWidth()) {
-        Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-            HorizontalDivider(
-                modifier = Modifier.width(10.dp + hPadding).padding(start = hPadding),
-                color = MaterialTheme.colorScheme.primary
-            )
-            Text(
-                "${slotIndex + 1} пара · ${slot.start.format(TIME)}–${slot.end.format(TIME)}",
-                style = MaterialTheme.typography.labelMedium,
-                color = MaterialTheme.colorScheme.primary,
-                modifier = Modifier.padding(horizontal = 4.dp)
-            )
-            HorizontalDivider(color = MaterialTheme.colorScheme.primary, modifier = Modifier.weight(1f).padding(end = hPadding))
-        }
+        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.forEachIndexed { index, lesson ->
-                var baseSurface = Modifier.fillMaxWidth().padding(vertical = 2.dp)
-                if ((indexColor) % 2 != 0) {
-                    baseSurface = baseSurface.background(
-                        MaterialTheme.colorScheme.surfaceContainer
-                    );
-                }
-                indexColor++
-                // XXX:
-                // Убрать SelectionContainer?
-                // Режим редактирования расписания?
-                // Меню на onClick?
-                // Меню на onLongClick?
-                SelectionContainer() {
-                    Column(
-                        baseSurface
-                        // XXX: combinedClickable?
-                        //.combinedClickable(
-                        //    onClick = {
-                        //        Toast.makeText(
-                        //            context,
-                        //            lesson.raw,
-                        //            Toast.LENGTH_SHORT
-                        //        ).show()
-                        //    },
-                        //    onLongClick = {},
-                        //    // TODO: onLongClickLabel = "(Accessibility)"
-                        //),
-                    ) {
-                        var any = false
-
-                        val meta = listOfNotNull(
-                            if (lesson.type == LessonType.OTHER) {
-                                null
-                            } else {
-                                lesson.type.label
-                            },
-                            lesson.subgroup,
-                            lesson.teacher,
-                            lesson.room
-                        ).filter { it.isNotBlank() }.joinToString(" · ")
-
-                        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)
-                            )
-                        }
-
+            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
+                        )
+                    }
+
                 }
             }
         }

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

@@ -1,152 +1,53 @@
 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.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.height
 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.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 
 @Composable
-fun SettingsScreen(viewModel: UpdateViewModel) {
-    val autoEnabled by viewModel.autoEnabled.collectAsState()
-    val updateState by viewModel.updateState.collectAsState()
-
-    LazyColumn(
+fun SettingsScreen() {
+    Column(
         Modifier
-            .fillMaxWidth()
+            .fillMaxSize()
             .windowInsetsPadding(WindowInsets.statusBars)
+            .padding(horizontal = 16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        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()
-        }
+        Spacer(Modifier.height(24.dp))
+        Text(
+            "Настройки",
+            style = MaterialTheme.typography.titleLarge
+        )
+        Spacer(Modifier.weight(1f))
+        Text(
+            "Здесь появятся настройки\n(автоматические обновления и др.)",
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            textAlign = TextAlign.Center
+        )
+        Spacer(Modifier.weight(1f))
+        Text(
+            "Версия ${BuildConfig.VERSION_NAME}",
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            textAlign = TextAlign.Center,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 16.dp)
+        )
     }
 }
-
-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

@@ -1,58 +0,0 @@
-package agzam.vyatsu.ui.settings
-
-import agzam.vyatsu.domain.repository.PreferencesRepository
-import agzam.vyatsu.update.AppUpdater
-import agzam.vyatsu.update.UpdateState
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-
-class UpdateViewModel(
-    private val updater: AppUpdater,
-    private val preferencesRepository: PreferencesRepository
-) : ViewModel() {
-
-    val updateState: StateFlow<UpdateState> = updater.state
-
-    private val _autoEnabled = MutableStateFlow(false)
-    val autoEnabled: StateFlow<Boolean> = _autoEnabled.asStateFlow()
-
-    private val _showFirstRunDialog = MutableStateFlow(false)
-    val showFirstRunDialog: StateFlow<Boolean> = _showFirstRunDialog.asStateFlow()
-
-    init {
-        viewModelScope.launch {
-            _autoEnabled.value = preferencesRepository.autoUpdateEnabled()
-            _showFirstRunDialog.value = !preferencesRepository.autoUpdateAsked()
-        }
-    }
-
-    fun setAutoEnabled(enabled: Boolean) {
-        _autoEnabled.value = enabled
-        updater.setAutoEnabled(enabled)
-        if (enabled && !updater.canRequestInstalls()) {
-            updater.openUnknownSourcesSettings()
-        }
-    }
-
-    fun onFirstRunDecision(enable: Boolean) {
-        _showFirstRunDialog.value = false
-        viewModelScope.launch {
-            preferencesRepository.setAutoUpdateAsked(true)
-        }
-        setAutoEnabled(enable)
-    }
-
-    fun checkNow() = updater.checkForUpdate()
-
-    fun downloadAndInstall() = updater.downloadAndInstall()
-
-    fun installDownloadedApk() = updater.installDownloadedApk()
-
-    fun canRequestInstalls() = updater.canRequestInstalls()
-
-    fun openUnknownSourcesSettings() = updater.openUnknownSourcesSettings()
-}

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

@@ -1,217 +0,0 @@
-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)) {
-            _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/ic_launcher_background.xml

@@ -1,170 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
+<vector
     android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
 </vector>

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

@@ -1,109 +0,0 @@
-<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

@@ -1,35 +0,0 @@
-<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/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

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

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

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

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