chore: fmt and bump hilt

This commit is contained in:
Zane Schepke
2025-03-31 14:30:51 -04:00
parent 6f5bb24cfa
commit 5740012101
4 changed files with 40 additions and 44 deletions
@@ -173,9 +173,8 @@ class TunnelForegroundService : LifecycleService() {
const val STATS_DELAY = 1_000L const val STATS_DELAY = 1_000L
const val PING_START_DELAY = 30_000L const val PING_START_DELAY = 30_000L
// ipv6 disabled or block on network // ipv6 disabled or block on network
// const val userspaceStartFailed = "Failed to send handshake initiation: write udp [::]" // const val userspaceStartFailed = "Failed to send handshake initiation: write udp [::]"
// const val ipv6Fails = "Failed to send data packets: write udp [::]" // const val ipv6Fails = "Failed to send data packets: write udp [::]"
// const val ipv4Fails = "Failed to send data packets: write udp 0.0.0.0:51820" // const val ipv4Fails = "Failed to send data packets: write udp 0.0.0.0:51820"
} }
} }
@@ -200,7 +200,7 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState)
Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID), Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID),
) )
}, },
onUrlClick = { showUrlImportDialog = true } onUrlClick = { showUrlImportDialog = true },
) )
if (showUrlImportDialog) { if (showUrlImportDialog) {
@@ -209,7 +209,7 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState)
onConfirm = { url -> onConfirm = { url ->
viewModel.onUrlImport(url) viewModel.onUrlImport(url)
showUrlImportDialog = false showUrlImportDialog = false
} },
) )
} }
@@ -18,41 +18,38 @@ import androidx.compose.ui.unit.dp
import com.zaneschepke.wireguardautotunnel.R import com.zaneschepke.wireguardautotunnel.R
@Composable @Composable
fun UrlImportDialog( fun UrlImportDialog(onDismiss: () -> Unit, onConfirm: (String) -> Unit) {
onDismiss: () -> Unit, var url by remember { mutableStateOf("") }
onConfirm: (String) -> Unit,
) {
var url by remember { mutableStateOf("") }
AlertDialog( AlertDialog(
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
title = { Text(stringResource(R.string.add_from_url)) }, title = { Text(stringResource(R.string.add_from_url)) },
text = { text = {
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(vertical = 8.dp) .padding(vertical = 8.dp),
) { ) {
OutlinedTextField( OutlinedTextField(
value = url, value = url,
onValueChange = { url = it }, onValueChange = { url = it },
label = { Text(stringResource(R.string.enter_config_url)) }, label = { Text(stringResource(R.string.enter_config_url)) },
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth(),
) )
} }
}, },
confirmButton = { confirmButton = {
TextButton( TextButton(
onClick = { onConfirm(url) }, onClick = { onConfirm(url) },
enabled = url.isNotBlank() enabled = url.isNotBlank(),
) { ) {
Text(stringResource(R.string.okay)) Text(stringResource(R.string.okay))
} }
}, },
dismissButton = { dismissButton = {
TextButton(onClick = onDismiss) { TextButton(onClick = onDismiss) {
Text(stringResource(R.string.cancel)) Text(stringResource(R.string.cancel))
} }
} },
) )
} }
+1 -1
View File
@@ -9,7 +9,7 @@ coreKtx = "1.15.0"
datastorePreferences = "1.1.4" datastorePreferences = "1.1.4"
desugar_jdk_libs = "2.1.5" desugar_jdk_libs = "2.1.5"
espressoCore = "3.6.1" espressoCore = "3.6.1"
hiltAndroid = "2.56" hiltAndroid = "2.56.1"
hiltCompiler = "1.2.0" hiltCompiler = "1.2.0"
junit = "4.13.2" junit = "4.13.2"
kotlinx-serialization-json = "1.8.0" kotlinx-serialization-json = "1.8.0"