Optimize interface element spacing and styles

This commit is contained in:
ShirkNeko
2025-06-02 02:09:46 +08:00
parent 53b3e84890
commit 54925188e8
4 changed files with 33 additions and 22 deletions

View File

@@ -3,7 +3,10 @@ package com.sukisu.ultra.ui.component
import androidx.compose.animation.animateColorAsState import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.tween import androidx.compose.animation.core.tween
import androidx.compose.foundation.clickable 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.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
@@ -73,13 +76,16 @@ fun SwitchItem(
}, },
supportingContent = summary?.let { supportingContent = summary?.let {
{ {
Text( Column {
text = it, Spacer(modifier = Modifier.height(3.dp))
style = MaterialTheme.typography.bodyMedium, Text(
color = MaterialTheme.colorScheme.onSurfaceVariant, text = it,
maxLines = Int.MAX_VALUE, style = MaterialTheme.typography.bodyMedium,
overflow = TextOverflow.Ellipsis color = MaterialTheme.colorScheme.onSurfaceVariant,
) maxLines = Int.MAX_VALUE,
overflow = TextOverflow.Ellipsis
)
}
} }
}, },
leadingContent = icon?.let { leadingContent = icon?.let {

View File

@@ -406,16 +406,21 @@ private fun StatusCard(
Spacer(Modifier.width(6.dp)) Spacer(Modifier.width(6.dp))
// 架构标签 // 架构标签
Surface( if (Os.uname().machine != "aarch64") {
shape = RoundedCornerShape(4.dp), Surface(
color = MaterialTheme.colorScheme.primary, shape = RoundedCornerShape(4.dp),
modifier = Modifier color = MaterialTheme.colorScheme.primary,
) { modifier = Modifier
Text( ) {
text = Os.uname().machine, Text(
style = MaterialTheme.typography.labelMedium, text = Os.uname().machine,
modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp) style = MaterialTheme.typography.labelMedium,
) modifier = Modifier.padding(
horizontal = 6.dp,
vertical = 2.dp
)
)
}
} }
} }
@@ -671,7 +676,7 @@ private fun InfoCard(
imageVector = icon, imageVector = icon,
contentDescription = label, contentDescription = label,
modifier = Modifier.size(24.dp), modifier = Modifier.size(24.dp),
tint = MaterialTheme.colorScheme.primary.copy(alpha = 0.7f), tint = MaterialTheme.colorScheme.primary,
) )
Spacer(modifier = Modifier.width(16.dp)) Spacer(modifier = Modifier.width(16.dp))
Column( Column(

View File

@@ -13,7 +13,6 @@ import androidx.compose.animation.fadeOut
import androidx.compose.animation.shrinkVertically import androidx.compose.animation.shrinkVertically
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
@@ -54,7 +53,6 @@ import kotlinx.coroutines.withContext
import com.sukisu.ultra.BuildConfig import com.sukisu.ultra.BuildConfig
import com.sukisu.ultra.Natives import com.sukisu.ultra.Natives
import com.sukisu.ultra.R import com.sukisu.ultra.R
import com.sukisu.ultra.*
import com.sukisu.ultra.ui.component.* import com.sukisu.ultra.ui.component.*
import com.sukisu.ultra.ui.theme.* import com.sukisu.ultra.ui.theme.*
import com.sukisu.ultra.ui.theme.CardConfig.cardAlpha import com.sukisu.ultra.ui.theme.CardConfig.cardAlpha
@@ -521,6 +519,7 @@ fun SettingItem(
text = title, text = title,
style = MaterialTheme.typography.titleMedium, style = MaterialTheme.typography.titleMedium,
) )
Spacer(modifier = Modifier.height(3.dp))
if (summary != null) { if (summary != null) {
Text( Text(
text = summary, text = summary,

View File

@@ -646,10 +646,11 @@ private fun AppItem(
viewModel: SuperUserViewModel viewModel: SuperUserViewModel
) { ) {
Card( Card(
colors = getCardColors(if (CardConfig.isCustomBackgroundEnabled) Color.Transparent else MaterialTheme.colorScheme.surfaceContainerHigh), colors = getCardColors(MaterialTheme.colorScheme.surfaceContainerHigh),
elevation = getCardElevation(), elevation = getCardElevation(),
modifier = Modifier modifier = Modifier
.padding(vertical = 8.dp) .padding(horizontal = 24.dp)
.padding(vertical = 2.dp)
.pointerInput(Unit) { .pointerInput(Unit) {
detectTapGestures( detectTapGestures(
onLongPress = { onLongClick() }, onLongPress = { onLongClick() },