[Feat/IPLC-30] 자격증 관리 api 연결

app/src/main/java/org/sopt/certi/core/component/bottomsheet/RegisterTestInfoBottomSheet.kt

@@ -126,12 +126,12 @@ fun RegisterTestInfoBottomSheet(
 
     LaunchedEffect(forModify) {
         if (forModify && certificationData != null) {
-            // TODO data 형식에 맞게 여기서 삽입 @이지현
-
-//            dateText = certificationData.testDate
-//            cityText = certificationData.city
-//            districtText = certificationData.state
-//            timeData = certificationData.testTime
+            dateText = certificationData.testDate
+            cityText = certificationData.city
+            districtText = certificationData.state
+            timeData = certificationData.testTime.split(":").take(2)
+                .mapNotNull { it.toIntOrNull() }
+                .let { if (it.size == 2) Pair(it[0], it[1]) else Pair(0, 0) }
         }
     }
 
@@ -435,7 +435,10 @@ fun RegisterTestInfoBottomSheet(
 
                             Spacer(Modifier.heightForScreenPercentage(12.dp))
 
-                            CustomTimePicker { hour, minute ->
+                            CustomTimePicker(
+                                initialHour = timeData.first,
+                                initialMinute = timeData.second
+                            ) { hour, minute ->
                                 timeData = Pair(hour, minute)
                             }
 

app/src/main/java/org/sopt/certi/core/component/section/CertInfoSection.kt

@@ -20,7 +20,8 @@ fun CertInfoSection(
     @DrawableRes iconRes: Int,
     testInfo: String,
     modifier: Modifier = Modifier,
-    iconColor: Color = CertiTheme.colors.gray300
+    iconColor: Color = CertiTheme.colors.gray300,
+    textColor: Color = CertiTheme.colors.black
 ) {
     Row(
         modifier = modifier,
@@ -35,7 +36,7 @@ fun CertInfoSection(
         Text(
             text = testInfo,
             style = CertiTheme.typography.caption.regular_14,
-            color = CertiTheme.colors.black
+            color = textColor
         )
     }
 }

app/src/main/java/org/sopt/certi/core/component/section/CertiEmptySection.kt

@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -27,9 +26,7 @@ fun CertiEmptySection(
     modifier: Modifier = Modifier
 ) {
     Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(top = screenHeightDp(60.dp)),
+        modifier = modifier.fillMaxWidth(),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Image(

app/src/main/java/org/sopt/certi/core/component/section/MyCertificationListItemSection.kt

@@ -27,9 +27,11 @@ import org.sopt.certi.core.util.heightForScreenPercentage
 import org.sopt.certi.core.util.noRippleClickable
 import org.sopt.certi.core.util.roundedBackgroundWithBorder
 import org.sopt.certi.core.util.screenWidthDp
+import org.sopt.certi.core.util.toSpacedDotDate
 import org.sopt.certi.core.util.widthForScreenPercentage
 import org.sopt.certi.domain.model.certification.CertificationData
 import org.sopt.certi.ui.theme.CertiTheme
+import java.time.format.DateTimeFormatter
 
 @Composable
 fun MyCertificationListItemSection(
@@ -98,12 +100,13 @@ fun MyCertificationListItemSection(
             if (certificationData.isAcquired) {
                 CertInfoSection(
                     iconRes = R.drawable.ic_date_16,
-                    testInfo = certificationData.createdAt.toString()
+                    testInfo = certificationData.acquisitionDate.toSpacedDotDate()
                 )
                 CertInfoSection(
                     iconRes = R.drawable.ic_level,
                     iconColor = CertiTheme.colors.gray400,
-                    testInfo = certificationData.grade
+                    testInfo = if (certificationData.grade.isBlank()) stringResource(R.string.acquired_grade_empty_text) else certificationData.grade,
+                    textColor = if (certificationData.grade.isBlank()) CertiTheme.colors.gray200 else CertiTheme.colors.black
                 )
             } else {
                 CertInfoSection(
@@ -112,7 +115,7 @@ fun MyCertificationListItemSection(
                 )
                 CertInfoSection(
                     iconRes = R.drawable.ic_time,
-                    testInfo = certificationData.testTime
+                    testInfo = certificationData.testTime.format(DateTimeFormatter.ofPattern("HH:mm"))
                 )
             }
         }
@@ -123,7 +126,7 @@ fun MyCertificationListItemSection(
 private fun CertificationStatus(acquired: Boolean) {
     Row(
         modifier = Modifier
-            .background(color = CertiTheme.colors.purpleBlue, shape = RoundedCornerShape(100.dp))
+            .background(color = if (acquired) CertiTheme.colors.mainBlue else CertiTheme.colors.purpleBlue, shape = RoundedCornerShape(100.dp))
             .padding(horizontal = screenWidthDp(6.dp), vertical = screenWidthDp(4.dp)),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(4.dp)

app/src/main/java/org/sopt/certi/core/component/timepicker/TimePicker.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -44,13 +43,22 @@ enum class TimePeriodType() {
 @Composable
 fun CustomTimePicker(
     modifier: Modifier = Modifier,
-    initialHour: Int = 12,
+    initialHour: Int = 0,
     initialMinute: Int = 0,
     onTimeSelected: (hour: Int, minute: Int) -> Unit = { _, _ -> }
 ) {
-    var selectedPeriod by remember { mutableStateOf(if (initialHour < 12) TimePeriodType.AM else TimePeriodType.PM) }
-    var selectedHour by remember { mutableIntStateOf(if (initialHour == 0) 12 else if (initialHour > 12) initialHour - 12 else initialHour) }
-    var selectedMinute by remember { mutableIntStateOf(initialMinute) }
+    fun convertHour(h: Int) = if (h == 0 || h == -1) 12 else if (h > 12) h - 12 else h
+    fun getPeriod(h: Int) = if (h < 12) TimePeriodType.AM else TimePeriodType.PM
+
+    var selectedPeriod by remember { mutableStateOf(getPeriod(initialHour)) }
+    var selectedHour by remember { mutableIntStateOf(convertHour(initialHour)) }
+    var selectedMinute by remember { mutableIntStateOf(if (initialMinute == -1) 0 else initialMinute) }
+
+    LaunchedEffect(initialHour, initialMinute) {
+        selectedPeriod = getPeriod(initialHour)
+        selectedHour = convertHour(initialHour)
+        selectedMinute = if (initialMinute == -1) 0 else initialMinute
+    }
 
     Row(
         modifier = modifier.fillMaxWidth(),
@@ -79,14 +87,8 @@ fun CustomTimePicker(
 
         // 시간 Picker
         TimePickerColumn(
-            items = (1..12).map {
-                if (it.toString().length == 1) {
-                    "0$it"
-                } else {
-                    it.toString()
-                }
-            },
-            selectedItem = selectedHour.toString(),
+            items = (listOf(12) + (1..11)).map { it.toString().padStart(2, '0') },
+            selectedItem = selectedHour.toString().padStart(2, '0'),
             onItemSelected = {
                 selectedHour = it.toInt()
                 onTimeSelected(
@@ -111,14 +113,8 @@ fun CustomTimePicker(
 
         // 분 Picker
         TimePickerColumn(
-            items = (1..60).map {
-                if (it.toString().length == 1) {
-                    "0$it"
-                } else {
-                    it.toString()
-                }
-            },
-            selectedItem = if (selectedMinute.toString().length == 1) "0$selectedMinute" else selectedMinute.toString(),
+            items = (0..59).map { it.toString().padStart(2, '0') },
+            selectedItem = selectedMinute.toString().padStart(2, '0'),
             onItemSelected = {
                 selectedMinute = it.toInt()
                 onTimeSelected(
@@ -159,10 +155,25 @@ fun TimePickerColumn(
             }
     }
 
+    var programmaticScroll by remember { mutableStateOf(false) }
+
+    // selectedItem이 변경되면 해당 위치로 스크롤
+    LaunchedEffect(selectedItem) {
+        val index = items.indexOf(selectedItem)
+        if (index >= 0) {
+            programmaticScroll = true
+            coroutineScope.launch {
+                listState.scrollToItem(index)
+            }.invokeOnCompletion {
+                programmaticScroll = false
+            }
+        }
+    }
+
     // 스크롤이 멈췄을 때 선택 확정
-    LaunchedEffect(listState) {
+    LaunchedEffect(listState, programmaticScroll) {
         snapshotFlow { listState.isScrollInProgress }
-            .filter { !it } // 스크롤이 멈췄을 때
+            .filter { !it && !programmaticScroll } // 스크롤이 멈췄을 때
             .collect {
                 val centerIndex = listState.firstVisibleItemIndex
                 if (centerIndex in items.indices) {
@@ -171,16 +182,6 @@ fun TimePickerColumn(
             }
     }
 
-    // selectedItem이 변경되면 해당 위치로 스크롤
-    LaunchedEffect(selectedItem) {
-        val index = items.indexOf(selectedItem)
-        if (index >= 0 && !listState.isScrollInProgress) {
-            coroutineScope.launch {
-                listState.animateScrollToItem(index)
-            }
-        }
-    }
-
     Box(
         modifier = modifier.heightForScreenPercentage(120.dp),
         contentAlignment = Alignment.Center
@@ -223,15 +224,6 @@ fun TimePickerColumn(
             items(items.size) { index ->
                 val item = items[index]
                 val isSelected = index == currentCenterIndex
-                val isVisible = when (items.size) {
-                    13 -> {
-                        item != "13"
-                    }
-                    61 -> {
-                        item != "61"
-                    }
-                    else -> true
-                }
 
                 Text(
                     text = item,
@@ -240,7 +232,6 @@ fun TimePickerColumn(
                     modifier = Modifier
                         .heightForScreenPercentage(40.dp)
                         .wrapContentHeight()
-                        .alpha(if (isVisible) 1f else 0f)
                 )
             }
 
@@ -276,10 +267,25 @@ fun TimePeriodPickerColumn(
             }
     }
 
+    var programmaticScroll by remember { mutableStateOf(false) }
+
+    // selectedItem이 변경되면 해당 위치로 스크롤
+    LaunchedEffect(selectedItem) {
+        val index = items.indexOf(selectedItem)
+        if (index >= 0) {
+            programmaticScroll = true
+            coroutineScope.launch {
+                listState.scrollToItem(index)
+            }.invokeOnCompletion {
+                programmaticScroll = false
+            }
+        }
+    }
+
     // 스크롤이 멈췄을 때 선택 확정
-    LaunchedEffect(listState) {
+    LaunchedEffect(listState, programmaticScroll) {
         snapshotFlow { listState.isScrollInProgress }
-            .filter { !it } // 스크롤이 멈췄을 때
+            .filter { !it && !programmaticScroll } // 스크롤이 멈췄을 때
             .collect {
                 val centerIndex = listState.firstVisibleItemIndex
                 if (centerIndex in items.indices) {
@@ -288,16 +294,6 @@ fun TimePeriodPickerColumn(
             }
     }
 
-    // selectedItem이 변경되면 해당 위치로 스크롤
-    LaunchedEffect(selectedItem) {
-        val index = items.indexOf(selectedItem)
-        if (index >= 0 && !listState.isScrollInProgress) {
-            coroutineScope.launch {
-                listState.animateScrollToItem(index)
-            }
-        }
-    }
-
     Box(
         modifier = modifier.heightForScreenPercentage(120.dp),
         contentAlignment = Alignment.Center

app/src/main/java/org/sopt/certi/core/util/StringExt.kt

@@ -2,7 +2,10 @@ package org.sopt.certi.core.util
 
 import org.sopt.certi.domain.model.DateData
 import java.time.LocalDate
+import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+import java.util.Locale
 
 object DateFormatters {
     val dotDate: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy.MM.dd")
@@ -32,3 +35,38 @@ fun String.toDateData(): DateData {
         day = parts[2].toInt()
     )
 }
+
+fun String.toSpacedDotDate(): String {
+    return try {
+        val standardInput = this.replace(".", "-")
+        val date = LocalDate.parse(standardInput)
+        val formatter = DateTimeFormatter.ofPattern("yyyy. MM. dd")
+        date.format(formatter)
+    } catch (e: Exception) {
+        this
+    }
+}
+
+fun String.toLocalizedDate(): String {
+    return try {
+        val standardInput = this.replace(".", "-")
+        val date = LocalDate.parse(standardInput)
+        val formatter = DateTimeFormatter
+            .ofLocalizedDate(FormatStyle.LONG)
+            .withLocale(Locale.getDefault())
+        date.format(formatter)
+    } catch (e: Exception) {
+        this
+    }
+}
+
+fun String.splitDateTime(): Pair<String, String> {
+    return try {
+        val parsed = LocalDateTime.parse(this)
+        val date = parsed.format(DateFormatters.dotDate)
+        val time = parsed.toLocalTime().toString()
+        date to time
+    } catch (e: Exception) {
+        this to ""
+    }
+}

app/src/main/java/org/sopt/certi/core/util/UiStateExt.kt

@@ -0,0 +1,7 @@
+package org.sopt.certi.core.util
+
+import org.sopt.certi.core.state.UiState
+
+fun <T> UiState<T>.getSuccessDataOrNull(): T? {
+    return (this as? UiState.Success)?.data
+}

app/src/main/java/org/sopt/certi/data/mapper/todomain/acquisition/AcquisitionListResponseMapper.kt

@@ -1,18 +1,22 @@
 package org.sopt.certi.data.mapper.todomain.acquisition
 
-import org.sopt.certi.core.util.toLocalDateOrMin
 import org.sopt.certi.data.remote.dto.response.GetAcquisitionListResponseDto
 import org.sopt.certi.domain.model.certification.CertificationData
 
 fun GetAcquisitionListResponseDto.toDomain(): List<CertificationData> {
     return acquisitionListDetailResponses.map {
         CertificationData(
-            certificationId = it.acquisitionId,
+            acquisitionId = it.acquisitionId,
+            certificationId = it.certificationId,
+            certificationType = it.certificationType,
             index = it.index,
             certificationName = it.name,
-            createdAt = it.createdAt.toLocalDateOrMin(),
+            description = it.description,
             cardFrontImageUrl = it.cardFrontImageUrl,
-            tags = it.tags
+            tags = it.tags,
+            acquisitionDate = it.acquisitionDate,
+            grade = it.grade ?: "",
+            isAcquired = true
         )
     }
 }