From 54925188e80fabb4ba28aba7190021f3f8a2bfde Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Mon, 2 Jun 2025 02:09:46 +0800 Subject: [PATCH] Optimize interface element spacing and styles --- .../sukisu/ultra/ui/component/SwitchItem.kt | 20 +++++++++----- .../java/com/sukisu/ultra/ui/screen/Home.kt | 27 +++++++++++-------- .../com/sukisu/ultra/ui/screen/Settings.kt | 3 +-- .../com/sukisu/ultra/ui/screen/SuperUser.kt | 5 ++-- 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/component/SwitchItem.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/component/SwitchItem.kt index 4a3d60ea..ca060855 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/component/SwitchItem.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/component/SwitchItem.kt @@ -3,7 +3,10 @@ package com.sukisu.ultra.ui.component import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.tween import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material3.Icon @@ -73,13 +76,16 @@ fun SwitchItem( }, supportingContent = summary?.let { { - Text( - text = it, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = Int.MAX_VALUE, - overflow = TextOverflow.Ellipsis - ) + Column { + Spacer(modifier = Modifier.height(3.dp)) + Text( + text = it, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = Int.MAX_VALUE, + overflow = TextOverflow.Ellipsis + ) + } } }, leadingContent = icon?.let { diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt index 75b3f296..b77f1abe 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt @@ -406,16 +406,21 @@ private fun StatusCard( Spacer(Modifier.width(6.dp)) // 架构标签 - Surface( - shape = RoundedCornerShape(4.dp), - color = MaterialTheme.colorScheme.primary, - modifier = Modifier - ) { - Text( - text = Os.uname().machine, - style = MaterialTheme.typography.labelMedium, - modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp) - ) + if (Os.uname().machine != "aarch64") { + Surface( + shape = RoundedCornerShape(4.dp), + color = MaterialTheme.colorScheme.primary, + modifier = Modifier + ) { + Text( + text = Os.uname().machine, + style = MaterialTheme.typography.labelMedium, + modifier = Modifier.padding( + horizontal = 6.dp, + vertical = 2.dp + ) + ) + } } } @@ -671,7 +676,7 @@ private fun InfoCard( imageVector = icon, contentDescription = label, modifier = Modifier.size(24.dp), - tint = MaterialTheme.colorScheme.primary.copy(alpha = 0.7f), + tint = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.width(16.dp)) Column( diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt index 93df089c..dbb64d17 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt @@ -13,7 +13,6 @@ import androidx.compose.animation.fadeOut import androidx.compose.animation.shrinkVertically import androidx.compose.foundation.background import androidx.compose.foundation.clickable -import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.* import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape @@ -54,7 +53,6 @@ import kotlinx.coroutines.withContext import com.sukisu.ultra.BuildConfig import com.sukisu.ultra.Natives import com.sukisu.ultra.R -import com.sukisu.ultra.* import com.sukisu.ultra.ui.component.* import com.sukisu.ultra.ui.theme.* import com.sukisu.ultra.ui.theme.CardConfig.cardAlpha @@ -521,6 +519,7 @@ fun SettingItem( text = title, style = MaterialTheme.typography.titleMedium, ) + Spacer(modifier = Modifier.height(3.dp)) if (summary != null) { Text( text = summary, diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt index 2835a14a..5126d03c 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt @@ -646,10 +646,11 @@ private fun AppItem( viewModel: SuperUserViewModel ) { Card( - colors = getCardColors(if (CardConfig.isCustomBackgroundEnabled) Color.Transparent else MaterialTheme.colorScheme.surfaceContainerHigh), + colors = getCardColors(MaterialTheme.colorScheme.surfaceContainerHigh), elevation = getCardElevation(), modifier = Modifier - .padding(vertical = 8.dp) + .padding(horizontal = 24.dp) + .padding(vertical = 2.dp) .pointerInput(Unit) { detectTapGestures( onLongPress = { onLongClick() },