icybear/sing-box-for-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix debug title still visible

Browse Source
This commit is contained in:
世界
2025-12-16 15:49:38 +08:00
parent e07da1bf5a
commit 9db8dfa1cf
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/io/nekohasekai/sfa/compose/screen/dashboard/DashboardSettingsBottomSheet.kt
View File

@@ -64,6 +64,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex import androidx.compose.ui.zIndex
import io.nekohasekai.sfa.BuildConfig
import io.nekohasekai.sfa.R import io.nekohasekai.sfa.R
@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
@@ -77,13 +78,17 @@ fun DashboardSettingsBottomSheet(
onResetOrder: () -> Unit, onResetOrder: () -> Unit,
onDismiss: () -> Unit, onDismiss: () -> Unit,
) { ) {
var reorderedList by remember(cardOrder) { mutableStateOf(cardOrder) } val filteredCardOrder =
var currentVisibleCards by remember(visibleCards) { mutableStateOf(visibleCards) } if (BuildConfig.DEBUG) cardOrder else cardOrder.filter { it != CardGroup.Debug }
val filteredVisibleCards =
if (BuildConfig.DEBUG) visibleCards else visibleCards.filter { it != CardGroup.Debug }.toSet()
var reorderedList by remember(filteredCardOrder) { mutableStateOf(filteredCardOrder) }
var currentVisibleCards by remember(filteredVisibleCards) { mutableStateOf(filteredVisibleCards) }
// Update local state when props change (e.g., after reset) // Update local state when props change (e.g., after reset)
LaunchedEffect(cardOrder, visibleCards) { LaunchedEffect(filteredCardOrder, filteredVisibleCards) {
reorderedList = cardOrder reorderedList = filteredCardOrder
currentVisibleCards = visibleCards currentVisibleCards = filteredVisibleCards
} }
val hapticFeedback = LocalHapticFeedback.current val hapticFeedback = LocalHapticFeedback.current
@@ -158,22 +163,22 @@ fun DashboardSettingsBottomSheet(
TextButton( TextButton(
onClick = { onClick = {
val defaultOrder = val defaultOrder =
listOf( listOfNotNull(
CardGroup.ClashMode, CardGroup.ClashMode,
CardGroup.UploadTraffic, CardGroup.UploadTraffic,
CardGroup.DownloadTraffic, CardGroup.DownloadTraffic,
CardGroup.Debug, if (BuildConfig.DEBUG) CardGroup.Debug else null,
CardGroup.Connections, CardGroup.Connections,
CardGroup.SystemProxy, CardGroup.SystemProxy,
CardGroup.Profiles, CardGroup.Profiles,
CardGroup.Groups, CardGroup.Groups,
) )
val allCardsEnabled = val allCardsEnabled =
setOf( setOfNotNull(
CardGroup.ClashMode, CardGroup.ClashMode,
CardGroup.UploadTraffic, CardGroup.UploadTraffic,
CardGroup.DownloadTraffic, CardGroup.DownloadTraffic,
CardGroup.Debug, if (BuildConfig.DEBUG) CardGroup.Debug else null,
CardGroup.Connections, CardGroup.Connections,
CardGroup.SystemProxy, CardGroup.SystemProxy,
CardGroup.Profiles, CardGroup.Profiles,