Merge pull request #268 from rainxchzed/auth-improvement

Author: rainxchzed

composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml

@@ -16,6 +16,7 @@ import zed.rainxch.githubstore.app.deeplink.DeepLinkParser
 import zed.rainxch.githubstore.app.navigation.AppNavigation
 import zed.rainxch.githubstore.app.navigation.GithubStoreGraph
 import zed.rainxch.githubstore.app.components.RateLimitDialog
+import zed.rainxch.githubstore.app.components.SessionExpiredDialog
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
@@ -70,6 +71,18 @@ fun App(deepLinkUri: String? = null) {
             }
         }
 
+        if (state.showSessionExpiredDialog) {
+            SessionExpiredDialog(
+                onDismiss = {
+                    viewModel.onAction(MainAction.DismissSessionExpiredDialog)
+                },
+                onSignIn = {
+                    viewModel.onAction(MainAction.DismissSessionExpiredDialog)
+                    navBackStack.navigate(GithubStoreGraph.AuthenticationScreen)
+                }
+            )
+        }
+
         AppNavigation(
             navController = navBackStack
         )

composeApp/src/androidMain/res/drawable/ic_launcher_background.xml

@@ -2,4 +2,5 @@ package zed.rainxch.githubstore
 
 sealed interface MainAction {
     data object DismissRateLimitDialog : MainAction
+    data object DismissSessionExpiredDialog : MainAction
 }

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/Main.kt

@@ -8,6 +8,7 @@ data class MainState(
     val isLoggedIn: Boolean = false,
     val rateLimitInfo: RateLimitInfo? = null,
     val showRateLimitDialog: Boolean = false,
+    val showSessionExpiredDialog: Boolean = false,
     val currentColorTheme: AppTheme = AppTheme.OCEAN,
     val isAmoledTheme: Boolean = false,
     val isDarkTheme: Boolean? = null,

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/MainAction.kt

@@ -89,6 +89,12 @@ class MainViewModel(
             }
         }
 
+        viewModelScope.launch {
+            authenticationState.sessionExpiredEvent.collect {
+                _state.update { it.copy(showSessionExpiredDialog = true) }
+            }
+        }
+
         viewModelScope.launch(Dispatchers.IO) {
             syncUseCase().onSuccess {
                 installedAppsRepository.checkAllForUpdates()
@@ -101,6 +107,9 @@ class MainViewModel(
             MainAction.DismissRateLimitDialog -> {
                 _state.update { it.copy(showRateLimitDialog = false) }
             }
+            MainAction.DismissSessionExpiredDialog -> {
+                _state.update { it.copy(showSessionExpiredDialog = false) }
+            }
         }
     }
 }

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/MainState.kt

@@ -0,0 +1,77 @@
+package zed.rainxch.githubstore.app.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.LockOpen
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import org.jetbrains.compose.resources.stringResource
+import zed.rainxch.githubstore.core.presentation.res.*
+
+@Composable
+fun SessionExpiredDialog(
+    onDismiss: () -> Unit,
+    onSignIn: () -> Unit
+) {
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        icon = {
+            Icon(
+                imageVector = Icons.Default.LockOpen,
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.error
+            )
+        },
+        title = {
+            Text(
+                text = stringResource(Res.string.session_expired_title),
+                style = MaterialTheme.typography.headlineSmall,
+                fontWeight = FontWeight.Black,
+                color = MaterialTheme.colorScheme.onSurface
+            )
+        },
+        text = {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                Text(
+                    text = stringResource(Res.string.session_expired_message),
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.outline
+                )
+
+                Text(
+                    text = stringResource(Res.string.session_expired_hint),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.primary
+                )
+            }
+        },
+        confirmButton = {
+            Button(onClick = onSignIn) {
+                Text(
+                    text = stringResource(Res.string.sign_in_again),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onPrimary
+                )
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) {
+                Text(
+                    text = stringResource(Res.string.continue_as_guest),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurface
+                )
+            }
+        }
+    )
+}