Skip to content

[feature/add-transition] Add transition when task status change (TODO -> Completed) #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
l2hyunwoo merged 2 commits into from
Nov 4, 2023
Merged

[feature/add-transition] Add transition when task status change (TODO -> Completed) #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b8dd35
Todo -> complete로 상태변경 시에 전환효과 추가
l2hyunwoo Nov 4, 2023
dacfe2d
Remove unused import
l2hyunwoo Nov 4, 2023
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
4 changes: 2 additions & 2 deletions feature/home/src/main/java/com/conf/mad/todo/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ fun HomeScreen(
TaskItem(
modifier = Modifier.fillMaxWidth(),
title = todo.title,
status = TaskStatus.TODO,
status = todo.status,
isFavorite = todo.isFavorite,
onCompletedValueChange = {
onCompletedChanged(
Expand Down Expand Up @@ -183,7 +183,7 @@ fun HomeScreen(
TaskItem(
modifier = Modifier.fillMaxWidth(),
title = task.title,
status = TaskStatus.COMPLETED,
status = task.status,
isFavorite = task.isFavorite,
onCompletedValueChange = {
onCompletedChanged(
Expand Down
26 changes: 25 additions & 1 deletion feature/home/src/main/java/com/conf/mad/todo/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.conf.mad.todo.home.model.HomeMenu
import com.conf.mad.todo.home.model.HomeUiState
import com.conf.mad.todo.home.model.TaskStatus
import com.conf.mad.todo.home.model.TaskUiModel
import com.conf.mad.todo.task.repository.TaskRepository
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.collections.immutable.toPersistentList
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
Expand Down Expand Up @@ -38,7 +40,13 @@ class HomeViewModel @Inject constructor(
return@filter true
}
task.isFavorite
}.map(TaskUiModel::of).toPersistentList(),
}.map(TaskUiModel::of).map { task ->
if (it.doneTasks.find { doneTask -> doneTask.id == task.id } != null) {
task.copy(status = TaskStatus.DONE)
} else {
task
}
}.toPersistentList(),
completedTasks = completed.filter { task ->
if (!uiState.isOnlyFavoriteTaskVisible) {
return@filter true
Expand Down Expand Up @@ -70,8 +78,24 @@ class HomeViewModel @Inject constructor(
}

fun onCompletedChanged(id: Long, isCompleted: Boolean) {
if (isCompleted) {
_uiState.update {
val task = it.todoTasks.find { task -> task.id == id } ?: return@update it
it.copy(
doneTasks = (it.doneTasks + task).toPersistentList(),
)
}
}
viewModelScope.launch {
if (isCompleted) {
delay(500)
}
repository.updateCompleted(id, isCompleted)
_uiState.update {
it.copy(
doneTasks = it.doneTasks.filter { task -> task.id != id }.toPersistentList()
)
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion feature/home/src/main/java/com/conf/mad/todo/home/model/HomeUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ data class HomeUiState(
val currentDestination: HomeMenu = HomeMenu.TASK,
val taskToDelete: TaskUiModel? = null,
val todoTasks: ImmutableList<TaskUiModel> = persistentListOf(),
val completedTasks: ImmutableList<TaskUiModel> = persistentListOf()
val completedTasks: ImmutableList<TaskUiModel> = persistentListOf(),
val doneTasks: ImmutableList<TaskUiModel> = persistentListOf()
) {
val isOnlyFavoriteTaskVisible
get() = currentDestination == HomeMenu.FAVORITE
Expand Down