Feat: 알람 시간 재계산 기능 구현

build-logic/src/main/java/com/ondot/build_logic/convention/ComposeMultiplatformConventionPlugin.kt

@@ -45,6 +45,10 @@ class ComposeMultiplatformConventionPlugin: Plugin<Project> {
 
         addComposeCommonDependencies(libs)
 
+        dependencies.add(
+            "debugImplementation",
+            libs.findLibrary("compose-uiTooling").get(),
+        )
 
         // TODO(이후에 feature 모듈로 분리되어야 함)
         extensions.configure<KotlinMultiplatformExtension> {
@@ -106,4 +110,4 @@ class ComposeMultiplatformConventionPlugin: Plugin<Project> {
             }
         }
     }
-}
+}

build-logic/src/main/java/com/ondot/build_logic/convention/internal/Extensions.kt

@@ -12,11 +12,12 @@ fun Project.addComposeCommonDependencies(libs: VersionCatalog) {
             implementation(libs.findLibrary("compose-foundation").get())
             implementation(libs.findLibrary("compose-ui").get())
             implementation(libs.findLibrary("compose-material3").get())
+            implementation(libs.findLibrary("compose-components-ui-tooling-preview").get())
             implementation(libs.findLibrary("compose-components-resources").get())
         }
     }
 }
 
 fun Project.applyOnce(id: String) {
     if (!plugins.hasPlugin(id)) pluginManager.apply(id)
-}
+}

core/design-system/src/commonMain/kotlin/com/ondot/designsystem/components/RouteInputSection.kt

@@ -52,6 +52,7 @@ fun RouteInputSection(
     departureFocusRequester: FocusRequester = FocusRequester(),
     arrivalFocusRequester: FocusRequester = FocusRequester(),
     onRouteInputChanged: (String) -> Unit = {},
+    onRouteInputChangedByType: (RouterType, String) -> Unit = { _, value -> onRouteInputChanged(value) },
     onRouteInputFocused: (RouterType) -> Unit = {},
 ) {
     Column(
@@ -67,7 +68,7 @@ fun RouteInputSection(
             input = departurePlaceInput,
             readOnly = readOnly,
             focusRequester = departureFocusRequester,
-            onValueChanged = onRouteInputChanged,
+            onValueChanged = { onRouteInputChangedByType(RouterType.Departure, it) },
             onRouteInputFocused = onRouteInputFocused,
         )
 
@@ -82,7 +83,7 @@ fun RouteInputSection(
             input = arrivalPlaceInput,
             readOnly = readOnly,
             focusRequester = arrivalFocusRequester,
-            onValueChanged = onRouteInputChanged,
+            onValueChanged = { onRouteInputChangedByType(RouterType.Arrival, it) },
             onRouteInputFocused = onRouteInputFocused,
         )
     }
@@ -140,6 +141,7 @@ fun RouteInputTextField(
                 }
             },
             readOnly = readOnly,
+            enabled = !readOnly,
             singleLine = true,
             textStyle = OnDotTypo().bodyLargeR1.copy(color = Gray0),
             cursorBrush = SolidColor(Gray0),

core/design-system/src/commonMain/kotlin/com/ondot/designsystem/preview/OnDotPreview.kt

@@ -0,0 +1,37 @@
+package com.ondot.designsystem.preview
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.dh.ondot.presentation.ui.theme.OnDotTheme
+import com.ondot.designsystem.components.OnDotText
+import com.ondot.designsystem.theme.OnDotColor.Gray0
+import com.ondot.designsystem.theme.OnDotColor.Gray900
+import com.ondot.domain.model.enums.OnDotTextStyle
+import org.jetbrains.compose.ui.tooling.preview.Preview
+
+@Preview
+@Composable
+private fun OnDotTextPreview() {
+    OnDotTheme {
+        Box(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(Gray0)
+                    .padding(16.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            OnDotText(
+                text = "OnDot Preview",
+                style = OnDotTextStyle.BodyLargeSB,
+                color = Gray900,
+            )
+        }
+    }
+}

core/navigation/src/commonMain/kotlin/com/ondot/navigation/AppNavHost.kt

@@ -109,6 +109,8 @@ private fun String.toScreenViewEventName(): String =
 
         // 패턴 라우트는 ROUTE로 매칭
         NavRoutes.EditSchedule.ROUTE -> "screen_view_edit_schedule"
+        NavRoutes.EditPlacePicker.route -> "screen_view_edit_place_picker"
+        NavRoutes.EditRouteLoading.route -> "screen_view_edit_route_loading"
         NavRoutes.PreparationAlarm.ROUTE -> "screen_view_preparation_alarm"
         NavRoutes.DepartureAlarm.ROUTE -> "screen_view_departure_alarm"
         NavRoutes.ServiceTerms.ROUTE -> "screen_view_service_terms"

core/navigation/src/commonMain/kotlin/com/ondot/navigation/NavRoutes.kt

@@ -102,6 +102,10 @@ sealed class NavRoutes(
         }
     }
 
