dc1abd3 for CookieSignInScreen.kt

UjuiUjuMandan · May 19, 2024 · 4fb3b35 · 4fb3b35
1 parent 0753d42
commit 4fb3b35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
@@ -28,9 +28,7 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -51,6 +49,7 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.window.core.layout.WindowWidthSizeClass
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhEngine
@@ -59,6 +58,7 @@ import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.ui.StartDestination
 import com.hippo.ehviewer.ui.screen.popNavigate
 import com.hippo.ehviewer.ui.tools.LocalDialogState
+import com.hippo.ehviewer.ui.tools.LocalWindowSizeClass
 import com.hippo.ehviewer.util.ExceptionUtils
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
@@ -73,7 +73,7 @@ import kotlinx.coroutines.launch
 @Destination<RootGraph>
 @Composable
 fun CookieSignInScene(navigator: DestinationsNavigator) {
-    val windowSizeClass = compositionLocalOf<androidx.compose.material3.windowsizeclass.WindowSizeClass> { error("CompositionLocal LocalWindowSizeClass not present!") }.current
+    val windowSizeClass = LocalWindowSizeClass.current
     val clipboardManager = LocalClipboardManager.current
     val focusManager = LocalFocusManager.current
     val snackbarHostState = remember { SnackbarHostState() }
@@ -253,8 +253,8 @@ fun CookieSignInScene(navigator: DestinationsNavigator) {
 
     Box(contentAlignment = Alignment.Center) {
         Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }) { padding ->
-            when (windowSizeClass.widthSizeClass) {
-                WindowWidthSizeClass.Compact, WindowWidthSizeClass.Medium -> {
+            when (windowSizeClass.windowWidthSizeClass) {
+                WindowWidthSizeClass.COMPACT, WindowWidthSizeClass.MEDIUM -> {
                     Column(
                         modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(padding).padding(dimensionResource(id = R.dimen.keyline_margin)),
                         horizontalAlignment = Alignment.CenterHorizontally,
@@ -281,7 +281,7 @@ fun CookieSignInScene(navigator: DestinationsNavigator) {
                         FillCookiesButton(modifier = Modifier.padding(horizontal = 8.dp))
                     }
                 }
-                WindowWidthSizeClass.Expanded -> {
+                WindowWidthSizeClass.EXPANDED -> {
                     Row(
                         modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(padding).padding(dimensionResource(id = R.dimen.keyline_margin)),
                         verticalAlignment = Alignment.CenterVertically,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -72,7 +72,6 @@ compose-foundation = { module = "androidx.compose.foundation:foundation", versio
 compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 compose-material3 = { module = "androidx.compose.material3:material3", version = "1.3.0-SNAPSHOT" }
 compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" }
-compose-material3-windowsizeclass = { module = "androidx.compose.material3:material3-window-size-class" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 compose-ui-util = { module = "androidx.compose.ui:ui-util" }
@@ -123,7 +122,7 @@ telephoto-zoomable = { module = "me.saket.telephoto:zoomable", version.ref = "te
 
 [bundles]
 coil = ["coil-compose", "coil-gif", "coil-network"]
-compose = ["compose-foundation", "compose-material-icons-extended", "compose-material3", "compose-material3-adaptive", "compose-material3-windowsizeclass", "compose-ui-util"]
+compose = ["compose-foundation", "compose-material-icons-extended", "compose-material3", "compose-material3-adaptive", "compose-ui-util"]
 kotlinx-serialization = ["serialization-cbor", "serialization-json", "serialization-json-okio", "serialization-xml-core", "serialization-xml"]
 ktor = ["ktor-client-okhttp"]
 okhttp = ["okhttp-android", "okhttp-dnsoverhttps"]