Fix situations where Clash mode is too long

This commit is contained in:
世界
2026-01-01 17:16:08 +08:00
parent cb9ee66251
commit 6464348e78

View File

@@ -1,5 +1,9 @@
package io.nekohasekai.sfa.compose.screen.dashboard
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
@@ -8,21 +12,33 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.UnfoldMore
import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.outlined.Tune
import androidx.compose.material3.Card
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SegmentedButton
import androidx.compose.material3.SegmentedButtonDefaults
import androidx.compose.material3.SingleChoiceSegmentedButtonRow
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.rememberTextMeasurer
import androidx.compose.ui.unit.dp
import io.nekohasekai.sfa.R
@@ -62,6 +78,31 @@ fun ClashModeCard(
Spacer(modifier = Modifier.height(12.dp))
BoxWithConstraints(
modifier = Modifier.fillMaxWidth(),
) {
val textMeasurer = rememberTextMeasurer()
val textStyle = MaterialTheme.typography.labelLarge
val density = LocalDensity.current
val totalTextWidth = remember(modes, textStyle, density) {
modes.sumOf { mode ->
textMeasurer.measure(mode, textStyle).size.width
}
}
val buttonPadding = with(density) { (24.dp * modes.size).roundToPx() }
val estimatedWidth = totalTextWidth + buttonPadding
val availableWidth = with(density) { maxWidth.roundToPx() }
val useDropdown = estimatedWidth > availableWidth
if (useDropdown) {
ModeDropdown(
modes = modes,
selectedMode = selectedMode,
onModeSelected = onModeSelected,
)
} else {
SingleChoiceSegmentedButtonRow(
modifier = Modifier.fillMaxWidth(),
) {
@@ -82,3 +123,71 @@ fun ClashModeCard(
}
}
}
}
}
@Composable
private fun ModeDropdown(
modes: List<String>,
selectedMode: String,
onModeSelected: (String) -> Unit,
) {
var expanded by remember { mutableStateOf(false) }
Box(modifier = Modifier.fillMaxWidth()) {
Surface(
onClick = { expanded = true },
shape = RoundedCornerShape(12.dp),
color = if (isSystemInDarkTheme()) {
MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)
} else {
MaterialTheme.colorScheme.surfaceDim
},
modifier = Modifier.fillMaxWidth(),
) {
Row(
modifier =
Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 12.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Text(
text = selectedMode,
style = MaterialTheme.typography.bodyLarge,
modifier = Modifier.weight(1f),
)
Icon(
imageVector = Icons.Default.UnfoldMore,
contentDescription = null,
modifier = Modifier.size(20.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
DropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false },
) {
modes.forEach { mode ->
DropdownMenuItem(
text = { Text(mode) },
onClick = {
onModeSelected(mode)
expanded = false
},
leadingIcon = {
if (mode == selectedMode) {
Icon(
imageVector = Icons.Default.Check,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
)
}
},
)
}
}
}
}