FIX: 세부 항목 수정

- 오타 수정 "selectNotUseSUbRoutines" -> "selectNotUseSubRoutines"
- TimePicker 구분선 색상을 주황색으로 수정

Author: l5x5l

app/src/main/res/values/themes.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Base.Theme.Bitnagil" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Base.Theme.Bitnagil" parent="Theme.AppCompat.Light.NoActionBar" />
 
     <style name="Theme.Bitnagil" parent="Base.Theme.Bitnagil">
         <item name="android:windowIsTranslucent">true</item>

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt

@@ -185,28 +185,28 @@ private fun WriteRoutineScreen(
                             placeHolder = getSubRoutinePlaceHolder(0),
                             value = state.subRoutineNames.getOrNull(0) ?: "",
                             onValueChange = { setSubRoutineName(0, it) },
-                            enabled = !state.selectNotUseSUbRoutines,
+                            enabled = !state.selectNotUseSubRoutines,
                         )
 
                         SubRoutineField(
                             resourceId = R.drawable.img_circle_2,
                             placeHolder = getSubRoutinePlaceHolder(1),
                             value = state.subRoutineNames.getOrNull(1) ?: "",
                             onValueChange = { setSubRoutineName(1, it) },
-                            enabled = !state.selectNotUseSUbRoutines,
+                            enabled = !state.selectNotUseSubRoutines,
                         )
 
                         SubRoutineField(
                             resourceId = R.drawable.img_circle_3,
                             placeHolder = getSubRoutinePlaceHolder(2),
                             value = state.subRoutineNames.getOrNull(2) ?: "",
                             onValueChange = { setSubRoutineName(2, it) },
-                            enabled = !state.selectNotUseSUbRoutines,
+                            enabled = !state.selectNotUseSubRoutines,
                         )
 
                         LabeledCheckBox(
                             label = "세부 루틴 설정 안함",
-                            checked = state.selectNotUseSUbRoutines,
+                            checked = state.selectNotUseSubRoutines,
                             onClick = selectNotUseSubRoutines,
                         )
                     }

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt

@@ -316,10 +316,10 @@ class WriteRoutineViewModel @AssistedInject constructor(
             }
 
             WriteRoutineIntent.SelectNotUseSubRoutines -> {
-                val toggledSelectNotUseSubRoutines = !state.selectNotUseSUbRoutines
+                val toggledSelectNotUseSubRoutines = !state.selectNotUseSubRoutines
 
                 return state.copy(
-                    selectNotUseSUbRoutines = toggledSelectNotUseSubRoutines,
+                    selectNotUseSubRoutines = toggledSelectNotUseSubRoutines,
                     subRoutineNames = if (toggledSelectNotUseSubRoutines) listOf("", "", "") else state.subRoutineNames,
                 )
             }
@@ -473,7 +473,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
             when (val writeRoutineType = currentState.writeRoutineType) {
                 WriteRoutineType.Add -> {
                     sendIntent(WriteRoutineIntent.RegisterRoutineLoading)
-                    val subRoutines = if (currentState.selectNotUseSUbRoutines) emptyList() else currentState.subRoutineNames.filter { it.isNotEmpty() }
+                    val subRoutines = if (currentState.selectNotUseSubRoutines) emptyList() else currentState.subRoutineNames.filter { it.isNotEmpty() }
                     val noRepeatRoutine = repeatDay.isEmpty()
 
                     val registerRoutineResult = registerRoutineUseCase(
@@ -493,7 +493,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
                 }
                 is WriteRoutineType.Edit -> {
                     val currentRoutineId = routineId ?: return@launch
-                    val subRoutines = if (currentState.selectNotUseSUbRoutines) emptyList() else currentState.subRoutineNames.filter { it.isNotEmpty() }
+                    val subRoutines = if (currentState.selectNotUseSubRoutines) emptyList() else currentState.subRoutineNames.filter { it.isNotEmpty() }
                     val routineUpdateType = if (writeRoutineType.updateRoutineFromNowDate) {
                         RoutineUpdateType.Today
                     } else {

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/timepickerbottomsheet/TimePickerBottomSheet.kt

@@ -83,10 +83,6 @@ private fun TimePickerBottomSheetContent(
                 val timePicker = view.findViewById<TimePicker>(R.id.time_picker)
                 view.tag = timePicker
 
-                TimePicker(context).apply {
-                    setIs24HourView(true)
-                }
-
                 view
             },
             update = {

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/mvi/WriteRoutineState.kt

@@ -13,7 +13,7 @@ import kotlinx.parcelize.Parcelize
 data class WriteRoutineState(
     val routineName: String,
     val subRoutineNames: List<String>,
-    val selectNotUseSUbRoutines: Boolean,
+    val selectNotUseSubRoutines: Boolean,
     val repeatType: RepeatType?,
     val repeatDays: List<SelectableDay>,
     val startTime: Time?,
@@ -34,7 +34,7 @@ data class WriteRoutineState(
         val Init = WriteRoutineState(
             routineName = "",
             subRoutineNames = listOf("", "", ""),
-            selectNotUseSUbRoutines = false,
+            selectNotUseSubRoutines = false,
             repeatType = null,
             repeatDays = listOf(
                 SelectableDay(

presentation/src/main/res/values/styles.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="CustomTimePickerStyle" parent="@android:style/Theme.Material.Light">
+    <style name="CustomTimePickerStyle" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:timePickerMode">spinner</item>
         <item name="android:textColorPrimary">#171719</item>
         <item name="android:textColorSecondary">#171719</item>
-        <item name="colorControlNormal">#A9D0FF</item>
+        <item name="colorControlNormal">#FE7120</item>
     </style>
 </resources>