Austin/gkd
1
0
Fork 0
mirror of https://github.com/gkd-kit/gkd.git synced 2024-11-15 19:22:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: upgrade dependency

Browse Source
This commit is contained in:
lisonge 2024-01-27 22:55:38 +08:00
parent 57eb41e860
commit a85966c6dd
15 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/li/songe/gkd/ui/AboutPage.kt
View File

@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.Divider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@ -45,7 +45,7 @@ fun AboutPage() {
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}

4
app/src/main/kotlin/li/songe/gkd/ui/AppItemPage.kt
View File

@ -17,8 +17,8 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Card
@ -119,7 +119,7 @@ fun AppItemPage(
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}

8
app/src/main/kotlin/li/songe/gkd/ui/CategoryPage.kt
View File

@ -13,9 +13,9 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.selection.selectable
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.KeyboardArrowRight
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Card
@ -88,7 +88,7 @@ fun CategoryPage(subsItemId: Long) {
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}
@ -147,7 +147,7 @@ fun CategoryPage(subsItemId: Long) {
fontSize = 14.sp
)
Icon(
imageVector = Icons.Default.KeyboardArrowRight,
imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
contentDescription = null
)
}

4
app/src/main/kotlin/li/songe/gkd/ui/ClickLogPage.kt
View File

@ -12,7 +12,7 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Card
@ -114,7 +114,7 @@ fun ClickLogPage() {
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}

11
app/src/main/kotlin/li/songe/gkd/ui/ControlPage.kt
View File

@ -14,9 +14,9 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
import androidx.compose.material.icons.automirrored.filled.OpenInNew
import androidx.compose.material.icons.filled.Home
import androidx.compose.material.icons.filled.KeyboardArrowRight
import androidx.compose.material.icons.filled.OpenInNew
import androidx.compose.material3.Divider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@ -174,7 +174,7 @@ fun ControlPage() {
color = MaterialTheme.colorScheme.primary,
)
}
Icon(imageVector = Icons.Default.OpenInNew, contentDescription = null)
Icon(imageVector = Icons.AutoMirrored.Filled.OpenInNew, contentDescription = null)
}
Divider()
@ -196,7 +196,10 @@ fun ControlPage() {
text = "如误触可在此快速定位关闭规则", fontSize = 14.sp
)
}
Icon(imageVector = Icons.Default.KeyboardArrowRight, contentDescription = null)
Icon(
imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
contentDescription = null
)
}
Divider()

4
app/src/main/kotlin/li/songe/gkd/ui/DebugPage.kt
View File

@ -19,7 +19,7 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Divider
@ -102,7 +102,7 @@ fun DebugPage() {
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}

4
app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt
View File

@ -16,8 +16,8 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Android
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.Search
import androidx.compose.material.icons.outlined.Close
@ -103,7 +103,7 @@ fun GlobalRuleExcludePage(subsItemId: Long, groupKey: Int) {
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}

4
app/src/main/kotlin/li/songe/gkd/ui/GlobalRulePage.kt
View File

@ -16,8 +16,8 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Card
@ -101,7 +101,7 @@ fun GlobalRulePage(subsItemId: Long, focusGroupKey: Int? = null) {
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}

4
app/src/main/kotlin/li/songe/gkd/ui/GroupItemPage.kt
View File

@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@ -64,7 +64,7 @@ fun GroupItemPage(subsInt: Long, groupKey: Int, appId: String? = null) {
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}

4
app/src/main/kotlin/li/songe/gkd/ui/ImagePreviewPage.kt
View File

@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
@ -38,7 +38,7 @@ fun ImagePreviewPage(
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}

4
app/src/main/kotlin/li/songe/gkd/ui/SnapshotPage.kt
View File

@ -16,7 +16,7 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Card
@ -106,7 +106,7 @@ fun SnapshotPage() {
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}

4
app/src/main/kotlin/li/songe/gkd/ui/SubsManagePage.kt
View File

@ -17,8 +17,8 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.FormatListBulleted
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.FormatListBulleted
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Card
import androidx.compose.material3.Divider
@ -76,7 +76,7 @@ import org.burnoutcrew.reorderable.rememberReorderableLazyListState
import org.burnoutcrew.reorderable.reorderable
val subsNav = BottomNavItem(
label = "订阅", icon = Icons.Default.FormatListBulleted
label = "订阅", icon = Icons.AutoMirrored.Filled.FormatListBulleted
)
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")

4
app/src/main/kotlin/li/songe/gkd/ui/SubsPage.kt
View File

