Feature/jaino/#128

feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt

@@ -53,6 +53,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.wap.designsystem.WappTheme
 import com.wap.designsystem.component.WappSubTopBar
 import com.wap.wapp.core.commmon.extensions.toSupportingText
+import com.wap.wapp.core.designresource.R.drawable
 import com.wap.wapp.feature.management.event.R
 import com.wap.wapp.feature.management.event.edit.EventEditViewModel.EventEditEvent
 import com.wap.wapp.feature.management.event.registration.EventRegistrationContent
@@ -84,9 +85,6 @@ internal fun EventEditRoute(
     val onStartTimeChanged = viewModel::setEventStartTime
     val onEndDateChanged = viewModel::setEventEndDate
     val onEndTimeChanged = viewModel::setEventEndTime
-    val onNextButtonClicked =
-        viewModel::setEventRegistrationState
-    val onRegisterButtonClicked = viewModel::updateEvent
 
     LaunchedEffect(true) {
         viewModel.getEvent(eventId = eventId)
@@ -125,10 +123,19 @@ internal fun EventEditRoute(
         onStartTimeChanged = onStartTimeChanged,
         onEndDateChanged = onEndDateChanged,
         onEndTimeChanged = onEndTimeChanged,
-        onNextButtonClicked = onNextButtonClicked,
-        onEditButtonClicked = onRegisterButtonClicked,
-        onBackButtonClicked = navigateToManagement,
+        onNextButtonClicked = { currentState, nextState ->
+            if (viewModel.validateEvent(currentState)) {
+                viewModel.setEventRegistrationState(nextState)
+            }
+        },
+        onCloseButtonClicked = navigateToManagement,
+        onPreviousButtonClicked = viewModel::setEventRegistrationState,
         deleteEvent = viewModel::deleteEvent,
+        onEditButtonClicked = { lastState ->
+            if (viewModel.validateEvent(lastState)) {
+                viewModel.updateEvent()
+            }
+        },
     )
 }
 
@@ -151,9 +158,10 @@ internal fun EventEditScreen(
     onStartTimeChanged: (LocalTime) -> Unit,
     onEndDateChanged: (LocalDate) -> Unit,
     onEndTimeChanged: (LocalTime) -> Unit,
-    onNextButtonClicked: () -> Unit,
-    onEditButtonClicked: () -> Unit,
-    onBackButtonClicked: () -> Unit,
+    onNextButtonClicked: (EventRegistrationState, EventRegistrationState) -> Unit,
+    onEditButtonClicked: (EventRegistrationState) -> Unit,
+    onCloseButtonClicked: () -> Unit,
+    onPreviousButtonClicked: (EventRegistrationState) -> Unit,
     deleteEvent: () -> Unit,
 ) {
     var showStartDatePicker by remember { mutableStateOf(false) }
@@ -190,7 +198,8 @@ internal fun EventEditScreen(
                 titleRes = R.string.event_edit,
                 showLeftButton = true,
                 showRightButton = true,
-                onClickLeftButton = onBackButtonClicked,
+                leftButtonDrawableRes = drawable.ic_close,
+                onClickLeftButton = onCloseButtonClicked,
                 onClickRightButton = { showDeleteEventDialog = true },
             )
 
@@ -201,7 +210,7 @@ internal fun EventEditScreen(
 
             EventRegistrationContent(
                 eventRegistrationState = currentEditState,
-                modifier = Modifier.padding(top = 50.dp, start = 20.dp, end = 20.dp),
+                modifier = Modifier.padding(horizontal = 20.dp),
                 eventTitle = title,
                 eventContent = content,
                 location = location,
@@ -229,6 +238,7 @@ internal fun EventEditScreen(
                 onEndTimePickerStateChanged = { state -> showEndTimePicker = state },
                 onNextButtonClicked = onNextButtonClicked,
                 onRegisterButtonClicked = onEditButtonClicked,
+                onPreviousButtonClicked = onPreviousButtonClicked,
             )
         }
     }

feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditViewModel.kt

@@ -84,46 +84,53 @@ class EventEditViewModel @Inject constructor(
         _eventEndTime.value = eventTime
     }
 
-    fun setEventRegistrationState() {
-        if (_currentEditState.value == EventRegistrationState.EVENT_DETAILS) {
-            if (!isValidTitle()) {
-                emitValidationErrorMessage("행사 이름을 입력하세요.")
-                return
+    fun validateEvent(eventRegistrationState: EventRegistrationState): Boolean {
+        when (eventRegistrationState) {
+            EventRegistrationState.EVENT_DETAILS -> {
+                if (!isValidTitle()) {
+                    emitValidationErrorMessage("행사 이름을 입력하세요.")
+                    return false
+                }
+
+                if (!isValidContent()) {
+                    emitValidationErrorMessage("행사 내용을 입력하세요.")
+                    return false
+                }
             }
-            if (!isValidContent()) {
-                emitValidationErrorMessage("행사 내용을 입력하세요.")
-                return
+
+            EventRegistrationState.EVENT_SCHEDULE -> {
+                if (!isValidLocation()) {
+                    emitValidationErrorMessage("장소를 입력하세요.")
+                    return false
+                }
+
+                if (!isValidEndTime(_eventEndTime.value)) {
+                    emitValidationErrorMessage("일정 종료는 시작보다 늦어야 합니다.")
+                    return false
+                }
             }
-            _currentEditState.value = EventRegistrationState.EVENT_SCHEDULE
         }
+        return true
     }
 
-    fun updateEvent() {
-        if (!isValidLocation()) {
-            emitValidationErrorMessage("장소를 입력하세요.")
-            return
-        }
-
-        if (!isValidEndTime(_eventEndTime.value)) {
-            emitValidationErrorMessage("일정 종료는 시작보다 늦어야 합니다.")
-            return
-        }
+    fun setEventRegistrationState(eventRegistrationState: EventRegistrationState) {
+        _currentEditState.value = eventRegistrationState
+    }
 
-        viewModelScope.launch {
-            updateEventUseCase(
-                eventTitle = _eventTitle.value,
-                eventContent = _eventContent.value,
-                eventLocation = _eventLocation.value,
-                eventStartDate = _eventStartDate.value,
-                eventStartTime = _eventStartTime.value,
-                eventEndDate = _eventEndDate.value,
-                eventEndTime = _eventEndTime.value,
-                eventId = _eventId.value,
-            ).onSuccess {
-                _eventEditEvent.emit(EventEditEvent.EditSuccess)
-            }.onFailure { throwable ->
-                _eventEditEvent.emit(EventEditEvent.Failure(throwable))
-            }
+    fun updateEvent() = viewModelScope.launch {
+        updateEventUseCase(
+            eventTitle = _eventTitle.value,
+            eventContent = _eventContent.value,
+            eventLocation = _eventLocation.value,
+            eventStartDate = _eventStartDate.value,
+            eventStartTime = _eventStartTime.value,
+            eventEndDate = _eventEndDate.value,
+            eventEndTime = _eventEndTime.value,
+            eventId = _eventId.value,
+        ).onSuccess {
+            _eventEditEvent.emit(EventEditEvent.EditSuccess)
+        }.onFailure { throwable ->
+            _eventEditEvent.emit(EventEditEvent.Failure(throwable))
         }
     }
 
@@ -136,15 +143,14 @@ class EventEditViewModel @Inject constructor(
     }
 
     private fun isValidEndTime(eventTime: LocalTime): Boolean {
-        if (_eventEndDate.value > _eventStartDate.value) {
-            return true
-        }
+        val startDate = _eventStartDate.value
+        val endDate = _eventEndDate.value
 
-        if (_eventEndDate.value == _eventStartDate.value && eventTime > _eventStartTime.value) {
-            return true
+        if (startDate == endDate) {
+            val startTime = _eventStartTime.value
+            return eventTime > startTime
         }
-
-        return false
+        return startDate < endDate
     }
 
     private fun isValidEndDate(eventDate: LocalDate): Boolean = eventDate >= _eventStartDate.value

feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt

@@ -69,16 +69,18 @@ internal fun EventRegistrationContent(
     onStartTimePickerStateChanged: (Boolean) -> Unit,
     onEndDatePickerStateChanged: (Boolean) -> Unit,
     onEndTimePickerStateChanged: (Boolean) -> Unit,
-    onNextButtonClicked: () -> Unit,
-    onRegisterButtonClicked: () -> Unit,
+    onNextButtonClicked: (EventRegistrationState, EventRegistrationState) -> Unit,
+    onRegisterButtonClicked: (EventRegistrationState) -> Unit,
+    onPreviousButtonClicked: (EventRegistrationState) -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
     val focusManager = LocalFocusManager.current
 
     Column(
         modifier = modifier
             .fillMaxSize()
-            .addFocusCleaner(focusManager),
+            .addFocusCleaner(focusManager)
+            .padding(top = 40.dp),
     ) {
         AnimatedContent(
             targetState = eventRegistrationState,
@@ -91,6 +93,7 @@ internal fun EventRegistrationContent(
                         slideOutHorizontally(targetOffsetX = { it }) + fadeOut()
                 }
             },
+            label = stringResource(R.string.event_registration_content_navigation_animated_label),
         ) { eventState ->
             when (eventState) {
                 EventRegistrationState.EVENT_DETAILS -> EventDetailsContent(
@@ -102,7 +105,10 @@ internal fun EventRegistrationContent(
                         coroutineScope.launch {
                             scrollState.scrollTo(0)
                         }
-                        onNextButtonClicked()
+                        onNextButtonClicked(
+                            EventRegistrationState.EVENT_DETAILS, // current State
+                            EventRegistrationState.EVENT_SCHEDULE, // next Stae
+                        )
                     },
                 )
 
@@ -127,7 +133,12 @@ internal fun EventRegistrationContent(
                     onStartTimePickerStateChanged = onStartTimePickerStateChanged,
                     onEndDatePickerStateChanged = onEndDatePickerStateChanged,
                     onEndTimePickerStateChanged = onEndTimePickerStateChanged,
-                    onRegisterButtonClicked = onRegisterButtonClicked,
+                    onRegisterButtonClicked = {
+                        onRegisterButtonClicked(EventRegistrationState.EVENT_SCHEDULE)
+                    },
+                    onPreviousButtonClicked = {
+                        onPreviousButtonClicked(EventRegistrationState.EVENT_DETAILS)
+                    },
                 )
             }
         }
@@ -214,6 +225,7 @@ private fun EventScheduleContent(
     onEndDateChanged: (LocalDate) -> Unit,
     onEndTimeChanged: (LocalTime) -> Unit,
     onRegisterButtonClicked: () -> Unit,
+    onPreviousButtonClicked: () -> Unit,
 ) {
     if (showEndDatePicker) {
         WappDatePickerDialog(
@@ -328,10 +340,21 @@ private fun EventScheduleContent(
 
             Spacer(modifier = Modifier.weight(1f))
 
-            WappButton(
-                onClick = onRegisterButtonClicked,
-                textRes = R.string.register_event,
-            )
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                WappButton(
+                    textRes = R.string.previous,
+                    onClick = onPreviousButtonClicked,
+                    modifier = Modifier.weight(1f),
+                )
+
+                WappButton(
+                    textRes = R.string.register_event,
+                    onClick = onRegisterButtonClicked,
+                    modifier = Modifier.weight(1f),
+                )
+            }
         }
     }
 }

feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationScreen.kt

@@ -37,6 +37,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.wap.designsystem.WappTheme
 import com.wap.designsystem.component.WappSubTopBar
 import com.wap.wapp.core.commmon.extensions.toSupportingText
+import com.wap.wapp.core.designresource.R.drawable
 import com.wap.wapp.feature.management.event.R
 import kotlinx.coroutines.flow.collectLatest
 import java.time.LocalDate
@@ -64,9 +65,6 @@ internal fun EventRegistrationRoute(
     val onStartTimeChanged = viewModel::setEventStartTime
     val onEndDateChanged = viewModel::setEventEndDate
     val onEndTimeChanged = viewModel::setEventEndTime
-    val onNextButtonClicked =
-        viewModel::setEventRegistrationState
-    val onRegisterButtonClicked = viewModel::registerEvent
 
     LaunchedEffect(true) {
         viewModel.eventRegistrationEvent.collectLatest {
@@ -99,9 +97,18 @@ internal fun EventRegistrationRoute(
         onStartTimeChanged = onStartTimeChanged,
         onEndDateChanged = onEndDateChanged,
         onEndTimeChanged = onEndTimeChanged,
-        onNextButtonClicked = onNextButtonClicked,
-        onRegisterButtonClicked = onRegisterButtonClicked,
-        onBackButtonClicked = navigateToManagement,
+        onNextButtonClicked = { currentState, nextState ->
+            if (viewModel.validateEvent(currentState)) {
+                viewModel.setEventRegistrationState(nextState)
+            }
+        },
+        onCloseButtonClicked = navigateToManagement,
+        onPreviousButtonClicked = viewModel::setEventRegistrationState,
+        onRegisterButtonClicked = { lastState ->
+            if (viewModel.validateEvent(lastState)) { // 마지막 상태 대입
+                viewModel.registerEvent()
+            }
+        },
     )
 }
 
@@ -124,9 +131,10 @@ internal fun EventRegistrationScreen(
     onStartTimeChanged: (LocalTime) -> Unit,
     onEndDateChanged: (LocalDate) -> Unit,
     onEndTimeChanged: (LocalTime) -> Unit,
-    onNextButtonClicked: () -> Unit,
-    onRegisterButtonClicked: () -> Unit,
-    onBackButtonClicked: () -> Unit,
+    onNextButtonClicked: (EventRegistrationState, EventRegistrationState) -> Unit,
+    onPreviousButtonClicked: (EventRegistrationState) -> Unit,
+    onRegisterButtonClicked: (EventRegistrationState) -> Unit,
+    onCloseButtonClicked: () -> Unit,
 ) {
     var showStartDatePicker by remember { mutableStateOf(false) }
     var showStartTimePicker by remember { mutableStateOf(false) }
@@ -154,7 +162,8 @@ internal fun EventRegistrationScreen(
             WappSubTopBar(
                 titleRes = R.string.event_registration,
                 showLeftButton = true,
-                onClickLeftButton = onBackButtonClicked,
+                onClickLeftButton = onCloseButtonClicked,
+                leftButtonDrawableRes = drawable.ic_close,
             )
 
             EventRegistrationStateIndicator(
@@ -164,8 +173,7 @@ internal fun EventRegistrationScreen(
 
             EventRegistrationContent(
                 eventRegistrationState = currentRegistrationState,
-                modifier = Modifier
-                    .padding(top = 50.dp, start = 20.dp, end = 20.dp, bottom = 20.dp),
+                modifier = Modifier.padding(horizontal = 20.dp),
                 eventTitle = title,
                 eventContent = content,
                 location = location,
@@ -192,6 +200,7 @@ internal fun EventRegistrationScreen(
                 onEndDatePickerStateChanged = { state -> showEndDatePicker = state },
                 onEndTimePickerStateChanged = { state -> showEndTimePicker = state },
                 onNextButtonClicked = onNextButtonClicked,
+                onPreviousButtonClicked = onPreviousButtonClicked,
                 onRegisterButtonClicked = onRegisterButtonClicked,
             )
         }
@@ -241,6 +250,7 @@ private fun EventRegistrationStateProgressBar(
             stiffness = Spring.StiffnessMediumLow,
             dampingRatio = Spring.DampingRatioMediumBouncy,
         ),
+        label = stringResource(R.string.event_registration_state_progress_animation),
     )
 
     LinearProgressIndicator(