[FEATURE] #125 : 일정 시작 및 종료 시간 설정 Dialog 동기화 설정

pknu-wap · Feb 17, 2024 · 3a53696 · 3a53696
1 parent b08b383
commit 3a53696
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/...agement-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt b/...agement-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt
@@ -161,7 +161,8 @@ internal fun EventEditScreen(
     var showEndDatePicker by remember { mutableStateOf(false) }
     var showEndTimePicker by remember { mutableStateOf(false) }
     var showDeleteEventDialog by remember { mutableStateOf(false) }
-    val timePickerState = rememberTimePickerState()
+    val startTimePickerState = rememberTimePickerState()
+    val endTimePickerState = rememberTimePickerState()
     val scrollState = rememberScrollState()
 
     Scaffold(
@@ -170,7 +171,6 @@ internal fun EventEditScreen(
         modifier = Modifier.fillMaxSize(),
         contentWindowInsets = WindowInsets(0.dp),
     ) { paddingValues ->
-
         if (showDeleteEventDialog) {
             DeleteEventDialog(
                 deleteEvent = deleteEvent,
@@ -217,7 +217,8 @@ internal fun EventEditScreen(
                 onTitleChanged = onTitleChanged,
                 onContentChanged = onContentChanged,
                 onLocationChanged = onLocationChanged,
-                timePickerState = timePickerState,
+                startTimePickerState = startTimePickerState,
+                endTimePickerState = endTimePickerState,
                 onStartDateChanged = onStartDateChanged,
                 onStartTimeChanged = onStartTimeChanged,
                 onEndDateChanged = onEndDateChanged,

diff --git a/.../main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt b/.../main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt
@@ -56,7 +56,8 @@ internal fun EventRegistrationContent(
     showEndDatePicker: Boolean,
     showEndTimePicker: Boolean,
     scrollState: ScrollState,
-    timePickerState: TimePickerState,
+    startTimePickerState: TimePickerState,
+    endTimePickerState: TimePickerState,
     onTitleChanged: (String) -> Unit,
     onContentChanged: (String) -> Unit,
     onLocationChanged: (String) -> Unit,
@@ -111,7 +112,8 @@ internal fun EventRegistrationContent(
                     startTime = startTime,
                     endDate = endDate,
                     endTime = endTime,
-                    timePickerState = timePickerState,
+                    startTimePickerState = startTimePickerState,
+                    endTimePickerState = endTimePickerState,
                     onLocationChanged = onLocationChanged,
                     onEndDateChanged = onEndDateChanged,
                     onEndTimeChanged = onEndTimeChanged,
@@ -195,7 +197,8 @@ private fun EventScheduleContent(
     startTime: LocalTime,
     endDate: LocalDate,
     endTime: LocalTime,
-    timePickerState: TimePickerState,
+    startTimePickerState: TimePickerState,
+    endTimePickerState: TimePickerState,
     showStartDatePicker: Boolean,
     showStartTimePicker: Boolean,
     showEndDatePicker: Boolean,
@@ -221,7 +224,7 @@ private fun EventScheduleContent(
 
     if (showEndTimePicker) {
         WappTimePickerDialog(
-            state = timePickerState,
+            state = endTimePickerState,
             onDismissRequest = { onEndTimePickerStateChanged(false) },
             onConfirmButtonClicked = { localTime ->
                 onEndTimeChanged(localTime)
@@ -243,7 +246,7 @@ private fun EventScheduleContent(
 
     if (showStartTimePicker) {
         WappTimePickerDialog(
-            state = timePickerState,
+            state = startTimePickerState,
             onDismissRequest = { onStartTimePickerStateChanged(false) },
             onConfirmButtonClicked = { localTime ->
                 onStartTimeChanged(localTime)

diff --git a/...c/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationScreen.kt b/...c/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationScreen.kt
@@ -132,7 +132,8 @@ internal fun EventRegistrationScreen(
     var showStartTimePicker by remember { mutableStateOf(false) }
     var showEndDatePicker by remember { mutableStateOf(false) }
     var showEndTimePicker by remember { mutableStateOf(false) }
-    val timePickerState = rememberTimePickerState()
+    val startTimePickerState = rememberTimePickerState()
+    val endTimePickerState = rememberTimePickerState()
     val scrollState = rememberScrollState()
 
     Scaffold(
@@ -180,7 +181,8 @@ internal fun EventRegistrationScreen(
                 onTitleChanged = onTitleChanged,
                 onContentChanged = onContentChanged,
                 onLocationChanged = onLocationChanged,
-                timePickerState = timePickerState,
+                startTimePickerState = startTimePickerState,
+                endTimePickerState = endTimePickerState,
                 onStartDateChanged = onStartDateChanged,
                 onStartTimeChanged = onStartTimeChanged,
                 onEndDateChanged = onEndDateChanged,