From 90b4c1616674fc61e9d22cfa465859e02bc28946 Mon Sep 17 00:00:00 2001 From: GG Bond Date: Sat, 10 Feb 2024 13:30:44 +0800 Subject: [PATCH] Lock drawer on SignInScreen --- .../kotlin/com/hippo/ehviewer/ui/login/SignInScreen.kt | 2 ++ .../kotlin/com/hippo/ehviewer/ui/settings/MyTagsScreen.kt | 8 ++------ .../com/hippo/ehviewer/ui/settings/UConfigScreen.kt | 8 ++------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/login/SignInScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/login/SignInScreen.kt index fedc391a0..0c6a79033 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/login/SignInScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/login/SignInScreen.kt @@ -59,6 +59,7 @@ import com.hippo.ehviewer.Settings import com.hippo.ehviewer.client.EhEngine import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.client.EhUtils +import com.hippo.ehviewer.ui.LockDrawer import com.hippo.ehviewer.ui.StartDestination import com.hippo.ehviewer.ui.destinations.WebViewSignInScreenDestination import com.hippo.ehviewer.ui.openBrowser @@ -78,6 +79,7 @@ import kotlinx.coroutines.Job @Destination @Composable fun SignInScreen(navigator: DestinationsNavigator) { + LockDrawer(true) val windowSizeClass = LocalWindowSizeClass.current val coroutineScope = rememberCoroutineScope() val focusManager = LocalFocusManager.current diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/MyTagsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/MyTagsScreen.kt index d92b3d42e..4270d7311 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/MyTagsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/MyTagsScreen.kt @@ -41,12 +41,8 @@ fun MyTagsScreen(navigator: DestinationsNavigator) { val state = rememberWebViewState(url = url) WebView( state = state, - modifier = Modifier - .padding(paddingValues) - .fillMaxSize(), - onCreated = { - it.setDefaultSettings() - }, + modifier = Modifier.padding(paddingValues).fillMaxSize(), + onCreated = { it.setDefaultSettings() }, ) } } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/UConfigScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/UConfigScreen.kt index cfb226a2e..c37a3d10d 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/UConfigScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/UConfigScreen.kt @@ -65,12 +65,8 @@ fun UConfigScreen(navigator: DestinationsNavigator) { val state = rememberWebViewState(url = url) WebView( state = state, - modifier = Modifier - .padding(paddingValues) - .fillMaxSize(), - onCreated = { - it.setDefaultSettings() - }, + modifier = Modifier.padding(paddingValues).fillMaxSize(), + onCreated = { it.setDefaultSettings() }, factory = { WebView(it).apply { webview.set(this) } }, ) val applyTip = stringResource(id = R.string.apply_tip)