fix: Task Screen Dday Visible Message

apeun-gidaechi · Nov 5, 2024 · 48b92fa · 48b92fa
1 parent 47127db
commit 48b92fa
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/feature-main/task/src/main/java/com/seugi/task/TaskScreen.kt b/feature-main/task/src/main/java/com/seugi/task/TaskScreen.kt
@@ -108,10 +108,15 @@ internal fun TaskScreen(viewModel: TaskViewModel = hiltViewModel(), popBackStack
                             dDay = "기한없음",
                         )
                     } else {
+                        val dayCnt = LocalDate.now().toKotlinLocalDate().daysUntil(it.dueDate!!.date)
                         TaskCard(
                             title = it.title,
                             description = it.description ?: "",
-                            dDay = "D-${-it.dueDate!!.date.daysUntil(LocalDate.now().toKotlinLocalDate())}",
+                            dDay = "D" + when {
+                                dayCnt > 0 -> "-${dayCnt}"
+                                dayCnt < 0 -> "+${-dayCnt}"
+                                else -> " Day"
+                            },
                         )
                     }
                 }
@@ -131,13 +136,18 @@ internal fun TaskScreen(viewModel: TaskViewModel = hiltViewModel(), popBackStack
                         TaskCard(
                             title = it.title,
                             description = it.description ?: "",
-                            dDay = "D-??",
+                            dDay = "기한없음",
                         )
                     } else {
+                        val dayCnt = LocalDate.now().toKotlinLocalDate().daysUntil(it.dueDate!!.date)
                         TaskCard(
                             title = it.title,
                             description = it.description ?: "",
-                            dDay = "D-${-it.dueDate!!.date.daysUntil(LocalDate.now().toKotlinLocalDate())}",
+                            dDay = "D" + when {
+                                dayCnt > 0 -> "-${dayCnt}"
+                                dayCnt < 0 -> "+${-dayCnt}"
+                                else -> " Day"
+                            },
                         )
                     }
                 }

diff --git a/feature-main/task/src/main/java/com/seugi/task/TaskViewModel.kt b/feature-main/task/src/main/java/com/seugi/task/TaskViewModel.kt
@@ -7,6 +7,7 @@ import com.seugi.data.task.TaskRepository
 import com.seugi.task.model.CommonUiState
 import com.seugi.task.model.TaskUiState
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.collections.immutable.toImmutableList
 import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -27,7 +28,11 @@ class TaskViewModel @Inject constructor(
                 is Result.Success -> {
                     _state.update { state ->
                         state.copy(
-                            classroomTaskState = CommonUiState.Success(it.data),
+                            classroomTaskState = CommonUiState.Success(
+                                it.data
+                                    .sortedBy { it.dueDate }
+                                    .toImmutableList()
+                            ),
                         )
                     }
                 }
@@ -49,7 +54,11 @@ class TaskViewModel @Inject constructor(
                 is Result.Success -> {
                     _state.update { state ->
                         state.copy(
-                            workspaceTaskState = CommonUiState.Success(it.data),
+                            workspaceTaskState = CommonUiState.Success(
+                                it.data
+                                    .sortedBy { it.dueDate }
+                                    .toImmutableList()
+                            ),
                         )
                     }
                 }