[feat] #129 date 자료형 string으로 변환

Team-Recordy · Oct 11, 2024 · 48315b5 · 48315b5
1 parent c0cf5d0
commit 48315b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/feature/detail/src/main/java/com/record/detail/DetailpageContract.kt b/feature/detail/src/main/java/com/record/detail/DetailpageContract.kt
@@ -6,7 +6,6 @@ import com.record.ui.base.UiState
 import com.record.video.model.VideoData
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
-import java.util.Date
 
 data class DetailpageState(
     val placeName: String = "국립현대미술관",
@@ -16,7 +15,7 @@ data class DetailpageState(
     val reviewCursor: Long = 0,
     val reviewIsEnd: Boolean = false,
     val detailpageTab: DetailpageTab = DetailpageTab.LIST,
-    val exhibitionList: ImmutableList<Triple<String, Date, Date>> = emptyList<Triple<String, Date, Date>>().toImmutableList(),
+    val exhibitionList: ImmutableList<Triple<String, String, String>> = emptyList<Triple<String, String, String>>().toImmutableList(),
     val reviewList: ImmutableList<VideoData> = emptyList<VideoData>().toImmutableList(),
 ) : UiState
 

diff --git a/feature/detail/src/main/java/com/record/detail/screen/ListScreen.kt b/feature/detail/src/main/java/com/record/detail/screen/ListScreen.kt
@@ -26,13 +26,10 @@ import androidx.compose.ui.unit.dp
 import com.record.designsystem.R
 import com.record.designsystem.theme.RecordyTheme
 import kotlinx.collections.immutable.ImmutableList
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 
 @Composable
 fun ListScreen(
-    exhibitionItems: ImmutableList<Triple<String, Date, Date>>,
+    exhibitionItems: ImmutableList<Triple<String, String, String>>,
     exhibitionCount: Int,
     selectedChip: ChipTab,
     onChipSelected: (ChipTab) -> Unit,
@@ -103,7 +100,7 @@ fun ListScreen(
 }
 
 @Composable
-fun ExhibitionItem(name: String, startDate: Date, endDate: Date, onButtonClick: () -> Unit) {
+fun ExhibitionItem(name: String, startDate: String, endDate: String, onButtonClick: () -> Unit) {
     Box(
         modifier = Modifier
             .fillMaxWidth()
@@ -144,9 +141,10 @@ fun ExhibitionItem(name: String, startDate: Date, endDate: Date, onButtonClick:
     }
 }
 
-fun formatDate(startDate: Date, endDate: Date): String {
-    val dateFormat = SimpleDateFormat("yyyy년 MM월 dd일", Locale.getDefault())
-    return "${dateFormat.format(startDate)}~${dateFormat.format(endDate)}"
+fun formatDate(startDate: String, endDate: String): String {
+    val startFormatted = "${startDate.substring(0, 4)}년 ${startDate.substring(4, 6)}월 ${startDate.substring(6, 8)}일"
+    val endFormatted = "${endDate.substring(0, 4)}년 ${endDate.substring(4, 6)}월 ${endDate.substring(6, 8)}일"
+    return "$startFormatted~$endFormatted"
 }
 
 @Composable