GT-2200 Create No Internet Error

CruGlobal · Oct 22, 2024 · 26ede8c · 26ede8c
1 parent d48e0f5
commit 26ede8c
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/login/LoginLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/login/LoginLayout.kt
@@ -25,18 +25,22 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding
+import org.ccci.gto.android.common.kotlin.coroutines.flow.net.isConnectedFlow
 import org.cru.godtools.R
 import org.cru.godtools.account.AccountType
 import org.cru.godtools.account.LoginResponse
@@ -48,7 +52,11 @@ private val FACEBOOK_BLUE = Color(red = 0x18, green = 0x77, blue = 0xf2)
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
-fun LoginLayout(createAccount: Boolean = false, onEvent: (event: LoginLayoutEvent) -> Unit) {
+fun LoginLayout(
+    modifier: Modifier = Modifier,
+    createAccount: Boolean = false,
+    onEvent: (event: LoginLayoutEvent) -> Unit = {},
+) {
     var loginError: LoginResponse.Error? by rememberSaveable { mutableStateOf(null) }
     val loginLauncher = rememberLoginLauncher(createAccount) {
         when (it) {
@@ -61,7 +69,7 @@ fun LoginLayout(createAccount: Boolean = false, onEvent: (event: LoginLayoutEven
 
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
             .background(GodToolsTheme.GT_BLUE)
             .verticalScroll(rememberScrollState())
@@ -145,14 +153,26 @@ fun LoginLayout(createAccount: Boolean = false, onEvent: (event: LoginLayoutEven
 
 @Composable
 private fun LoginError(error: LoginResponse.Error?, onDismiss: () -> Unit) {
+    val context = LocalContext.current
+    val isConnected by remember { context.isConnectedFlow() }.collectAsState(true)
     if (error != null) {
         AlertDialog(
+            title = {
+                Text(
+                    if (!isConnected) {
+                        stringResource(R.string.account_error_no_internet_title)
+                    } else {
+                        stringResource(R.string.account_error_title)
+                    }
+                )
+            },
             text = {
                 Text(
                     stringResource(
-                        when (error) {
-                            LoginResponse.Error.UserAlreadyExists -> R.string.account_error_user_already_exists
-                            LoginResponse.Error.UserNotFound -> R.string.account_error_user_not_found
+                        when {
+                            !isConnected -> R.string.account_error_no_internet
+                            error == LoginResponse.Error.UserAlreadyExists -> R.string.account_error_user_already_exists
+                            error == LoginResponse.Error.UserNotFound -> R.string.account_error_user_not_found
                             else -> R.string.account_error_unknown
                         }
                     )
@@ -167,3 +187,4 @@ private fun LoginError(error: LoginResponse.Error?, onDismiss: () -> Unit) {
         )
     }
 }
+