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

Fix blank space above OutboundPickerScreen title

Browse Source
This commit is contained in:
世界
2026-04-10 22:44:21 +08:00
parent 21b59cffef
commit d4d4091435
1 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
app/src/main/java/io/nekohasekai/sfa/compose/screen/tools/OutboundPickerScreen.kt
View File

@@ -22,7 +22,6 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBar
@@ -46,6 +45,7 @@ import androidx.navigation.NavController
import io.nekohasekai.libbox.Libbox import io.nekohasekai.libbox.Libbox
import io.nekohasekai.sfa.R import io.nekohasekai.sfa.R
import io.nekohasekai.sfa.compose.model.GroupItem import io.nekohasekai.sfa.compose.model.GroupItem
import io.nekohasekai.sfa.compose.topbar.OverrideTopBar
import io.nekohasekai.sfa.utils.CommandClient import io.nekohasekai.sfa.utils.CommandClient
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
@@ -111,64 +111,61 @@ fun OutboundPickerScreen(
navController.navigateUp() navController.navigateUp()
} }
Scaffold( OverrideTopBar {
topBar = { TopAppBar(
TopAppBar( title = { Text(stringResource(R.string.tool_outbound)) },
title = { Text(stringResource(R.string.tool_outbound)) }, navigationIcon = {
navigationIcon = { IconButton(onClick = { navController.navigateUp() }) {
IconButton(onClick = { navController.navigateUp() }) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null,
)
}
},
)
},
) { innerPadding ->
Column(
modifier = Modifier
.fillMaxSize()
.padding(innerPadding),
) {
OutlinedTextField(
value = searchText,
onValueChange = { searchText = it },
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 8.dp),
placeholder = { Text(stringResource(android.R.string.search_go)) },
leadingIcon = {
Icon( Icon(
imageVector = Icons.Default.Search, imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null, contentDescription = null,
) )
}, }
singleLine = true, },
shape = RoundedCornerShape(12.dp), )
) }
LazyColumn(modifier = Modifier.fillMaxSize()) { Column(
item { modifier = Modifier
OutboundPickerItem( .fillMaxSize(),
tag = stringResource(R.string.tool_default_outbound), ) {
isSelected = selectedOutbound.isEmpty(), OutlinedTextField(
onClick = { selectOutbound("") }, value = searchText,
) onValueChange = { searchText = it },
HorizontalDivider( modifier = Modifier
modifier = Modifier.padding(horizontal = 16.dp), .fillMaxWidth()
color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f), .padding(horizontal = 16.dp, vertical = 8.dp),
) placeholder = { Text(stringResource(android.R.string.search_go)) },
} leadingIcon = {
items(filteredOutbounds, key = { it.tag }) { item -> Icon(
OutboundPickerItem( imageVector = Icons.Default.Search,
tag = item.tag, contentDescription = null,
type = Libbox.proxyDisplayType(item.type), )
urlTestDelay = item.urlTestDelay, },
isSelected = selectedOutbound == item.tag, singleLine = true,
onClick = { selectOutbound(item.tag) }, shape = RoundedCornerShape(12.dp),
) )
}
LazyColumn(modifier = Modifier.fillMaxSize()) {
item {
OutboundPickerItem(
tag = stringResource(R.string.tool_default_outbound),
isSelected = selectedOutbound.isEmpty(),
onClick = { selectOutbound("") },
)
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp),
color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f),
)
}
items(filteredOutbounds, key = { it.tag }) { item ->
OutboundPickerItem(
tag = item.tag,
type = Libbox.proxyDisplayType(item.type),
urlTestDelay = item.urlTestDelay,
isSelected = selectedOutbound == item.tag,
onClick = { selectOutbound(item.tag) },
)
} }
} }
} }