feat: 받은 봉투 - 날짜 추가

YAPP-Github · Jan 31, 2024 · a4af27c · a4af27c
1 parent 36f7ccf
commit a4af27c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/core/model/src/main/java/com/susu/core/model/Envelope.kt b/core/model/src/main/java/com/susu/core/model/Envelope.kt
@@ -2,6 +2,7 @@ package com.susu.core.model
 
 import androidx.compose.runtime.Stable
 import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.toKotlinLocalDateTime
 import kotlinx.serialization.Serializable
 
 @Stable
@@ -14,7 +15,7 @@ data class Envelope(
     val gift: String? = null,
     val memo: String? = null,
     val hasVisited: Boolean? = null,
-    val handedOverAt: LocalDateTime? = null,
+    val handedOverAt: LocalDateTime = java.time.LocalDateTime.now().toKotlinLocalDateTime(),
     val friend: Friend = Friend(),
     val relationship: Relationship = Relationship(),
 )
diff --git a/core/ui/src/main/java/com/susu/core/ui/util/Date.kt b/core/ui/src/main/java/com/susu/core/ui/util/Date.kt
@@ -14,6 +14,15 @@ fun LocalDateTime.to_yyyy_dot_MM_dot_dd(): String {
     return this.format(formatter)
 }
 
+/**
+ * 2023년 11월 25일
+ */
+@Suppress("detekt:FunctionNaming")
+fun LocalDateTime.to_yyyy_korYear_MM_korMonth_dd_korDay(): String {
+    val formatter = DateTimeFormatter.ofPattern("yyyy년 MM월 dd일")
+    return this.format(formatter)
+}
+
 fun getSafeLocalDateTime(year: Int, month: Int, day: Int): LocalDateTime = try {
     LocalDateTime.of(year, month, day, 0, 0)
 } catch (e: DateTimeException) {

diff --git a/data/src/main/java/com/susu/data/remote/model/response/EnvelopeResponse.kt b/data/src/main/java/com/susu/data/remote/model/response/EnvelopeResponse.kt
@@ -22,7 +22,7 @@ data class EnvelopeInfo(
     val gift: String? = null,
     val memo: String? = null,
     val hasVisited: Boolean? = null,
-    val handedOverAt: LocalDateTime? = null,
+    val handedOverAt: LocalDateTime,
 )
 
 @Serializable

diff --git a/...ed/src/main/java/com/susu/feature/received/envelopedetail/ReceivedEnvelopeDetailScreen.kt b/...ed/src/main/java/com/susu/feature/received/envelopedetail/ReceivedEnvelopeDetailScreen.kt
@@ -29,8 +29,11 @@ import com.susu.core.ui.DialogToken
 import com.susu.core.ui.SnackbarToken
 import com.susu.core.ui.extension.collectWithLifecycle
 import com.susu.core.ui.extension.toMoneyFormat
+import com.susu.core.ui.util.to_yyyy_dot_MM_dot_dd
+import com.susu.core.ui.util.to_yyyy_korYear_MM_korMonth_dd_korDay
 import com.susu.feature.received.R
 import com.susu.feature.received.envelopedetail.component.DetailItem
+import kotlinx.datetime.toJavaLocalDateTime
 
 @Composable
 fun ReceivedEnvelopeDetailRoute(
@@ -146,6 +149,11 @@ fun ReceivedEnvelopeDetailScreen(
                         contentText = uiState.envelope.relationship.customRelation ?: uiState.envelope.relationship.relation,
                         isEmptyContent = false,
                     )
+                    DetailItem(
+                        categoryText = stringResource(com.susu.core.ui.R.string.word_date),
+                        contentText = uiState.envelope.handedOverAt.toJavaLocalDateTime().to_yyyy_korYear_MM_korMonth_dd_korDay(),
+                        isEmptyContent = false,
+                    )
                     DetailItem(
                         categoryText = stringResource(com.susu.core.ui.R.string.word_is_visited),
                         contentText = if (uiState.envelope.hasVisited == true) stringResource(id = com.susu.core.ui.R.string.word_yes) else stringResource(