refactor: show log out dialog

Author: ntnhon

app/src/main/java/io/simplelogin/android/root/AppRoot.kt

@@ -95,8 +95,7 @@ fun AppRoot(
     onOpenDrawer: () -> Unit
 ) = with(viewModel) {
     val backStack by navBackStack.collectAsState()
-    val dialogStack by dialogStack.collectAsState()
-    val activeDialog = dialogStack.lastOrNull()
+    val showLogOutDialog by showLogOutDialog.collectAsState()
     val configuration = LocalConfiguration.current
     val screenWidth = configuration.screenWidthDp.dp
 
@@ -235,8 +234,8 @@ fun AppRoot(
         }
     )
 
-    when (activeDialog) {
-        AppRootDialog.LogOut -> AlertDialog(
+    if (showLogOutDialog) {
+        AlertDialog(
             onDismissRequest = ::dismissActiveDialog,
             title = { Text(stringResource(R.string.sign_out)) },
             text = { Text(stringResource(R.string.sign_out_message)) },
@@ -251,8 +250,6 @@ fun AppRoot(
                 }
             }
         )
-
-        null -> Unit
     }
 }
 

app/src/main/java/io/simplelogin/android/root/AppRootDialog.kt

@@ -44,8 +44,8 @@ class AppRootViewModel @Inject constructor(
     private val _createdAlias = Channel<Alias>(Channel.BUFFERED)
     val createdAlias = _createdAlias.receiveAsFlow()
 
-    private val _dialogStack = MutableStateFlow<List<AppRootDialog>>(emptyList())
-    val dialogStack = _dialogStack.asStateFlow()
+    private val _showLogOutDialog = MutableStateFlow(false)
+    val showLogOutDialog = _showLogOutDialog
 
     val stateFlow: StateFlow<AppRootState> = observeSessionSettings().map {
         AppRootState(isReady = true, apiKey = it.apiKey)
@@ -81,15 +81,15 @@ class AppRootViewModel @Inject constructor(
 
     //region Drawer
     fun showLogOutDialog() {
-        _dialogStack.value = listOf(AppRootDialog.LogOut)
+        _showLogOutDialog.value = true
     }
 
     fun dismissActiveDialog() {
-        _dialogStack.value = _dialogStack.value.dropLast(1)
+        _showLogOutDialog.value = false
     }
 
     fun logOut() {
-        _dialogStack.value = emptyList()
+        _showLogOutDialog.value = false
         viewModelScope.launch {
             logOutUseCase()
         }