@ -11,8 +11,8 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.outlined.Close
import androidx.compose.material.icons.outlined.Search
import androidx.compose.material3.AlertDialog
@ -117,7 +117,7 @@ fun SubsPage(
navController.popBackStack()
}) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}

4
app/src/main/kotlin/li/songe/gkd/ui/component/SettingItem.kt
View File

@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.KeyboardArrowRight
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@ -20,7 +20,7 @@ import androidx.compose.ui.unit.sp
@Composable
fun SettingItem(
title: String,
imageVector: ImageVector = Icons.Default.KeyboardArrowRight,
imageVector: ImageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
onClick: () -> Unit,
) {
Row(

20
settings.gradle.kts
View File

@ -28,7 +28,7 @@ dependencyResolutionManagement {
versionCatalogs {
create("libs") {
val kotlinVersion = "1.9.21"
val kotlinVersion = "1.9.22"
// use jdk17
version("jdkVersion", JavaVersion.VERSION_17.majorVersion)
version("kotlinVersion", kotlinVersion)
@ -38,7 +38,7 @@ dependencyResolutionManagement {
version("android.buildToolsVersion", "34.0.0")
version("android.minSdk", "26")
val androidLibraryVersion = "8.2.0"
val androidLibraryVersion = "8.2.2"
library("android.gradle", "com.android.tools.build:gradle:$androidLibraryVersion")
plugin("android.library", "com.android.library").version(androidLibraryVersion)
plugin("android.application", "com.android.application").version(androidLibraryVersion)
@ -66,8 +66,8 @@ dependencyResolutionManagement {
// compose 编译器的版本, 需要注意它与 compose 的版本没有关联
// https://mvnrepository.com/artifact/androidx.compose.compiler/compiler
version("compose.compilerVersion", "1.5.7")
val composeVersion = "1.5.4"
version("compose.compilerVersion", "1.5.8")
val composeVersion = "1.6.0"
library("compose.ui", "androidx.compose.ui:ui:$composeVersion")
library("compose.preview", "androidx.compose.ui:ui-tooling-preview:$composeVersion")
library("compose.tooling", "androidx.compose.ui:ui-tooling:$composeVersion")
@ -82,7 +82,7 @@ dependencyResolutionManagement {
library("compose.activity", "androidx.activity:activity-compose:1.8.2")
// https://github.com/Tencent/MMKV/blob/master/README_CN.md
library("tencent.mmkv", "com.tencent:mmkv:1.3.2")
library("tencent.mmkv", "com.tencent:mmkv:1.3.3")
// https://bugly.qq.com/docs/user-guide/instruction-manual-android/
library("tencent.bugly", "com.tencent.bugly:crashreport:4.1.9.3")
@ -115,12 +115,12 @@ dependencyResolutionManagement {
library("others.jankson", "blue.endless:jankson:1.2.3")
// https://github.com/TorryDo/Floating-Bubble-View
library("others.floating.bubble.view", "io.github.torrydo:floating-bubble-view:0.6.3")
library("others.floating.bubble.view", "io.github.torrydo:floating-bubble-view:0.6.4")
library("androidx.appcompat", "androidx.appcompat:appcompat:1.6.1")
library("androidx.core.ktx", "androidx.core:core-ktx:1.12.0")
library(
"androidx.lifecycle.runtime.ktx", "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
"androidx.lifecycle.runtime.ktx", "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
)
library("androidx.junit", "androidx.test.ext:junit:1.1.5")
library("androidx.espresso", "androidx.test.espresso:espresso-core:3.5.1")
@ -135,7 +135,7 @@ dependencyResolutionManagement {
library(
"google.accompanist.drawablepainter",
"com.google.accompanist:accompanist-drawablepainter:0.32.0"
"com.google.accompanist:accompanist-drawablepainter:0.34.0"
)
library("junit", "junit:junit:4.13.2")
@ -175,7 +175,7 @@ dependencyResolutionManagement {
// https://developer.android.com/reference/kotlin/org/json/package-summary
library("org.json", "org.json:json:20210307")
plugin("google.ksp", "com.google.devtools.ksp").version("1.9.21-1.0.16")
plugin("google.ksp", "com.google.devtools.ksp").version("1.9.22-1.0.17")
val hiltVersion = "2.50"
plugin("google.hilt", "com.google.dagger.hilt.android").version(hiltVersion)
@ -189,7 +189,7 @@ dependencyResolutionManagement {
)
// https://github.com/raamcosta/compose-destinations
val destinationsVersion = "1.9.56"
val destinationsVersion = "1.10.0"
library(
"destinations.core",
"io.github.raamcosta.compose-destinations:core:$destinationsVersion"