Refactor: 캘린더 사용성 개선

core/design-system/src/commonMain/kotlin/com/ondot/designsystem/extensions/OnDotTextStyle.kt

@@ -29,5 +29,6 @@ fun OnDotTextStyle.toTextStyle(): TextStyle {
         OnDotTextStyle.BodySmallR1 -> typo.bodySmallR1
         OnDotTextStyle.BodySmallR2 -> typo.bodySmallR2
         OnDotTextStyle.BodySmallR3 -> typo.bodySmallR3
+        OnDotTextStyle.BodySmallM -> typo.bodySmallM
     }
 }

core/design-system/src/commonMain/kotlin/com/ondot/designsystem/theme/OnDotTypo.kt

@@ -51,6 +51,7 @@ data class OnDotTypography(
     val bodySmallR1: TextStyle,
     val bodySmallR2: TextStyle,
     val bodySmallR3: TextStyle,
+    val bodySmallM: TextStyle,
 )
 
 @Composable
@@ -79,5 +80,6 @@ fun OnDotTypo(): OnDotTypography {
         bodySmallR1 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Normal, fontSize = 12.sp, lineHeight = lh(12)),
         bodySmallR2 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Normal, fontSize = 11.sp, lineHeight = lh(11)),
         bodySmallR3 = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Normal, fontSize = 8.sp, lineHeight = lh(8)),
+        bodySmallM = TextStyle(fontFamily = fontFamily, fontWeight = FontWeight.Medium, fontSize = 9.sp, lineHeight = lh(9)),
     )
 }

core/design-system/src/commonMain/kotlin/com/ondot/designsystem/theme/String.kt

@@ -33,11 +33,13 @@ const val WORD_DELETE = "삭제"
 const val WORD_YES = "예"
 const val WORD_NO = "아니요"
 const val WORD_PREPARATION = "준비"
+const val WORD_PREPARATION_ITEM = "준비물"
 const val WORD_DEPARTURE = "출발"
 const val WORD_DELETE_ACCOUNT_ACTION = "탈퇴하기"
 const val WORD_RESTORE_ACTION = "되돌리기"
 const val WORD_HOME = "집"
 const val WORD_EVERYTIME = "에브리타임"
+const val WORD_TODAY = "오늘"
 
 // 알람 카테고리
 const val CATEGORY_GENERAL = "기본"
@@ -255,3 +257,5 @@ const val EVERYTIME_ROUTE_LOADING_LABEL = "수업 일정에 맞춰\n알람을 
 
 // Calendar
 const val CALENDAR_EMPTY_SCHEDULES_GUIDE = "등록된 알람이 없습니다."
+
+fun calendarOverflowScheduleCount(count: Int) = "+$count"

core/ui/src/androidMain/kotlin/com/ondot/ui/util/SystemTrace.android.kt

@@ -0,0 +1,20 @@
+package com.ondot.ui.util
+
+import android.os.Trace
+import com.dh.core.ui.BuildConfig
+
+actual inline fun <T> systemTrace(
+    name: String,
+    block: () -> T,
+): T {
+    if (!BuildConfig.DEBUG) {
+        return block()
+    }
+
+    Trace.beginSection(name)
+    return try {
+        block()
+    } finally {
+        Trace.endSection()
+    }
+}

core/ui/src/commonMain/kotlin/com/ondot/ui/util/SystemTrace.kt

@@ -0,0 +1,6 @@
+package com.ondot.ui.util
+
+expect inline fun <T> systemTrace(
+    name: String,
+    block: () -> T,
+): T

core/ui/src/commonMain/kotlin/com/ondot/ui/util/TraceLayoutModifier.kt

