mirror of
https://github.com/wgtunnel/android.git
synced 2026-07-03 14:07:49 +02:00
merge weblate (#389)
Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org> Co-authored-by: gallegonovato <fran-carro@hotmail.es> Co-authored-by: GeneralTDog <kevin.duy.tran@gmail.com> Co-authored-by: solokot <solokot@gmail.com> Co-authored-by: Kachelkaiser <kachelkaiser@outlook.com> Co-authored-by: Saratoga79 <ordizi79@gmail.com> Co-authored-by: Wojtek Sobczak <mister.adalbert@gmail.com> Co-authored-by: lateweb <weblate@techkoala.net> Co-authored-by: Jasper <jasper@ennik.com> Co-authored-by: GitHub Actions <actions@github.com>
This commit is contained in:
@@ -60,7 +60,8 @@ constructor(
|
||||
val isAppReady = _isAppReady.asStateFlow()
|
||||
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
|
||||
viewModelScope.launch {
|
||||
initPin()
|
||||
initAutoTunnel()
|
||||
initTunnel()
|
||||
@@ -87,7 +88,7 @@ constructor(
|
||||
|
||||
private suspend fun initPin() {
|
||||
val isPinEnabled = appDataRepository.appState.isPinLockEnabled()
|
||||
if(isPinEnabled) PinManager.initialize(WireGuardAutoTunnel.instance)
|
||||
if (isPinEnabled) PinManager.initialize(WireGuardAutoTunnel.instance)
|
||||
}
|
||||
|
||||
private suspend fun initAutoTunnel() {
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import androidx.compose.ui.geometry.Offset
|
||||
import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
|
||||
import androidx.compose.ui.input.nestedscroll.NestedScrollSource
|
||||
|
||||
class NestedScrollListener( val onUp: () -> Unit, val onDown: () -> Unit) : NestedScrollConnection {
|
||||
class NestedScrollListener(val onUp: () -> Unit, val onDown: () -> Unit) : NestedScrollConnection {
|
||||
override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
|
||||
if (available.y < -1) onDown()
|
||||
if (available.y > 1) onUp()
|
||||
|
||||
@@ -100,14 +100,14 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
|
||||
var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
|
||||
|
||||
val nestedScrollConnection = remember {
|
||||
NestedScrollListener({ isFabVisible = false },{ isFabVisible = true })
|
||||
NestedScrollListener({ isFabVisible = false }, { isFabVisible = true })
|
||||
}
|
||||
|
||||
val vpnActivityResultState =
|
||||
rememberLauncherForActivityResult(
|
||||
ActivityResultContracts.StartActivityForResult(),
|
||||
onResult = {
|
||||
if(it.resultCode != RESULT_OK) showVpnPermissionDialog = true
|
||||
if (it.resultCode != RESULT_OK) showVpnPermissionDialog = true
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
+1
-7
@@ -47,7 +47,6 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.hilt.navigation.compose.hiltViewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.zaneschepke.wireguardautotunnel.R
|
||||
import com.zaneschepke.wireguardautotunnel.ui.AppUiState
|
||||
import com.zaneschepke.wireguardautotunnel.ui.Route
|
||||
@@ -67,12 +66,7 @@ import kotlinx.coroutines.delay
|
||||
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
|
||||
@OptIn(ExperimentalLayoutApi::class)
|
||||
@Composable
|
||||
fun OptionsScreen(
|
||||
optionsViewModel: OptionsViewModel = hiltViewModel(),
|
||||
focusRequester: FocusRequester,
|
||||
appUiState: AppUiState,
|
||||
tunnelId: Int,
|
||||
) {
|
||||
fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusRequester: FocusRequester, appUiState: AppUiState, tunnelId: Int) {
|
||||
val scrollState = rememberScrollState()
|
||||
val context = LocalContext.current
|
||||
val navController = LocalNavController.current
|
||||
|
||||
-1
@@ -5,7 +5,6 @@ import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.navigation.NavController
|
||||
import com.zaneschepke.wireguardautotunnel.R
|
||||
import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
|
||||
import com.zaneschepke.wireguardautotunnel.ui.Route
|
||||
|
||||
+1
-7
@@ -60,7 +60,6 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.hilt.navigation.compose.hiltViewModel
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import androidx.navigation.NavController
|
||||
import com.google.accompanist.permissions.ExperimentalPermissionsApi
|
||||
import com.google.accompanist.permissions.isGranted
|
||||
import com.google.accompanist.permissions.rememberPermissionState
|
||||
@@ -92,12 +91,7 @@ import xyz.teamgravity.pin_lock_compose.PinManager
|
||||
ExperimentalLayoutApi::class,
|
||||
)
|
||||
@Composable
|
||||
fun SettingsScreen(
|
||||
viewModel: SettingsViewModel = hiltViewModel(),
|
||||
appViewModel: AppViewModel,
|
||||
uiState: AppUiState,
|
||||
focusRequester: FocusRequester,
|
||||
) {
|
||||
fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel: AppViewModel, uiState: AppUiState, focusRequester: FocusRequester) {
|
||||
val context = LocalContext.current
|
||||
val navController = LocalNavController.current
|
||||
val focusManager = LocalFocusManager.current
|
||||
|
||||
-1
@@ -42,7 +42,6 @@ import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.text.style.TextDecoration
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.navigation.NavController
|
||||
import com.zaneschepke.wireguardautotunnel.BuildConfig
|
||||
import com.zaneschepke.wireguardautotunnel.R
|
||||
import com.zaneschepke.wireguardautotunnel.ui.AppUiState
|
||||
|
||||
@@ -19,7 +19,7 @@ sealed class ThemeColors(
|
||||
val secondary: Color,
|
||||
val onSurface: Color,
|
||||
) {
|
||||
//TODO fix light theme colors
|
||||
// TODO fix light theme colors
|
||||
data object Light : ThemeColors(
|
||||
background = LightGrey,
|
||||
surface = OffWhite,
|
||||
|
||||
@@ -52,7 +52,7 @@ fun WireguardAutoTunnelTheme(
|
||||
}
|
||||
}
|
||||
useDarkTheme -> DarkColorScheme
|
||||
//TODO force dark theme for now until light theme designed
|
||||
// TODO force dark theme for now until light theme designed
|
||||
else -> DarkColorScheme
|
||||
}
|
||||
val view = LocalView.current
|
||||
|
||||
Reference in New Issue
Block a user