Merge pull request #359 from apeun-gidaechi/feature/354-dday-plus-vis…

…ible Feature/Dday plus visible
apeun-gidaechi · Nov 5, 2024 · f4a063d · f4a063d
2 parents 41caff2 + 20f8254
commit f4a063d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/feature-main/home/src/main/java/com/seugi/home/card/TaskCard.kt b/feature-main/home/src/main/java/com/seugi/home/card/TaskCard.kt
@@ -48,10 +48,15 @@ fun TaskCard(uiState: CommonUiState<ImmutableList<TaskModel>>, navigateToTask: (
                                 dDay = "기한없음",
                             )
                         } else {
+                            val dayCnt = LocalDate.now().toKotlinLocalDate().daysUntil(task.dueDate!!.date)
                             HomeCalendarCard(
                                 date = "${task.dueDate!!.monthNumber}/${task.dueDate!!.dayOfMonth.toString().padStart(2, '0')}",
                                 content = task.title,
-                                dDay = "D-${-task.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/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
@@ -8,6 +8,7 @@ import com.seugi.task.model.CommonUiState
 import com.seugi.task.model.TaskUiState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -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(),
+                            ),
                         )
                     }
                 }