[UI] MissionProcess 변경된 TimeStap 형식 적용 (#208)

hellokitty-coding-club · Mar 8, 2024 · d995509 · d995509
1 parent c05c30a
commit d995509
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 18 deletions.
diff --git a/common-ui/src/main/java/com/lgtm/android/common_ui/model/MissionProcessInfoUI.kt b/common-ui/src/main/java/com/lgtm/android/common_ui/model/MissionProcessInfoUI.kt
@@ -4,15 +4,15 @@ import android.text.SpannableString
 import java.io.Serializable
 
 data class MissionProcessInfoUI(
-    val waitingForPaymentDate: String?,
+    val waitingForPaymentDate: SpannableString?,
     val waitingForPaymentDetail: SpannableString? = null,
-    val paymentConfirmationDate: String?,
+    val paymentConfirmationDate: SpannableString?,
     val paymentConfirmationDetail: SpannableString? = null,
-    val missionProceedingDate: String?,
+    val missionProceedingDate: SpannableString?,
     val missionProceedingDetail: SpannableString? = null,
-    val codeReviewDate: String?,
+    val codeReviewDate: SpannableString?,
     val codeReviewDetail: SpannableString? = null,
-    val missionFinishedDate: String?,
-    val feedbackReviewedDate: String?,
+    val missionFinishedDate: SpannableString?,
+    val feedbackReviewedDate: SpannableString?,
     val depositorName: String? = null,
 ) : Serializable
diff --git a/common-ui/src/main/java/com/lgtm/android/common_ui/model/mapper/UiMapper.kt b/common-ui/src/main/java/com/lgtm/android/common_ui/model/mapper/UiMapper.kt
@@ -136,6 +136,25 @@ fun createRedSpannableText(text: String, redTextStart: Int, redTextEnd: Int): Sp
     return spannableText
 }
 
+fun createLgtmDateTimeSpannable(localDateTime: LocalDateTime?): SpannableString {
+    return when (localDateTime) {
+        null -> SpannableString("-")
+
+        else -> {
+            val time = localDateTime.format(korean12HourTimeFormatter)
+            val date = localDateTime.format(dotStyleDateFormatter)
+            val spannableText = SpannableString("$date | $time")
+            spannableText.setSpan(
+                ForegroundColorSpan(Color.parseColor(LGTM_GRAY_3)),
+                date.length + 1,
+                date.length + 2,
+                Spannable.SPAN_EXCLUSIVE_INCLUSIVE
+            )
+            spannableText
+        }
+    }
+}
+
 fun MissionProcessInfoVO.toUiModel(
     role: Role,
     processStatus: ProcessState,
@@ -198,12 +217,12 @@ fun MissionProcessInfoVO.toUiModel(
         else null
 
     return MissionProcessInfoUI(
-        waitingForPaymentDate = waitingForPaymentDate,
-        paymentConfirmationDate = paymentConfirmationDate,
-        missionProceedingDate = missionProceedingDate,
-        codeReviewDate = codeReviewDate,
-        feedbackReviewedDate = feedbackReviewedDate,
-        missionFinishedDate = missionFinishedDate,
+        waitingForPaymentDate = createLgtmDateTimeSpannable(waitingForPaymentDate),
+        paymentConfirmationDate = createLgtmDateTimeSpannable(paymentConfirmationDate),
+        missionProceedingDate = createLgtmDateTimeSpannable(missionProceedingDate),
+        codeReviewDate = createLgtmDateTimeSpannable(codeReviewDate),
+        feedbackReviewedDate = createLgtmDateTimeSpannable(feedbackReviewedDate),
+        missionFinishedDate = createLgtmDateTimeSpannable(missionFinishedDate),
         waitingForPaymentDetail = waitingForPaymentDetail,
         paymentConfirmationDetail = paymentConfirmationDetail,
         missionProceedingDetail = missionProceedingDetail,

diff --git a/domain/src/main/java/com/lgtm/domain/usecase/MissionUseCase.kt b/domain/src/main/java/com/lgtm/domain/usecase/MissionUseCase.kt
@@ -163,12 +163,12 @@ class MissionUseCase @Inject constructor(
 
     private fun formattingTimestamps(missionProcessInfo: MissionProcessInfoVO): MissionProcessInfoVO {
         return missionProcessInfo.copy(
-            waitingForPaymentDate = convertTimestampToCustomFormat(missionProcessInfo.waitingForPaymentDate),
-            paymentConfirmationDate = convertTimestampToCustomFormat(missionProcessInfo.paymentConfirmationDate),
-            missionProceedingDate = convertTimestampToCustomFormat(missionProcessInfo.missionProceedingDate),
-            codeReviewDate = convertTimestampToCustomFormat(missionProcessInfo.codeReviewDate),
-            missionFinishedDate = convertTimestampToCustomFormat(missionProcessInfo.missionFinishedDate),
-            feedbackReviewedDate = convertTimestampToCustomFormat(missionProcessInfo.feedbackReviewedDate)
+            waitingForPaymentDate = missionProcessInfo.waitingForPaymentDate,
+            paymentConfirmationDate = missionProcessInfo.paymentConfirmationDate,
+            missionProceedingDate = missionProcessInfo.missionProceedingDate,
+            codeReviewDate = missionProcessInfo.codeReviewDate,
+            missionFinishedDate = missionProcessInfo.missionFinishedDate,
+            feedbackReviewedDate = missionProcessInfo.feedbackReviewedDate
         )
     }