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

perf: style

Browse Source
This commit is contained in:
lisonge 2024-03-08 12:12:04 +08:00
parent 8efeaebd03
commit a4761dacdd
5 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/li/songe/gkd/ui/AppConfigPage.kt
View File

@ -16,6 +16,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Edit
import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalContentColor
@ -134,6 +135,11 @@ fun AppConfigPage(appId: String) {
} }
} }
} }
item {
if (globalGroups.isNotEmpty() && appGroups.isNotEmpty()) {
HorizontalDivider()
}
}
items(appGroups) { g -> items(appGroups) { g ->
AppGroupCard(g.group, g.enable, onClick = { AppGroupCard(g.group, g.enable, onClick = {
navController.navigate( navController.navigate(

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

@ -242,19 +242,14 @@ fun GlobalRuleExcludePage(subsItemId: Long, groupKey: Int) {
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
if (appInfo.icon != null) { if (appInfo.icon != null) {
Box( Image(
painter = rememberDrawablePainter(appInfo.icon),
contentDescription = null,
modifier = Modifier modifier = Modifier
.fillMaxHeight() .fillMaxHeight()
.aspectRatio(1f) .height(1.dp)
) { .padding(4.dp)
Image( )
painter = rememberDrawablePainter(appInfo.icon),
contentDescription = null,
modifier = Modifier
.matchParentSize()
.padding(4.dp)
)
}
} else { } else {
Icon( Icon(
imageVector = Icons.Default.Android, imageVector = Icons.Default.Android,

17
app/src/main/kotlin/li/songe/gkd/ui/component/SubsAppCard.kt
View File

@ -68,19 +68,14 @@ fun SubsAppCard(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
if (appInfo?.icon != null) { if (appInfo?.icon != null) {
Box( Image(
painter = rememberDrawablePainter(appInfo.icon),
contentDescription = null,
modifier = Modifier modifier = Modifier
.fillMaxHeight() .fillMaxHeight()
.aspectRatio(1f) .height(1.dp)
) { .padding(4.dp)
Image( )
painter = rememberDrawablePainter(appInfo.icon),
contentDescription = null,
modifier = Modifier
.matchParentSize()
.padding(4.dp)
)
}
} else { } else {
Icon( Icon(
imageVector = Icons.Default.Android, imageVector = Icons.Default.Android,

17
app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt
View File

@ -238,19 +238,14 @@ fun useAppListPage(): ScaffoldExt {
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
if (appInfo.icon != null) { if (appInfo.icon != null) {
Box( Image(
painter = rememberDrawablePainter(appInfo.icon),
contentDescription = null,
modifier = Modifier modifier = Modifier
.fillMaxHeight() .fillMaxHeight()
.aspectRatio(1f) .height(1.dp)
) { .padding(4.dp)
Image( )
painter = rememberDrawablePainter(appInfo.icon),
contentDescription = null,
modifier = Modifier
.matchParentSize()
.padding(4.dp)
)
}
} else { } else {
Icon( Icon(
imageVector = Icons.Default.Android, imageVector = Icons.Default.Android,

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

@ -29,6 +29,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
@ -240,7 +241,11 @@ fun useControlPage(): ScaffoldExt {
Text(text = subsStatus, fontSize = 18.sp) Text(text = subsStatus, fontSize = 18.sp)
if (latestRecordDesc != null) { if (latestRecordDesc != null) {
Text( Text(
text = "最近点击: $latestRecordDesc", fontSize = 14.sp text = "最近点击: $latestRecordDesc",
fontSize = 14.sp,
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis
) )
} }
} }