Merge pull request #145 from TimerTiTi/release-1.1.0

Release 1.1.0

build-logic/src/main/kotlin/com/titi/common/BuildInfo.kt

@@ -9,7 +9,7 @@ object BuildType {
 
 object AppConfig {
     const val APP_ID = "com.titi.app"
-    const val APP_VERSION_NAME = "1.0.4"
-    const val APP_VERSION_CODE = 28
+    const val APP_VERSION_NAME = "1.1.0"
+    const val APP_VERSION_CODE = 29
     const val APP_NAME = "TiTi"
 }

feature/edit/src/main/kotlin/com/titi/app/feature/edit/mapper/TimeMapper.kt

@@ -5,13 +5,22 @@ import java.time.LocalDate
 import java.time.LocalDateTime
 
 fun AMPMHours.toLocalDateTime(currentDate: LocalDate): LocalDateTime {
-    val hours = if (dayTime == AMPMHours.DayTime.AM) hours else hours + 12
-    return currentDate.atTime(hours, minutes)
+    val adjustedHours = when {
+        dayTime == AMPMHours.DayTime.AM && hours == 12 -> 0
+        dayTime == AMPMHours.DayTime.PM && hours == 12 -> 12
+        dayTime == AMPMHours.DayTime.PM -> hours + 12
+        else -> hours
+    }
+    return currentDate.atTime(adjustedHours, minutes)
 }
 
 fun LocalDateTime.toAMPMHours(): AMPMHours {
     return AMPMHours(
-        hours = if (hour < 12) hour else hour - 12,
+        hours = when {
+            hour == 0 -> 12
+            hour > 12 -> hour - 12
+            else -> hour
+        },
         minutes = minute,
         dayTime = if (hour < 12) AMPMHours.DayTime.AM else AMPMHours.DayTime.PM,
     )

release-note.txt

@@ -1,3 +1,2 @@
-TiTi android dev 1.0.4(28)
-- 데일리 수정 및 추가 (Log)
-- 타임 테이블 infinite rendering
+TiTi android dev 1.1.0(29)
+- Time Mapper 수정