From 780bab21259bbb5913f8bea8bde3e3e760e98bbe Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 4 May 2023 18:09:29 +0800
Subject: [PATCH] Convert SignInScreen to use a suspend dialog

---
 .../ehviewer/ui/login/CookieSignInScreen.kt   |  1 -
 .../hippo/ehviewer/ui/login/SignInScreen.kt   | 73 ++++---------------
 2 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
index fee56b895..4972e9d42 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
@@ -139,7 +139,6 @@ fun CookieSignInScene(windowSizeClass: WindowSizeClass) {
                     title = R.string.sign_in_failed,
                     text = {
                         Text(
-                            text =
                             """
                             ${ExceptionUtils.getReadableString(it)}
                             ${stringResource(R.string.wrong_cookie_warning)}
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
index 0348cc7d2..7ae88ad52 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
-import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.FilledTonalButton
@@ -62,6 +61,7 @@ import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.ui.openBrowser
+import com.hippo.ehviewer.ui.widget.rememberDialogState
 import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
@@ -76,14 +76,15 @@ fun SignInScreen(windowSizeClass: WindowSizeClass) {
     var isProgressIndicatorVisible by rememberSaveable { mutableStateOf(false) }
     var showUsernameError by rememberSaveable { mutableStateOf(false) }
     var showPasswordError by rememberSaveable { mutableStateOf(false) }
-    var showErrorDialog by rememberSaveable { mutableStateOf(false) }
-    var loginErrorException by remember { mutableStateOf<Throwable?>(null) }
     var username by rememberSaveable { mutableStateOf("") }
     var password by rememberSaveable { mutableStateOf("") }
     var passwordHidden by rememberSaveable { mutableStateOf(true) }
     val context = LocalContext.current
     var signInJob by remember { mutableStateOf<Job?>(null) }
 
+    val dialogState = rememberDialogState()
+    dialogState.Handler()
+
     BackHandler {
         (context as Activity).moveTaskToBack(true)
     }
@@ -114,9 +115,19 @@ fun SignInScreen(windowSizeClass: WindowSizeClass) {
                 it.printStackTrace()
                 withUIContext {
                     focusManager.clearFocus()
+                    dialogState.show(
+                        confirmText = R.string.get_it,
+                        title = R.string.sign_in_failed,
+                        text = {
+                            Text(
+                                """
+                                ${ExceptionUtils.getReadableString(it)}
+                                ${stringResource(R.string.sign_in_failed_tip)}
+                                """.trimIndent(),
+                            )
+                        },
+                    )
                     isProgressIndicatorVisible = false
-                    loginErrorException = it
-                    showErrorDialog = true
                 }
             }.onSuccess {
                 withNonCancellableContext {
@@ -280,32 +291,6 @@ fun SignInScreen(windowSizeClass: WindowSizeClass) {
             if (isProgressIndicatorVisible) {
                 CircularProgressIndicator()
             }
-            if (showErrorDialog) {
-                AlertDialog(
-                    onDismissRequest = {
-                        showErrorDialog = false
-                    },
-                    confirmButton = {
-                        TextButton(onClick = {
-                            showErrorDialog = false
-                        }) {
-                            Text(text = stringResource(id = R.string.get_it))
-                        }
-                    },
-                    title = {
-                        Text(text = stringResource(id = R.string.sign_in_failed))
-                    },
-                    text = {
-                        Text(
-                            text =
-                            """
-                            ${ExceptionUtils.getReadableString(loginErrorException!!)}
-                            ${stringResource(R.string.sign_in_failed_tip)}
-                            """.trimIndent(),
-                        )
-                    },
-                )
-            }
         }
 
         WindowWidthSizeClass.Expanded -> Box(
@@ -462,32 +447,6 @@ fun SignInScreen(windowSizeClass: WindowSizeClass) {
             if (isProgressIndicatorVisible) {
                 CircularProgressIndicator()
             }
-            if (showErrorDialog) {
-                AlertDialog(
-                    onDismissRequest = {
-                        showErrorDialog = false
-                    },
-                    confirmButton = {
-                        TextButton(onClick = {
-                            showErrorDialog = false
-                        }) {
-                            Text(text = stringResource(id = R.string.get_it))
-                        }
-                    },
-                    title = {
-                        Text(text = stringResource(id = R.string.sign_in_failed))
-                    },
-                    text = {
-                        Text(
-                            text =
-                            """
-                            ${ExceptionUtils.getReadableString(loginErrorException!!)}
-                            ${stringResource(R.string.sign_in_failed_tip)}
-                            """.trimIndent(),
-                        )
-                    },
-                )
-            }
         }
     }
 }