@@ -0,0 +1,34 @@
+package com.ondot.ui.util
+
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.layout.layout
+
+/**
+ * Compose의 Layout 단계에서
+ * measure(크기 계산), layout(위치 계산) 각각의 시간이 얼마나 걸리는지를 System Trace에 기록하는 함수
+ * */
+fun Modifier.traceLayout(name: String): Modifier =
+    layout { measurable, constraints ->
+        val placeable =
+            systemTrace("measure:$name") {
+                measurable.measure(constraints)
+            }
+
+        systemTrace("layout:$name") {
+            layout(placeable.width, placeable.height) {
+                placeable.placeRelative(0, 0)
+            }
+        }
+    }
+
+/**
+ * Compose의 Draw 단계에서
+ * draw(그리기) 시간이 얼마나 걸리는지를 System Trace에 기록하는 함수
+ * */
+fun Modifier.traceDraw(name: String): Modifier =
+    drawWithContent {
+        systemTrace("draw:$name") {
+            drawContent()
+        }
+    }

core/ui/src/iosMain/kotlin/com/ondot/ui/util/SystemTrace.ios.kt

@@ -0,0 +1,6 @@
+package com.ondot.ui.util
+
+actual inline fun <T> systemTrace(
+    name: String,
+    block: () -> T,
+): T = block()

core/util/src/commonMain/kotlin/com/ondot/util/DateTimeFormatter.kt

@@ -156,6 +156,9 @@ object DateTimeFormatter {
     /** LocalDate 06월 13일 화요일 형태로 포맷 */
     fun LocalDate.formatKoreanMonthDay(): String = "${month.number.pad2()}월 ${day.pad2()}일 ${this.extractDayOfWeek()}"
 
+    /** LocalDate 6월 13일 화요일 형태로 포맷 */
+    fun LocalDate.formatKoreanMonthDayWithoutPad(): String = "${month.number}월 ${day}일 ${this.extractDayOfWeek()}"
+
     /** iso 문자열을 days 만큼 뒤로 미룸 */
     fun plusDays(
         iso: String,

data/src/commonMain/kotlin/com/ondot/data/model/response/calendar/CalendarRangeResponse.kt

@@ -29,4 +29,6 @@ data class CalendarScheduleSummaryResponse(
     val isRepeat: Boolean,
     @SerialName("appointmentAt")
     val appointmentAt: String,
+    @SerialName("hasActiveAlarm")
+    val hasActiveAlarm: Boolean,
 )

data/src/commonMain/kotlin/com/ondot/data/model/response/calendar/mapper/CalendarResponseMapper.kt

@@ -19,6 +19,8 @@ fun CalendarRangeResponse.toDomain(): List<CalendarDateScheduleSummary> =
                     CalendarDateScheduleSummaryItem(
                         scheduleId = it.scheduleId,
                         title = it.title,
+                        isRepeat = it.isRepeat,
+                        hasActiveAlarm = it.hasActiveAlarm,
                     )
                 },
         )

domain/src/commonMain/kotlin/com/ondot/domain/model/calendar/CalendarDateScheduleSummary.kt

