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

perf: GroupImagePage title
Some checks are pending
Build-Apk / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
lisonge 2024-06-17 01:20:11 +08:00
parent 24fe493d11
commit 0c22917b19
3 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ import li.songe.gkd.data.stringify
import li.songe.gkd.db.DbSet
import li.songe.gkd.ui.component.TowLineText
import li.songe.gkd.ui.component.getDialogResult
import li.songe.gkd.ui.destinations.GroupItemPageDestination
import li.songe.gkd.ui.destinations.GroupImagePageDestination
import li.songe.gkd.ui.style.itemPadding
import li.songe.gkd.util.LocalNavController
import li.songe.gkd.util.ProfileTransitions
@ -360,7 +360,7 @@ fun AppItemPage(
TextButton(onClick = {
setShowGroupItem(null)
navController.navigate(
GroupItemPageDestination(
GroupImagePageDestination(
subsInt = subsItemId,
groupKey = showGroupItemVal.key,
appId = appId,

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

@ -66,7 +66,7 @@ import li.songe.gkd.db.DbSet
import li.songe.gkd.ui.component.TowLineText
import li.songe.gkd.ui.component.getDialogResult
import li.songe.gkd.ui.destinations.GlobalRuleExcludePageDestination
import li.songe.gkd.ui.destinations.GroupItemPageDestination
import li.songe.gkd.ui.destinations.GroupImagePageDestination
import li.songe.gkd.ui.style.itemPadding
import li.songe.gkd.util.LocalNavController
import li.songe.gkd.util.ProfileTransitions
@ -468,7 +468,7 @@ fun GlobalRulePage(subsItemId: Long, focusGroupKey: Int? = null) {
TextButton(onClick = {
setShowGroupItem(null)
navController.navigate(
GroupItemPageDestination(
GroupImagePageDestination(
subsInt = subsItemId,
groupKey = showGroupItem.key
)

32
app/src/main/kotlin/li/songe/gkd/ui/GroupItemPage.kt → app/src/main/kotlin/li/songe/gkd/ui/GroupImagePage.kt
View File

@ -30,17 +30,18 @@ import coil.request.ImageRequest
import com.ramcosta.composedestinations.annotation.Destination
import com.ramcosta.composedestinations.annotation.RootNavGraph
import li.songe.gkd.data.RawSubscription
import li.songe.gkd.ui.component.TowLineText
import li.songe.gkd.util.LocalNavController
import li.songe.gkd.util.ProfileTransitions
import li.songe.gkd.util.appInfoCacheFlow
import li.songe.gkd.util.imageLoader
import li.songe.gkd.util.subsIdToRawFlow
// TODO 在 app debug 模式下存在严重绘制错误问题
@RootNavGraph
@Destination(style = ProfileTransitions::class)
@Composable
fun GroupItemPage(subsInt: Long, groupKey: Int, appId: String? = null) {
fun GroupImagePage(subsInt: Long, groupKey: Int, appId: String? = null) {
val context = LocalContext.current
val navController = LocalNavController.current
val subsIdToRaw by subsIdToRawFlow.collectAsState()
@ -56,7 +57,6 @@ fun GroupItemPage(subsInt: Long, groupKey: Int, appId: String? = null) {
is RawSubscription.RawGlobalGroup -> group.allExampleUrls
else -> emptyList()
}
val appInfoCache by appInfoCacheFlow.collectAsState()
Box(modifier = Modifier.fillMaxSize()) {
TopAppBar(
navigationIcon = {
@ -70,29 +70,13 @@ fun GroupItemPage(subsInt: Long, groupKey: Int, appId: String? = null) {
}
},
title = {
when (group) {
is RawSubscription.RawAppGroup -> {
Text(
text = ((rawSubs?.name
?: subsInt.toString()) + "/" + (appInfoCache[appId]?.name
?: rawApp?.name
?: appId) + "/" + (group.name))
)
}
is RawSubscription.RawGlobalGroup -> {
Text(
text = "${rawSubs?.name ?: subsInt}/${group.name}"
)
}
else -> {
Text(text = "未知规则")
}
if (group != null) {
TowLineText(
title = rawSubs?.name ?: subsInt.toString(),
subTitle = group.name
)
}
},
actions = {},
modifier = Modifier.zIndex(1f),
colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.background.copy(alpha = 0.5f)