🔀 :: (#741) 외출 신청 시간 설정

team-aliens · Sep 13, 2024 · 0774d53 · 0774d53
2 parents 0cd4e9a + fb0ec5d
commit 0774d53
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 30 deletions.
diff --git a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/Picker.kt b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/Picker.kt
@@ -42,6 +42,7 @@ fun Picker(
     visibleItemsCount: Int = 3,
     textModifier: Modifier = Modifier,
     textStyle: TextStyle = LocalTextStyle.current,
+    color: Color = Color.Unspecified,
 ) {
     val visibleItemsMiddle = visibleItemsCount / 2
     val listScrollCount = Integer.MAX_VALUE
@@ -59,7 +60,7 @@ fun Picker(
     val fadingEdgeGradient = remember {
         Brush.verticalGradient(
             0f to Color.Transparent,
-            0.5f to Color.Black,
+            0.5f to color,
             1f to Color.Transparent,
         )
     }
@@ -90,6 +91,7 @@ fun Picker(
                     modifier = Modifier
                         .onSizeChanged { size -> itemHeightPixels.value = size.height }
                         .then(textModifier),
+                    color = color,
                 )
             }
         }

diff --git a/feature/src/main/java/team/aliens/dms/android/feature/outing/OutingApplicationScreen.kt b/feature/src/main/java/team/aliens/dms/android/feature/outing/OutingApplicationScreen.kt
@@ -219,6 +219,7 @@ fun OutingApplicationScreen(
                         .topPadding(),
                     text = stringResource(R.string.outing_application_selected_companions),
                     style = DmsTheme.typography.caption,
+                    color = DmsTheme.colorScheme.onSurface,
                 )
                 StudentList(
                     modifier = Modifier
@@ -300,18 +301,10 @@ fun OutingApplicationScreen(
                 .padding(padValues),
             verticalArrangement = Arrangement.spacedBy(DefaultVerticalSpace),
         ) {
-            if (uiState.outingApplicationTime != null) {
-                val startTime = uiState.outingApplicationTime!!.startTime
-                val endTime = uiState.outingApplicationTime!!.endTime
-                FloatingNotice(
-                    modifier = Modifier.horizontalPadding(),
-                    text = stringResource(
-                        id = R.string.outing_format_application_time,
-                        startTime,
-                        endTime,
-                    ),
-                )
-            }
+            FloatingNotice(
+                modifier = Modifier.horizontalPadding(),
+                text = stringResource(id = R.string.outing_format_application_time),
+            )
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.spacedBy(DefaultHorizontalSpace),
@@ -352,6 +345,19 @@ fun OutingApplicationScreen(
                     .endPadding(),
                 text = { Text(text = stringResource(id = R.string.outing_start_time)) },
                 indicator = { OutingInputDefaults.Indicator() },
+                description = {
+                    if (uiState.outingApplicationTime != null) {
+                        Text(
+                            text = stringResource(
+                                id = R.string.outing_can_go_out_time,
+                                uiState.outingApplicationTime!!.startTime,
+                                uiState.outingApplicationTime!!.endTime,
+                            ),
+                            style = DmsTheme.typography.caption,
+                            color = DmsTheme.colorScheme.primary,
+                        )
+                    }
+                },
             ) {
                 val startTime = remember(uiState.selectedOutingStartTime) {
                     uiState.selectedOutingStartTime
@@ -612,6 +618,7 @@ private fun OutingInput(
     modifier: Modifier = Modifier,
     text: (@Composable () -> Unit)? = null,
     indicator: (@Composable () -> Unit)? = null,
+    description: @Composable () -> Unit = { },
     input: @Composable () -> Unit,
 ) {
     Column(
@@ -627,6 +634,7 @@ private fun OutingInput(
             }
         }
         input()
+        description()
     }
 }
 
@@ -660,6 +668,7 @@ private fun TimePickerSpinner(
             startIndex = startTime.hour,
             textStyle = DmsTheme.typography.body1,
             textModifier = Modifier.padding(vertical = 10.dp),
+            color = DmsTheme.colorScheme.onSurface,
         )
         Text(
             text = ":",
@@ -668,6 +677,7 @@ private fun TimePickerSpinner(
                 .weight(1f),
             textAlign = TextAlign.Center,
             style = DmsTheme.typography.body1,
+            color = DmsTheme.colorScheme.onSurface,
         )
         Picker(
             modifier = Modifier.weight(1f),
@@ -677,12 +687,14 @@ private fun TimePickerSpinner(
             startIndex = startTime.minute / 10,
             textStyle = DmsTheme.typography.body1,
             textModifier = Modifier.padding(vertical = 10.dp),
+            color = DmsTheme.colorScheme.onSurface,
         )
         Text(
             modifier = Modifier
                 .weight(2f),
             text = "~",
             textAlign = TextAlign.Center,
+            color = DmsTheme.colorScheme.onSurface,
         )
         Picker(
             modifier = Modifier.weight(1f),
@@ -692,13 +704,15 @@ private fun TimePickerSpinner(
             startIndex = endTime.hour,
             textStyle = DmsTheme.typography.body1,
             textModifier = Modifier.padding(vertical = 10.dp),
+            color = DmsTheme.colorScheme.onSurface,
         )
         Text(
             modifier = Modifier
                 .weight(1f),
             text = ":",
             fontSize = 30.sp,
             textAlign = TextAlign.Center,
+            color = DmsTheme.colorScheme.onSurface,
         )
         Picker(
             modifier = Modifier.weight(1f),
@@ -708,6 +722,7 @@ private fun TimePickerSpinner(
             startIndex = endTime.minute / 10,
             textStyle = DmsTheme.typography.body1,
             textModifier = Modifier.padding(vertical = 10.dp),
+            color = DmsTheme.colorScheme.onSurface,
         )
     }
 }

diff --git a/feature/src/main/java/team/aliens/dms/android/feature/outing/OutingStatusScreen.kt b/feature/src/main/java/team/aliens/dms/android/feature/outing/OutingStatusScreen.kt
@@ -28,12 +28,12 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.ramcosta.composedestinations.annotation.Destination
 import team.aliens.dms.android.core.designsystem.AlertDialog
 import team.aliens.dms.android.core.designsystem.ButtonDefaults
 import team.aliens.dms.android.core.designsystem.ContainedButton
+import team.aliens.dms.android.core.designsystem.DmsIcon
 import team.aliens.dms.android.core.designsystem.DmsTheme
 import team.aliens.dms.android.core.designsystem.DmsTopAppBar
 import team.aliens.dms.android.core.designsystem.LocalToast
@@ -44,6 +44,7 @@ import team.aliens.dms.android.core.ui.DefaultHorizontalSpace
 import team.aliens.dms.android.core.ui.DefaultVerticalSpace
 import team.aliens.dms.android.core.ui.PaddingDefaults
 import team.aliens.dms.android.core.ui.bottomPadding
+import team.aliens.dms.android.core.ui.composable.FloatingNotice
 import team.aliens.dms.android.core.ui.horizontalPadding
 import team.aliens.dms.android.core.ui.startPadding
 import team.aliens.dms.android.core.ui.topPadding
@@ -100,7 +101,7 @@ fun OutingStatusScreen(
                 navigationIcon = {
                     IconButton(onClick = navigator::navigateUp) {
                         Icon(
-                            painter = painterResource(id = R.drawable.ic_baseline_arrow_back_24),
+                            painter = painterResource(id = DmsIcon.Back),
                             contentDescription = stringResource(id = R.string.top_bar_back_button),
                         )
                     }
@@ -118,15 +119,12 @@ fun OutingStatusScreen(
                 modifier = Modifier.fillMaxSize(),
                 verticalArrangement = Arrangement.spacedBy(DefaultVerticalSpace),
             ) {
-                Text(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .startPadding()
-                        .verticalPadding(),
-                    text = stringResource(id = R.string.outing_recent_application),
-                    color = DmsTheme.colorScheme.icon,
+                FloatingNotice(
+                    modifier = Modifier.horizontalPadding(),
+                    text = stringResource(id = R.string.outing_format_application_time),
                 )
                 uiState.currentAppliedOutingApplication?.let { outingApplication ->
+                    Spacer(modifier = Modifier.height(PaddingDefaults.Large))
                     OutingInformationCard(
                         title = outingApplication.type,
                         date = outingApplication.date,
@@ -139,13 +137,15 @@ fun OutingStatusScreen(
                         reason = outingApplication.reason,
                         onCancelApplication = { onChangeShouldShowCancelOutingDialog(true) },
                     )
-                } ?: Text(
+                } ?: Box(
                     modifier = Modifier
-                        .fillMaxWidth()
-                        .topPadding(),
-                    textAlign = TextAlign.Center,
-                    text = stringResource(id = R.string.outing_failed_to_fetch_current_applied_outing_application),
-                )
+                        .fillMaxSize(),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    if (!uiState.isApplicationState) {
+                        Text(text = stringResource(id = R.string.outing_not_now_outing_application_time))
+                    }
+                }
             }
             if (uiState.currentAppliedOutingApplication == null) {
                 ContainedButton(
@@ -154,6 +154,7 @@ fun OutingStatusScreen(
                         .bottomPadding()
                         .horizontalPadding(),
                     onClick = navigator::openOutingApplication,
+                    enabled = uiState.isApplicationState,
                 ) {
                     Text(text = stringResource(id = R.string.outing_do_application))
                 }

diff --git a/feature/src/main/java/team/aliens/dms/android/feature/outing/OutingViewModel.kt b/feature/src/main/java/team/aliens/dms/android/feature/outing/OutingViewModel.kt
@@ -34,6 +34,7 @@ class OutingViewModel @Inject constructor(
         fetchOutingTypes()
         fetchStudents()
         fetchOutingDate()
+        fetchApplicationState()
     }
 
     override fun processIntent(intent: OutingIntent) {
@@ -108,6 +109,11 @@ class OutingViewModel @Inject constructor(
         }
     }
 
+    private fun fetchApplicationState() {
+        val isApplicationState = now.hour >= 20 || now.hour <= 11
+        reduce(newState = stateFlow.value.copy(isApplicationState = isApplicationState))
+    }
+
     private fun fetchOutingTypes() = viewModelScope.launch(Dispatchers.IO) {
         runCatching {
             outingRepository.fetchOutingTypes(null)
@@ -220,6 +226,7 @@ data class OutingUiState(
     val students: List<Student>?,
     val selectedStudents: List<Student>,
     val applicationId: UUID?,
+    val isApplicationState: Boolean,
 ) : UiState() {
     companion object {
         fun initial(): OutingUiState {
@@ -237,6 +244,7 @@ data class OutingUiState(
                 students = null,
                 selectedStudents = emptyList(),
                 applicationId = null,
+                isApplicationState = false,
             )
         }
     }

diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml
@@ -342,14 +342,14 @@
     <!--outing-->
     <string name="outing_application">외출 신청</string>
     <string name="outing_application_select_outing_time">외출 시간 선택</string>
-    <string name="outing_format_application_time">외출 신청 시간은 %s ~ %s 입니다</string>
+    <string name="outing_format_application_time">외출 신청 시간은 20:00 ~ 11:00 입니다</string>
     <string name="outing_recent_application">신청 내역</string>
     <string name="outing_do_application">외출 신청하기</string>
     <string name="outing_description">기숙사에서 생활하는 동안 밖에 다녀올 일이 있다면 외출을 신청해 보세요.</string>
     <string name="outing_cancel_application">신청 취소</string>
     <string name="outing_companion_names">동행자</string>
     <string name="outing_are_you_sure_you_cancel_application">작성한 정보가 파기됩니다. 계속하시겠습니까?</string>
-    <string name="outing_failed_to_fetch_current_applied_outing_application">외출 신청 정보를 조회할 수 없습니다</string>
+    <string name="outing_not_now_outing_application_time">지금은 외출 신청 시간이 아닙니다.</string>
     <string name="outing_format_duration_h_m">%s ~ %s</string>
     <string name="outing_format_time">%02d:%02d ~ %02d:%02d</string>
     <string name="outing_error_there_is_no_outing_types">외출 유형이 존재하지 않습니다</string>
@@ -360,6 +360,7 @@
     <string name="outing_date">외출 일자</string>
     <string name="format_date_yyyy_mm_dd_day_of_week">%04d.%02d.%02d (%s)</string>
     <string name="outing_start_time">외출 시간</string>
+    <string name="outing_can_go_out_time">외출 가능 시간은 %s ~ %s까지 입니다.</string>
     <string name="outing_end_time">복귀 시간</string>
     <string name="outing_hint_please_enter_description">외출 사유를 입력해 주세요</string>
     <string name="outing_format_select_companions">%d명 선택</string>