ppn/wgtunnel-android
3
0
Fork 0
mirror of https://github.com/wgtunnel/android.git synced 2026-07-03 14:07:49 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: androidtv multiple tunnel control

Browse Source 
Fixes a bug where androidTV was only allowing control of a single tunnel.
Closes #268
This commit is contained in:
Zane Schepke
2024-07-27 06:04:25 -04:00
parent ac18ac8274
commit 547686069f
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/RowListItem.kt
+5 -2
View File
@@ -15,6 +15,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
@@ -31,11 +33,12 @@ fun RowListItem(
onClick: () -> Unit,
rowButton: @Composable () -> Unit,
expanded: Boolean,
statistics: TunnelStatistics?
statistics: TunnelStatistics?,
focusRequester: FocusRequester,
) {
Box(
modifier =
Modifier
Modifier.focusRequester(focusRequester)
.animateContentSize()
.clip(RoundedCornerShape(30.dp))
.combinedClickable(
app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt
+14 -4
View File
@@ -489,6 +489,7 @@ fun MainScreen(
}
item {
if (uiState.settings.isAutoTunnelEnabled) {
val itemFocusRequester = remember { FocusRequester() }
val autoTunnelingLabel = buildAnnotatedString {
append(stringResource(id = R.string.auto_tunneling))
append(": ")
@@ -516,22 +517,29 @@ fun MainScreen(
rowButton = {
if (uiState.settings.isAutoTunnelPaused) {
TextButton(
modifier = Modifier.focusRequester(itemFocusRequester),
onClick = { viewModel.resumeAutoTunneling() },
) {
Text(stringResource(id = R.string.resume))
}
} else {
TextButton(
modifier = Modifier.focusRequester(itemFocusRequester),
onClick = { viewModel.pauseAutoTunneling() },
) {
Text(stringResource(id = R.string.pause))
}
}
},
onClick = {},
onClick = {
if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
itemFocusRequester.requestFocus()
}
},
onHold = {},
expanded = false,
statistics = null,
focusRequester = focusRequester
)
}
}
@@ -562,6 +570,7 @@ fun MainScreen(
} else {
Color.Gray
})
val itemFocusRequester = remember { FocusRequester() }
val expanded = remember { mutableStateOf(false) }
RowListItem(
icon = {
@@ -607,11 +616,12 @@ fun MainScreen(
}
} else {
selectedTunnel = tunnel
focusRequester.requestFocus()
itemFocusRequester.requestFocus()
}
},
statistics = uiState.vpnState.statistics,
expanded = expanded.value,
focusRequester = focusRequester,
rowButton = {
if (
tunnel.id == selectedTunnel?.id &&
@@ -667,7 +677,7 @@ fun MainScreen(
@Composable
fun TunnelSwitch() =
Switch(
modifier = Modifier.focusRequester(focusRequester),
modifier = Modifier.focusRequester(itemFocusRequester),
checked = checked,
onCheckedChange = { checked ->
if (!checked) expanded.value = false
@@ -678,7 +688,7 @@ fun MainScreen(
Row {
IconButton(
onClick = {
if (uiState.settings.isAutoTunnelEnabled) {
if (uiState.settings.isAutoTunnelEnabled && !uiState.settings.isAutoTunnelPaused) {
appViewModel.showSnackbarMessage(
context.getString(R.string.turn_off_auto),
)