Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,6 @@ class TasksScreenTest {
Surface {
TasksScreen(
viewModel = TasksViewModel(repository, SavedStateHandle()),
userMessage = R.string.successfully_added_task_message,
onUserMessageDisplayed = { },
onAddTask = { },
onTaskClick = { },
openDrawer = { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,9 @@ fun TodoNavGraph(
arguments = listOf(
navArgument(USER_MESSAGE_ARG) { type = NavType.IntType; defaultValue = 0 }
)
) { 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() } }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.dimensionResource
Expand All @@ -66,10 +65,8 @@ import com.example.android.architecture.blueprints.todoapp.util.TasksTopAppBar

@Composable
fun TasksScreen(
@StringRes userMessage: Int,
onAddTask: () -> Unit,
onTaskClick: (Task) -> Unit,
onUserMessageDisplayed: () -> Unit,
openDrawer: () -> Unit,
modifier: Modifier = Modifier,
viewModel: TasksViewModel = hiltViewModel(),
Expand Down Expand Up @@ -116,15 +113,6 @@ fun TasksScreen(
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()
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ 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.R
import com.example.android.architecture.blueprints.todoapp.TodoDestinationsArgs.USER_MESSAGE_ARG
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
Expand Down Expand Up @@ -99,6 +100,14 @@ class TasksViewModel @Inject constructor(
initialValue = TasksUiState(isLoading = true)
)

init {
// Read userMessageArgs from saveStateHandle
savedStateHandle.get<Int>(USER_MESSAGE_ARG)?.takeIf { it != 0 }?.let { result ->
showEditResultMessage(result)
savedStateHandle[USER_MESSAGE_ARG] = 0
}
}

fun setFiltering(requestType: TasksFilterType) {
savedStateHandle[TASKS_FILTER_SAVED_STATE_KEY] = requestType
}
Expand Down