From 5740012101041eaacb8118641bc60bb4ef99dfec Mon Sep 17 00:00:00 2001 From: Zane Schepke Date: Mon, 31 Mar 2025 14:30:51 -0400 Subject: [PATCH] chore: fmt and bump hilt --- .../core/service/TunnelForegroundService.kt | 7 +- .../ui/screens/main/MainScreen.kt | 4 +- .../main/components/UrlImportDialog.kt | 71 +++++++++---------- gradle/libs.versions.toml | 2 +- 4 files changed, 40 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/TunnelForegroundService.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/TunnelForegroundService.kt index cbbc0b2d..59d74f3b 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/TunnelForegroundService.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/TunnelForegroundService.kt @@ -173,9 +173,8 @@ class TunnelForegroundService : LifecycleService() { const val STATS_DELAY = 1_000L const val PING_START_DELAY = 30_000L // ipv6 disabled or block on network -// const val userspaceStartFailed = "Failed to send handshake initiation: 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 userspaceStartFailed = "Failed to send handshake initiation: 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" } } diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt index 0e6def6b..83ad6e71 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt @@ -200,7 +200,7 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState) Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID), ) }, - onUrlClick = { showUrlImportDialog = true } + onUrlClick = { showUrlImportDialog = true }, ) if (showUrlImportDialog) { @@ -209,7 +209,7 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState) onConfirm = { url -> viewModel.onUrlImport(url) showUrlImportDialog = false - } + }, ) } diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/UrlImportDialog.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/UrlImportDialog.kt index 9b114b0f..d4a8bd67 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/UrlImportDialog.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/UrlImportDialog.kt @@ -18,41 +18,38 @@ import androidx.compose.ui.unit.dp import com.zaneschepke.wireguardautotunnel.R @Composable -fun UrlImportDialog( - onDismiss: () -> Unit, - onConfirm: (String) -> Unit, -) { - var url by remember { mutableStateOf("") } +fun UrlImportDialog(onDismiss: () -> Unit, onConfirm: (String) -> Unit) { + var url by remember { mutableStateOf("") } - AlertDialog( - onDismissRequest = onDismiss, - title = { Text(stringResource(R.string.add_from_url)) }, - text = { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 8.dp) - ) { - OutlinedTextField( - value = url, - onValueChange = { url = it }, - label = { Text(stringResource(R.string.enter_config_url)) }, - modifier = Modifier.fillMaxWidth() - ) - } - }, - confirmButton = { - TextButton( - onClick = { onConfirm(url) }, - enabled = url.isNotBlank() - ) { - Text(stringResource(R.string.okay)) - } - }, - dismissButton = { - TextButton(onClick = onDismiss) { - Text(stringResource(R.string.cancel)) - } - } - ) -} \ No newline at end of file + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.add_from_url)) }, + text = { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 8.dp), + ) { + OutlinedTextField( + value = url, + onValueChange = { url = it }, + label = { Text(stringResource(R.string.enter_config_url)) }, + modifier = Modifier.fillMaxWidth(), + ) + } + }, + confirmButton = { + TextButton( + onClick = { onConfirm(url) }, + enabled = url.isNotBlank(), + ) { + Text(stringResource(R.string.okay)) + } + }, + dismissButton = { + TextButton(onClick = onDismiss) { + Text(stringResource(R.string.cancel)) + } + }, + ) +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 38e06275..0695d834 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ coreKtx = "1.15.0" datastorePreferences = "1.1.4" desugar_jdk_libs = "2.1.5" espressoCore = "3.6.1" -hiltAndroid = "2.56" +hiltAndroid = "2.56.1" hiltCompiler = "1.2.0" junit = "4.13.2" kotlinx-serialization-json = "1.8.0"