@@ -10,4 +10,6 @@ data class CalendarDateScheduleSummary(
 data class CalendarDateScheduleSummaryItem(
     val scheduleId: Long,
     val title: String,
+    val isRepeat: Boolean,
+    val hasActiveAlarm: Boolean,
 )

domain/src/commonMain/kotlin/com/ondot/domain/model/enums/OnDotTextStyle.kt

@@ -20,4 +20,5 @@ enum class OnDotTextStyle {
     BodySmallR1,
     BodySmallR2,
     BodySmallR3,
+    BodySmallM,
 }

feature/calendar/src/commonMain/kotlin/com/ondot/calendar/contract/CalendarIntent.kt

@@ -12,6 +12,8 @@ sealed interface CalendarIntent : Intent {
 
     data object MoveToNextMonth : CalendarIntent
 
+    data object MoveToToday : CalendarIntent
+
     data class ToggleAlarm(
         val scheduleId: Long,
         val enabled: Boolean,

feature/calendar/src/commonMain/kotlin/com/ondot/calendar/contract/CalendarScheduleItemUiModel.kt

@@ -12,4 +12,5 @@ data class CalendarScheduleItemUiModel(
     val isAlarmEnabled: Boolean,
     val isPast: Boolean,
     val repeatDays: List<Int>,
+    val preparationNote: String = "",
 )

feature/calendar/src/commonMain/kotlin/com/ondot/calendar/contract/CalendarUiState.kt

@@ -45,6 +45,8 @@ data class CalendarMonth(
 data class CalendarScheduleMarker(
     val scheduleId: Long,
     val title: String,
+    val isRepeat: Boolean,
+    val hasActiveAlarm: Boolean,
 )
 
 @Immutable
@@ -156,6 +158,7 @@ fun Schedule.toCalendarScheduleItemUiModel(
         isAlarmEnabled = hasActiveAlarm,
         isPast = isPast,
         repeatDays = repeatDays,
+        preparationNote = preparationNote,
     )
 }
 

feature/calendar/src/commonMain/kotlin/com/ondot/calendar/contract/CalendarViewModel.kt

@@ -19,9 +19,13 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.DatePeriod
 import kotlinx.datetime.LocalDate
+import kotlinx.datetime.TimeZone
 import kotlinx.datetime.number
 import kotlinx.datetime.plus
+import kotlinx.datetime.toLocalDateTime
 import kotlin.coroutines.cancellation.CancellationException
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 class CalendarViewModel(
     private val calendarRepository: CalendarRepository,
@@ -84,6 +88,21 @@ class CalendarViewModel(
                 loadSchedulesFor(nextSelectedDate)
             }
 
+            CalendarIntent.MoveToToday -> {
+                val today = today()
+                val todayMonth = CalendarMonth(today.year, today.month.number)
+
+                reduce {
+                    copy(
+                        currentMonth = todayMonth,
+                        selectedDate = today,
+                    )
+                }
+
+                getScheduleMarkersInRange(today)
+                loadSchedulesFor(today)
+            }
+
             is CalendarIntent.ToggleAlarm -> {
                 toggleAlarm(
                     scheduleId = intent.scheduleId,
@@ -141,7 +160,12 @@ class CalendarViewModel(
                         summaries.associate { summary ->
                             summary.date to
                                 summary.schedules.map { schedule ->
-                                    CalendarScheduleMarker(scheduleId = schedule.scheduleId, title = schedule.title)
+                                    CalendarScheduleMarker(
+                                        scheduleId = schedule.scheduleId,
+                                        title = schedule.title,
+                                        isRepeat = schedule.isRepeat,
+                                        hasActiveAlarm = schedule.hasActiveAlarm,
+                                    )
                                 }
                         }
 
@@ -513,3 +537,10 @@ private fun daysInMonth(
     }
 
 private fun isLeapYear(year: Int): Boolean = (year % 4 == 0 && year % 100 != 0) || (year % 400 == 0)
+
+@OptIn(ExperimentalTime::class)
+private fun today(): LocalDate =
+    Clock.System
+        .now()
+        .toLocalDateTime(TimeZone.currentSystemDefault())
+        .date

feature/calendar/src/commonMain/kotlin/com/ondot/calendar/ui/CalendarScreen.kt

@@ -47,6 +47,7 @@ import com.dh.ondot.presentation.ui.theme.DELETE_REPEAT_SCHEDULE_TITLE
 import com.dh.ondot.presentation.ui.theme.WORD_DELETE
 import com.ondot.calendar.contract.CalendarIntent
 import com.ondot.calendar.contract.CalendarInteractionState
+import com.ondot.calendar.contract.CalendarMonth
 import com.ondot.calendar.contract.CalendarSheetAnchor
 import com.ondot.calendar.contract.CalendarSheetState
 import com.ondot.calendar.contract.CalendarSideEffect
@@ -60,6 +61,7 @@ import com.ondot.calendar.ui.component.CalendarBottomSheet
 import com.ondot.calendar.ui.component.CalendarMonthGrid
 import com.ondot.calendar.ui.component.CalendarTopBar
 import com.ondot.calendar.ui.component.CalendarWeekHeader
+import com.ondot.calendar.ui.component.TodayFAB
 import com.ondot.designsystem.components.OnDotDialog
 import com.ondot.designsystem.components.OnDotText
 import com.ondot.designsystem.theme.OnDotColor.Gray800
@@ -70,10 +72,15 @@ import com.ondot.domain.model.enums.OnDotTextStyle
 import com.ondot.ui.util.ToastManager
 import kotlinx.coroutines.launch
 import kotlinx.datetime.LocalDate
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.number
+import kotlinx.datetime.toLocalDateTime
 import ondot.core.design_system.generated.resources.Res
 import ondot.core.design_system.generated.resources.ic_plus
 import org.jetbrains.compose.resources.painterResource
 import org.koin.compose.viewmodel.koinViewModel
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 @Composable
 fun CalendarRoute(
@@ -102,19 +109,22 @@ fun CalendarRoute(
         onSelectDate = { viewModel.dispatch(CalendarIntent.SelectDate(it)) },
         onMoveToPreviousMonth = { viewModel.dispatch(CalendarIntent.MoveToPreviousMonth) },
         onMoveToNextMonth = { viewModel.dispatch(CalendarIntent.MoveToNextMonth) },
+        onMoveToToday = { viewModel.dispatch(CalendarIntent.MoveToToday) },
         onToggleAlarm = { scheduleId, enabled -> viewModel.dispatch(CalendarIntent.ToggleAlarm(scheduleId, enabled)) },
         onAddSchedule = navigateToCreateGeneralSchedule,
         onDelete = { id, isPast -> viewModel.dispatch(CalendarIntent.DeleteScheduleItem(id, isPast)) },
         onClickSchedule = { navigateToEditSchedule(it) },
     )
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 private fun CalendarScreen(
     uiState: CalendarUiState,
     onSelectDate: (LocalDate) -> Unit,
     onMoveToPreviousMonth: () -> Unit,
     onMoveToNextMonth: () -> Unit,
+    onMoveToToday: () -> Unit,
     onToggleAlarm: (Long, Boolean) -> Unit,
     onAddSchedule: () -> Unit,
     onDelete: (Long, Boolean) -> Unit,
@@ -149,6 +159,20 @@ private fun CalendarScreen(
 
     var scheduleIdPendingDelete by remember { mutableStateOf<Long?>(null) }
 
+    // TodayFAB 렌더링을 위한 상태 변수
+    val today =
+        remember {
+            Clock.System
+                .now()
+                .toLocalDateTime(TimeZone.currentSystemDefault())
+                .date
+        }
+    val todayMonth =
+        remember(today) {
+            CalendarMonth(today.year, today.month.number)
+        }
+    val shouldShowTodayFab = uiState.currentMonth != todayMonth
+
     BoxWithConstraints(
         modifier =
             Modifier
@@ -300,7 +324,7 @@ private fun CalendarScreen(
                         Spacer(Modifier.height(20.dp))
 
                         CalendarWeekHeader(
-                            modifier = Modifier.padding(horizontal = 22.dp),
+                            modifier = Modifier.padding(horizontal = 16.dp),
                         )
                     }
 
@@ -309,7 +333,7 @@ private fun CalendarScreen(
                             Modifier
                                 .fillMaxWidth()
                                 .height(calendarBodyHeight)
-                                .padding(horizontal = 22.dp)
+                                .padding(horizontal = 16.dp)
                                 .clip(RoundedCornerShape(bottomStart = 24.dp, bottomEnd = 24.dp)),
                     ) {
                         AnimatedContent(
@@ -384,6 +408,7 @@ private fun CalendarScreen(
                             onDelete = onDelete,
                             onClickSchedule = onClickSchedule,
                             onShowScheduleDeleteDialog = { scheduleIdPendingDelete = it },
+                            traceName = "CalendarBottomSheetBase",
                         )
                     }
                 }
@@ -417,6 +442,7 @@ private fun CalendarScreen(
                     onDelete = onDelete,
                     onClickSchedule = onClickSchedule,
                     onShowScheduleDeleteDialog = { scheduleIdPendingDelete = it },
+                    traceName = "CalendarBottomSheetOverlay",
                 )
             }
 
@@ -428,6 +454,16 @@ private fun CalendarScreen(
                 onClick = onAddSchedule,
             )
 
+            if (shouldShowTodayFab) {
+                TodayFAB(
+                    modifier =
+                        Modifier
+                            .align(Alignment.BottomCenter)
+                            .padding(bottom = 24.dp),
+                    onClick = onMoveToToday,
+                )
+            }
+
             if (scheduleIdPendingDelete != null) {
                 OnDotDialog(
                     dialogType = DialogType.TWO,