Batyka/zaprett-app
1
0
Fork 0
mirror of https://github.com/CherretGit/zaprett-app.git synced 2025-12-10 13:39:41 +05:00
Code Issues Packages Projects Releases 1 Wiki Activity

update dependencies + m3e

Browse Source
This commit is contained in:
CherretGit
2025-12-07 20:58:01 +07:00
parent 57217bbe1c
commit d00677270a
11 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/cherret/zaprett/MainActivity.kt
View File

@@ -1,3 +1,4 @@
@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
package com.cherret.zaprett
import android.Manifest
@@ -24,6 +25,7 @@ import androidx.compose.material.icons.filled.MultipleStop
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.filled.SettingsInputComposite
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem

2
app/src/main/java/com/cherret/zaprett/ui/screen/DebugScreen.kt
View File

@@ -1,3 +1,4 @@
@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
package com.cherret.zaprett.ui.screen
import android.app.Activity
@@ -16,6 +17,7 @@ import androidx.compose.material3.AlertDialog
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Scaffold

2
app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt
View File

@@ -1,3 +1,4 @@
@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
package com.cherret.zaprett.ui.screen
import android.content.ClipData
@@ -39,6 +40,7 @@ import androidx.compose.material3.AlertDialog
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon

2
app/src/main/java/com/cherret/zaprett/ui/screen/HostsScreen.kt
View File

@@ -1,3 +1,4 @@
@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
package com.cherret.zaprett.ui.screen
import android.content.ClipData
@@ -27,6 +28,7 @@ import androidx.compose.material3.AlertDialog
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold

2
app/src/main/java/com/cherret/zaprett/ui/screen/IpsetsScreen.kt
View File

@@ -1,3 +1,4 @@
@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
package com.cherret.zaprett.ui.screen
import android.content.ClipData
@@ -27,6 +28,7 @@ import androidx.compose.material3.AlertDialog
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold

2
app/src/main/java/com/cherret/zaprett/ui/screen/RepoScreen.kt
View File

@@ -1,3 +1,4 @@
@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
package com.cherret.zaprett.ui.screen
import android.content.ClipData
@@ -15,6 +16,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Scaffold

2
app/src/main/java/com/cherret/zaprett/ui/screen/SettingsScreen.kt
View File

@@ -1,3 +1,4 @@
@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
package com.cherret.zaprett.ui.screen
import android.content.Context
@@ -32,6 +33,7 @@ import androidx.compose.material3.Checkbox
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.ModalBottomSheet

2
app/src/main/java/com/cherret/zaprett/ui/screen/StrategyScreen.kt
View File

@@ -1,3 +1,4 @@
@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
package com.cherret.zaprett.ui.screen
import android.content.ClipData
@@ -24,6 +25,7 @@ import androidx.compose.material3.AlertDialog
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold

2
app/src/main/java/com/cherret/zaprett/ui/screen/StrategySelectionScreen.kt
View File

@@ -1,3 +1,4 @@
@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
package com.cherret.zaprett.ui.screen
import android.content.ClipData
@@ -37,6 +38,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Info
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton

7
app/src/main/java/com/cherret/zaprett/ui/theme/Theme.kt
View File

@@ -2,7 +2,10 @@ package com.cherret.zaprett.ui.theme
import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.MaterialExpressiveTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MotionScheme
import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.material3.dynamicLightColorScheme
@@ -32,6 +35,7 @@ private val LightColorScheme = lightColorScheme(
*/
)
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun ZaprettTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
@@ -49,9 +53,10 @@ fun ZaprettTheme(
else -> LightColorScheme
}
MaterialTheme(
MaterialExpressiveTheme(
colorScheme = colorScheme,
typography = Typography,
motionScheme = MotionScheme.expressive(),
content = content
)
}

18
gradle/libs.versions.toml
View File

@@ -1,21 +1,21 @@
[versions]
agp = "8.13.1"
kotlin = "2.2.10"
kotlin = "2.2.21"
coreKtx = "1.17.0"
junit = "4.13.2"
junitVersion = "1.3.0"
espressoCore = "3.7.0"
lifecycleRuntimeKtx = "2.9.2"
activityCompose = "1.10.1"
composeBom = "2025.08.00"
compose-material3 = "1.3.2"
compose-material3-adaptive = "1.4.0-beta02"
navigation = "2.9.3"
lifecycleRuntimeKtx = "2.10.0"
activityCompose = "1.12.1"
composeBom = "2025.12.00"
compose-material3 = "1.5.0-alpha10"
compose-material3-adaptive = "1.5.0-alpha10"
navigation = "2.9.6"
compose-icons = "1.7.8"
libsu = "6.0.0"
okhttp = "5.1.0"
okhttp = "5.3.2"
serialization = "1.9.0"
firebase-bom = "34.1.0"
firebase-bom = "34.6.0"
fragment-compose = "1.8.9"
coil3 = "3.3.0"
compose-markdown = "0.5.7"