+    data object EditPlacePicker : NavRoutes("editPlacePicker")
+
+    data object EditRouteLoading : NavRoutes("editRouteLoading")
+
     // DeleteAccount
     data object DeleteAccountGraph : NavRoutes("deleteAccountGraph")
 

core/ui/src/commonMain/kotlin/com/ondot/ui/screen/loading/RouteLoadingScreen.kt

@@ -29,6 +29,7 @@ import ondot.core.design_system.generated.resources.Res
 @Composable
 fun RouteLoadingScreen(
     label: String = ROUTE_CALCULATE_LABEL,
+    autoNavigate: Boolean = true,
     navigateToNext: () -> Unit,
 ) {
     val composition by rememberLottieComposition {
@@ -39,9 +40,11 @@ fun RouteLoadingScreen(
         iterations = Compottie.IterateForever,
     )
 
-    LaunchedEffect(Unit) {
-        delay(2000L)
-        navigateToNext()
+    LaunchedEffect(autoNavigate) {
+        if (autoNavigate) {
+            delay(2000L)
+            navigateToNext()
+        }
     }
 
     Box(

core/ui/src/commonMain/kotlin/com/ondot/ui/screen/placepicker/PlacePicker.kt

@@ -68,6 +68,7 @@ fun PlacePickerScreen(
     departureFocusRequester: FocusRequester = remember { FocusRequester() },
     arrivalFocusRequester: FocusRequester = remember { FocusRequester() },
     onRouteInputChanged: (String) -> Unit,
+    onRouteInputChangedByType: (RouterType, String) -> Unit = { _, value -> onRouteInputChanged(value) },
     onRouteInputFocused: (RouterType) -> Unit,
     onPlaceSelected: (AddressInfo) -> Unit,
     onHistorySelected: (PlaceHistory) -> Unit,
@@ -137,6 +138,7 @@ fun PlacePickerScreen(
                 departureFocusRequester = departureFocusRequester,
                 arrivalFocusRequester = arrivalFocusRequester,
                 onRouteInputChanged = onRouteInputChanged,
+                onRouteInputChangedByType = onRouteInputChangedByType,
                 onRouteInputFocused = onRouteInputFocused,
             )
 

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

@@ -28,7 +28,10 @@ class DefaultScheduleAlarmManager(
         val mapProvider = currentMapProvider()
         val dedupedAlarmInfos =
             dedupeAlarmInfos(
-                schedules.flatMap { schedule -> enabledAlarmInfos(schedule) },
+                validAlarmInfos(
+                    infos = schedules.flatMap { schedule -> enabledAlarmInfos(schedule) },
+                    throwOnInvalid = false,
+                ),
             )
         val currentAlarmIds = dedupedAlarmInfos.map { it.alarm.alarmId }.toSet()
 
@@ -59,7 +62,13 @@ class DefaultScheduleAlarmManager(
 
     override suspend fun schedule(schedule: Schedule) {
         val mapProvider = currentMapProvider()
-        val dedupedAlarmInfos = dedupeAlarmInfos(enabledAlarmInfos(schedule))
+        val dedupedAlarmInfos =
+            dedupeAlarmInfos(
+                validAlarmInfos(
+                    infos = enabledAlarmInfos(schedule),
+                    throwOnInvalid = true,
+                ),
+            )
 
         scheduleInfos(
             infos = dedupedAlarmInfos,
@@ -189,6 +198,31 @@ class DefaultScheduleAlarmManager(
 
     private suspend fun currentMapProvider(): MapProvider = memberRepository.getLocalMapProvider().first()
 
+    private fun validAlarmInfos(
+        infos: List<AlarmRingInfo>,
+        throwOnInvalid: Boolean,
+    ): List<AlarmRingInfo> {
+        val invalidInfos = infos.filter { it.alarm.alarmId <= 0 }
+
+        if (invalidInfos.isNotEmpty()) {
+            val message =
+                invalidInfos.joinToString(
+                    prefix = "invalid alarmId detected: ",
+                    separator = ", ",
+                ) { info ->
+                    "scheduleId=${info.scheduleId}, alarmId=${info.alarm.alarmId}, type=${info.alarmType}"
+                }
+
+            if (throwOnInvalid) {
+                throw IllegalStateException(message)
+            } else {
+                logger.e { message }
+            }
+        }
+
+        return infos.filter { it.alarm.alarmId > 0 }
+    }
+
     private fun enabledAlarmIds(schedule: Schedule): List<Long> =
         buildList {
             if (schedule.preparationAlarm.enabled) add(schedule.preparationAlarm.alarmId)

domain/src/commonMain/kotlin/com/ondot/domain/model/request/ScheduleAlarmRequest.kt

@@ -8,4 +8,5 @@ data class ScheduleAlarmRequest(
     val startLatitude: Double,
     val endLongitude: Double,
     val endLatitude: Double,
+    val transportType: String,
 )

feature/edit/src/commonMain/kotlin/com/ondot/edit/EditPlacePickerRoute.kt

@@ -0,0 +1,83 @@
+package com.ondot.edit
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.ondot.platform.util.BackPressHandler
+import com.ondot.ui.screen.placepicker.PlacePickerScreen
+import org.koin.compose.viewmodel.koinViewModel
+
+@Composable
+fun EditPlacePickerRoute(
+    viewModel: EditScheduleViewModel = koinViewModel(),
+    popScreen: () -> Unit,
+    navigateToRouteLoading: () -> Unit,
+) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val departureFocusRequester = remember { FocusRequester() }
+    val arrivalFocusRequester = remember { FocusRequester() }
+    val focusManager = LocalFocusManager.current
+
+    LaunchedEffect(Unit) {
+        viewModel.preparePlacePicker()
+
+        if (uiState.placePickerState.homeAddress.title
+                .isBlank() &&
+            !uiState.isHomeAddressInitialized
+        ) {
+            viewModel.fetchHomeAddress()
+        }
+        viewModel.fetchPlaceHistory()
+    }
+
+    LaunchedEffect(viewModel.eventFlow) {
+        viewModel.eventFlow.collect { event ->
+            when (event) {
+                EditScheduleEvent.RequestArrivalFocus -> arrivalFocusRequester.requestFocus()
+                else -> Unit
+            }
+        }
+    }
+
+    LaunchedEffect(uiState.isInitialPlacePicker) {
+        if (uiState.isInitialPlacePicker) {
+            departureFocusRequester.requestFocus()
+            viewModel.setInitialPlacePicker(false)
+        }
+    }
+
+    BackPressHandler(onBack = popScreen)
+
+    PlacePickerScreen(
+        state = uiState.placePickerState,
+        buttonEnabled = uiState.isPlacePickerButtonEnabled,
+        departureFocusRequester = departureFocusRequester,
+        arrivalFocusRequester = arrivalFocusRequester,
+        onRouteInputChanged = viewModel::updateRouteInput,
+        onRouteInputChangedByType = viewModel::updateRouteInput,
+        onRouteInputFocused = viewModel::setFocusedRouterType,
+        onPlaceSelected = {
+            viewModel.selectPlace(it)
+            focusManager.clearFocus()
+        },
+        onHistorySelected = {
+            viewModel.selectHistory(it)
+            focusManager.clearFocus()
+        },
+        onDeleteHistory = viewModel::deletePlaceHistory,
+        onToggleCheckBox = viewModel::toggleHomeDeparture,
+        onTransportTypeChanged = viewModel::updateTransportType,
+        onNext = {
+            if (viewModel.applyRouteChangesAndFetchAlarms()) {
+                navigateToRouteLoading()
+            } else {
+                popScreen()
+            }
+        },
+        popScreen = popScreen,
+    )
+}

feature/edit/src/commonMain/kotlin/com/ondot/edit/EditRouteLoadingRoute.kt

@@ -0,0 +1,27 @@
+package com.ondot.edit
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.ondot.ui.screen.loading.RouteLoadingScreen
+import org.koin.compose.viewmodel.koinViewModel
+
+@Composable
+fun EditRouteLoadingRoute(
+    viewModel: EditScheduleViewModel = koinViewModel(),
+    navigateToEdit: () -> Unit,
+) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+
+    LaunchedEffect(uiState.isAlarmRecalculating) {
+        if (!uiState.isAlarmRecalculating) {
+            navigateToEdit()
+        }
+    }
+
+    RouteLoadingScreen(
+        autoNavigate = false,
+        navigateToNext = {},
+    )
+}

feature/edit/src/commonMain/kotlin/com/ondot/edit/EditScheduleEvent.kt

@@ -4,4 +4,6 @@ import com.ondot.ui.base.Event
 
 sealed class EditScheduleEvent : Event {
     data object NavigateBack : EditScheduleEvent()
+
+    data object RequestArrivalFocus : EditScheduleEvent()
 }