fixed snackbar issue on android#1047

devmike01 · devmike01 · commit 932dcc85010f · 2026-02-05T23:15:27.000+01:00
diff --git a/.kotlin/sessions/kotlin-compiler-5981389976571422887.salive b/.kotlin/sessions/kotlin-compiler-5981389976571422887.salive
diff --git a/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreenTest.kt b/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreenTest.kt
@@ -77,6 +77,7 @@ class AddEditTaskScreenTest {
                         topBarTitle = R.string.add_task,
                         onTaskUpdate = { },
                         onBack = { },
+                        taskId = null
                     )
                 }
             }
diff --git a/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreenTest.kt b/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreenTest.kt
@@ -80,6 +80,8 @@ class TasksScreenTest {
         composeTestRule.onNodeWithText("TITLE1").assertIsDisplayed()
     }
 
+
+
     @Test
     fun displayActiveTask() = runTest {
         repository.createTask("TITLE1", "DESCRIPTION1")
@@ -259,7 +261,6 @@ class TasksScreenTest {
                 Surface {
                     TasksScreen(
                         viewModel = TasksViewModel(repository, SavedStateHandle()),
-                        userMessage = R.string.successfully_added_task_message,
                         onUserMessageDisplayed = { },
                         onAddTask = { },
                         onTaskClick = { },
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/TodoNavGraph.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/TodoNavGraph.kt
@@ -62,20 +62,15 @@ fun TodoNavGraph(
         startDestination = startDestination,
         modifier = modifier
     ) {
-        composable(
-            TodoDestinations.TASKS_ROUTE,
-            arguments = listOf(
-                navArgument(USER_MESSAGE_ARG) { type = NavType.IntType; defaultValue = 0 }
-            )
-        ) { entry ->
+        composable(TodoDestinations.TASKS_ROUTE,) { entry ->
             AppModalDrawer(drawerState, currentRoute, navActions) {
                 TasksScreen(
-                    userMessage = entry.arguments?.getInt(USER_MESSAGE_ARG)!!,
                     onUserMessageDisplayed = { entry.arguments?.putInt(USER_MESSAGE_ARG, 0) },
                     onAddTask = { navActions.navigateToAddEditTask(R.string.add_task, null) },
                     onTaskClick = { task -> navActions.navigateToTaskDetail(task.id) },
                     openDrawer = { coroutineScope.launch { drawerState.open() } }
                 )
+
             }
         }
         composable(TodoDestinations.STATISTICS_ROUTE) {
@@ -93,10 +88,9 @@ fun TodoNavGraph(
             val taskId = entry.arguments?.getString(TASK_ID_ARG)
             AddEditTaskScreen(
                 topBarTitle = entry.arguments?.getInt(TITLE_ARG)!!,
+                taskId = taskId,
                 onTaskUpdate = {
-                    navActions.navigateToTasks(
-                        if (taskId == null) ADD_EDIT_RESULT_OK else EDIT_RESULT_OK
-                    )
+                    navActions.navigateToTasksV2()
                 },
                 onBack = { navController.popBackStack() }
             )
@@ -107,7 +101,7 @@ fun TodoNavGraph(
                     navActions.navigateToAddEditTask(R.string.edit_task, taskId)
                 },
                 onBack = { navController.popBackStack() },
-                onDeleteTask = { navActions.navigateToTasks(DELETE_RESULT_OK) }
+                onDeleteTask = { navActions.navigateToTasks() }
             )
         }
     }
@@ -117,3 +111,4 @@ fun TodoNavGraph(
 const val ADD_EDIT_RESULT_OK = Activity.RESULT_FIRST_USER + 1
 const val DELETE_RESULT_OK = Activity.RESULT_FIRST_USER + 2
 const val EDIT_RESULT_OK = Activity.RESULT_FIRST_USER + 3
+const val NO_MESSAGE =  Activity.RESULT_FIRST_USER - 1
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/TodoNavigation.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/TodoNavigation.kt
@@ -16,6 +16,7 @@
 
 package com.example.android.architecture.blueprints.todoapp
 
+import androidx.compose.ui.window.Popup
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import com.example.android.architecture.blueprints.todoapp.TodoDestinationsArgs.TASK_ID_ARG
@@ -76,7 +77,36 @@ class TodoNavigationActions(private val navController: NavHostController) {
         }
     }
 
-    fun navigateToStatistics() {
+    fun navigateToTasks() {
+        navController.navigate(
+            TASKS_SCREEN
+        ) {
+            popUpTo(navController.graph.findStartDestination().id) {
+                inclusive = true
+                saveState = false
+            }
+            launchSingleTop = true
+            restoreState = false
+        }
+    }
+
+    fun navigateToTasksV2() {
+        navController.navigate(
+            TASKS_SCREEN
+        ){
+            popUpTo(navController.graph.findStartDestination().id) {
+                inclusive = true
+                saveState = false
+            }
+            launchSingleTop = true
+            restoreState = false
+        }
+    }
+
+
+
+
+        fun navigateToStatistics() {
         navController.navigate(TodoDestinations.STATISTICS_ROUTE) {
             // Pop up to the start destination of the graph to
             // avoid building up a large stack of destinations
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreen.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreen.kt
@@ -54,12 +54,15 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.example.android.architecture.blueprints.todoapp.ADD_EDIT_RESULT_OK
+import com.example.android.architecture.blueprints.todoapp.EDIT_RESULT_OK
 import com.example.android.architecture.blueprints.todoapp.R
 import com.example.android.architecture.blueprints.todoapp.util.AddEditTaskTopAppBar
 
 @Composable
 fun AddEditTaskScreen(
     @StringRes topBarTitle: Int,
+    taskId: String?,
     onTaskUpdate: () -> Unit,
     onBack: () -> Unit,
     modifier: Modifier = Modifier,
@@ -90,8 +93,12 @@ fun AddEditTaskScreen(
         // Check if the task is saved and call onTaskUpdate event
         LaunchedEffect(uiState.isTaskSaved) {
             if (uiState.isTaskSaved) {
+                viewModel.setPendingMessage(if (taskId != null)
+                    ADD_EDIT_RESULT_OK else EDIT_RESULT_OK)
                 onTaskUpdate()
             }
+
+
         }
 
         // Check for user messages to display on the screen
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskViewModel.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskViewModel.kt
@@ -48,7 +48,7 @@ data class AddEditTaskUiState(
 @HiltViewModel
 class AddEditTaskViewModel @Inject constructor(
     private val taskRepository: TaskRepository,
-    savedStateHandle: SavedStateHandle
+    private val savedStateHandle: SavedStateHandle
 ) : ViewModel() {
 
     private val taskId: String? = savedStateHandle[TodoDestinationsArgs.TASK_ID_ARG]
@@ -77,7 +77,7 @@ class AddEditTaskViewModel @Inject constructor(
         if (taskId == null) {
             createNewTask()
         } else {
-            updateTask()
+             updateTask()
         }
     }
 
@@ -106,6 +106,10 @@ class AddEditTaskViewModel @Inject constructor(
         }
     }
 
+    fun setPendingMessage(message: Int){
+        taskRepository.addPendingMessage(message)
+    }
+
     private fun updateTask() {
         if (taskId == null) {
             throw RuntimeException("updateTask() was called but task is new.")
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/DefaultTaskRepository.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/DefaultTaskRepository.kt
@@ -20,6 +20,7 @@ import com.example.android.architecture.blueprints.todoapp.data.source.local.Tas
 import com.example.android.architecture.blueprints.todoapp.data.source.network.NetworkDataSource
 import com.example.android.architecture.blueprints.todoapp.di.ApplicationScope
 import com.example.android.architecture.blueprints.todoapp.di.DefaultDispatcher
+import com.example.android.architecture.blueprints.todoapp.util.AppMessageQueue
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -44,8 +45,9 @@ import javax.inject.Singleton
 class DefaultTaskRepository @Inject constructor(
     private val networkDataSource: NetworkDataSource,
     private val localDataSource: TaskDao,
+    private val appMessageQueue: AppMessageQueue,
     @DefaultDispatcher private val dispatcher: CoroutineDispatcher,
-    @ApplicationScope private val scope: CoroutineScope,
+    @ApplicationScope private val scope: CoroutineScope
 ) : TaskRepository {
 
     override suspend fun createTask(title: String, description: String): String {
@@ -64,6 +66,7 @@ class DefaultTaskRepository @Inject constructor(
         return taskId
     }
 
+
     override suspend fun updateTask(taskId: String, title: String, description: String) {
         val task = getTask(taskId)?.copy(
             title = title,
@@ -137,6 +140,14 @@ class DefaultTaskRepository @Inject constructor(
         saveTasksToNetwork()
     }
 
+    override fun addPendingMessage(message: Int) {
+        appMessageQueue.setHasPendingMessage(message = message)
+    }
+
+    override fun readOncePendingMessage(): Int {
+        return appMessageQueue.getPendingMessageOnce()
+    }
+
     /**
      * The following methods load tasks from (refresh), and save tasks to, the network.
      *
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/TaskRepository.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/TaskRepository.kt
@@ -48,4 +48,9 @@ interface TaskRepository {
     suspend fun deleteAllTasks()
 
     suspend fun deleteTask(taskId: String)
+
+    fun addPendingMessage(message: Int)
+
+    fun readOncePendingMessage(): Int
+
 }
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/di/DataModules.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/di/DataModules.kt
@@ -24,6 +24,8 @@ import com.example.android.architecture.blueprints.todoapp.data.source.local.Tas
 import com.example.android.architecture.blueprints.todoapp.data.source.local.ToDoDatabase
 import com.example.android.architecture.blueprints.todoapp.data.source.network.NetworkDataSource
 import com.example.android.architecture.blueprints.todoapp.data.source.network.TaskNetworkDataSource
+import com.example.android.architecture.blueprints.todoapp.util.AppMessageQueue
+import com.example.android.architecture.blueprints.todoapp.util.AppMessageQueueImpl
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -66,4 +68,10 @@ object DatabaseModule {
 
     @Provides
     fun provideTaskDao(database: ToDoDatabase): TaskDao = database.taskDao()
+
+    @Provides
+    fun provideAppMessageQueue(@ApplicationContext context: Context): AppMessageQueue {
+        return AppMessageQueueImpl(context
+            .getSharedPreferences("message_queue", Context.MODE_PRIVATE))
+    }
 }
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreen.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreen.kt
@@ -44,6 +44,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.example.android.architecture.blueprints.todoapp.DELETE_RESULT_OK
 import com.example.android.architecture.blueprints.todoapp.R
 import com.example.android.architecture.blueprints.todoapp.data.Task
 import com.example.android.architecture.blueprints.todoapp.util.LoadingContent
@@ -92,6 +93,7 @@ fun TaskDetailScreen(
         // Check if the task is deleted and call onDeleteTask
         LaunchedEffect(uiState.isTaskDeleted) {
             if (uiState.isTaskDeleted) {
+                viewModel.setPendingMessage(DELETE_RESULT_OK)
                 onDeleteTask()
             }
         }
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailViewModel.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailViewModel.kt
@@ -108,6 +108,10 @@ class TaskDetailViewModel @Inject constructor(
         }
     }
 
+    fun setPendingMessage(message: Int){
+        taskRepository.addPendingMessage(message = message)
+    }
+
     fun refresh() {
         _isLoading.value = true
         viewModelScope.launch {
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreen.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreen.kt
@@ -66,7 +66,6 @@ import com.example.android.architecture.blueprints.todoapp.util.TasksTopAppBar
 
 @Composable
 fun TasksScreen(
-    @StringRes userMessage: Int,
     onAddTask: () -> Unit,
     onTaskClick: (Task) -> Unit,
     onUserMessageDisplayed: () -> Unit,
@@ -113,17 +112,15 @@ fun TasksScreen(
             val snackbarText = stringResource(message)
             LaunchedEffect(snackbarHostState, viewModel, message, snackbarText) {
                 snackbarHostState.showSnackbar(snackbarText)
-                viewModel.snackbarMessageShown()
+               // viewModel.snackbarMessageShown()
             }
         }
 
         // Check if there's a userMessage to show to the user
         val currentOnUserMessageDisplayed by rememberUpdatedState(onUserMessageDisplayed)
-        LaunchedEffect(userMessage) {
-            if (userMessage != 0) {
-                viewModel.showEditResultMessage(userMessage)
-                currentOnUserMessageDisplayed()
-            }
+        LaunchedEffect(Unit) {
+            viewModel.showEditResultMessage()
+            currentOnUserMessageDisplayed()
         }
     }
 }
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksViewModel.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksViewModel.kt
@@ -16,13 +16,16 @@
 
 package com.example.android.architecture.blueprints.todoapp.tasks
 
+import android.util.Log
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.android.architecture.blueprints.todoapp.ADD_EDIT_RESULT_OK
 import com.example.android.architecture.blueprints.todoapp.DELETE_RESULT_OK
 import com.example.android.architecture.blueprints.todoapp.EDIT_RESULT_OK
+import com.example.android.architecture.blueprints.todoapp.NO_MESSAGE
 import com.example.android.architecture.blueprints.todoapp.R
+import com.example.android.architecture.blueprints.todoapp.TodoDestinationsArgs
 import com.example.android.architecture.blueprints.todoapp.data.Task
 import com.example.android.architecture.blueprints.todoapp.data.TaskRepository
 import com.example.android.architecture.blueprints.todoapp.tasks.TasksFilterType.ACTIVE_TASKS
@@ -31,6 +34,7 @@ import com.example.android.architecture.blueprints.todoapp.tasks.TasksFilterType
 import com.example.android.architecture.blueprints.todoapp.util.Async
 import com.example.android.architecture.blueprints.todoapp.util.WhileUiSubscribed
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
@@ -60,6 +64,7 @@ class TasksViewModel @Inject constructor(
     private val savedStateHandle: SavedStateHandle
 ) : ViewModel() {
 
+
     private val _savedFilterType =
         savedStateHandle.getStateFlow(TASKS_FILTER_SAVED_STATE_KEY, ALL_TASKS)
 
@@ -121,11 +126,12 @@ class TasksViewModel @Inject constructor(
         }
     }
 
-    fun showEditResultMessage(result: Int) {
-        when (result) {
+    fun showEditResultMessage() {
+        when (taskRepository.readOncePendingMessage()) {
             EDIT_RESULT_OK -> showSnackbarMessage(R.string.successfully_saved_task_message)
             ADD_EDIT_RESULT_OK -> showSnackbarMessage(R.string.successfully_added_task_message)
             DELETE_RESULT_OK -> showSnackbarMessage(R.string.successfully_deleted_task_message)
+            NO_MESSAGE -> snackbarMessageShown()
         }
     }
 
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/AppMessageQueue.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/AppMessageQueue.kt
@@ -0,0 +1,31 @@
+package com.example.android.architecture.blueprints.todoapp.util
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+
+
+interface AppMessageQueue {
+    fun setHasPendingMessage(message: Int)
+    fun getPendingMessageOnce(): Int
+}
+
+class AppMessageQueueImpl(private val prefs: SharedPreferences) : AppMessageQueue{
+
+
+    companion object{
+        const val MESSAGE_KEY = "AppMessageQueue.message_key"
+    }
+
+    override fun setHasPendingMessage(message: Int) {
+        prefs.edit(commit = true){ putInt(MESSAGE_KEY, message) }
+    }
+
+    override fun getPendingMessageOnce(): Int {
+        return prefs.getInt(MESSAGE_KEY, 0)
+            .also{
+                prefs.edit(commit = true){ remove(MESSAGE_KEY)}
+            }
+    }
+
+
+}
diff --git a/app/src/test/java/com/example/android/architecture/blueprints/todoapp/data/DefaultTaskRepositoryTest.kt b/app/src/test/java/com/example/android/architecture/blueprints/todoapp/data/DefaultTaskRepositoryTest.kt
diff --git a/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksViewModelTest.kt b/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksViewModelTest.kt
diff --git a/shared-test/src/main/java/com/example/android/architecture/blueprints/todoapp/data/FakeAppMessageQueue.kt b/shared-test/src/main/java/com/example/android/architecture/blueprints/todoapp/data/FakeAppMessageQueue.kt
diff --git a/shared-test/src/main/java/com/example/android/architecture/blueprints/todoapp/data/FakeTaskRepository.kt b/shared-test/src/main/java/com/example/android/architecture/blueprints/todoapp/data/FakeTaskRepository.kt

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ class AddEditTaskScreenTest {`
`77`	`77`	`topBarTitle = R.string.add_task,`
`78`	`78`	`onTaskUpdate = { },`
`79`	`79`	`onBack = { },`
	`80`	`+ taskId = null`
`80`	`81`	`)`
`81`	`82`	`}`
`82`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ data class AddEditTaskUiState(`
`48`	`48`	`@HiltViewModel`
`49`	`49`	`class AddEditTaskViewModel @Inject constructor(`
`50`	`50`	`private val taskRepository: TaskRepository,`
`51`		`- savedStateHandle: SavedStateHandle`
	`51`	`+ private val savedStateHandle: SavedStateHandle`
`52`	`52`	`) : ViewModel() {`
`53`	`53`
`54`	`54`	`private val taskId: String? = savedStateHandle[TodoDestinationsArgs.TASK_ID_ARG]`
`@@ -77,7 +77,7 @@ class AddEditTaskViewModel @Inject constructor(`
`77`	`77`	`if (taskId == null) {`
`78`	`78`	`createNewTask()`
`79`	`79`	`} else {`
`80`		`- updateTask()`
	`80`	`+ updateTask()`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`@@ -106,6 +106,10 @@ class AddEditTaskViewModel @Inject constructor(`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ fun setPendingMessage(message: Int){`
	`110`	`+ taskRepository.addPendingMessage(message)`
	`111`	`+ }`
	`112`	`+`
`109`	`113`	`private fun updateTask() {`
`110`	`114`	`if (taskId == null) {`
`111`	`115`	`throw RuntimeException("updateTask() was called but task is new.")`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,9 @@ interface TaskRepository {`
`48`	`48`	`suspend fun deleteAllTasks()`
`49`	`49`
`50`	`50`	`suspend fun deleteTask(taskId: String)`
	`51`	`+`
	`52`	`+ fun addPendingMessage(message: Int)`
	`53`	`+`
	`54`	`+ fun readOncePendingMessage(): Int`
	`55`	`+`
`51`	`56`	`}`