Skip to content

Commit 1786f61

Browse files
committed
♻️ 규칙 생성 시 항목들 string resource로 분리
1 parent 1d6c90d commit 1786f61

File tree

2 files changed

+61
-6
lines changed

2 files changed

+61
-6
lines changed

presentation/src/main/java/com/whyranoid/presentation/compose/DropDownMenu.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ import androidx.compose.runtime.mutableStateOf
1111
import androidx.compose.runtime.remember
1212
import androidx.compose.runtime.setValue
1313
import androidx.compose.ui.Modifier
14+
import androidx.compose.ui.res.stringArrayResource
15+
import com.whyranoid.presentation.R
1416

1517
@Composable
1618
fun DateDropDownMenu(
1719
selectedDate: String,
1820
onDateSelected: (String) -> Unit
1921
) {
20-
val dateList = "월 화 수 목 금 토 일".split(" ").toList()
22+
val dateList = stringArrayResource(id = R.array.rule_date_array)
2123
var isDropDownMenuExpanded by remember { mutableStateOf(false) }
2224
Button(
2325
onClick = { isDropDownMenuExpanded = true }
@@ -47,8 +49,7 @@ fun HourDropDownMenu(
4749
selectedHour: String,
4850
onHourSelected: (String) -> Unit
4951
) {
50-
val hourList =
51-
"0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23".split(" ").toList()
52+
val hourList = stringArrayResource(id = R.array.rule_hour_array)
5253
var isDropDownMenuExpanded by remember { mutableStateOf(false) }
5354
Button(
5455
onClick = { isDropDownMenuExpanded = true }
@@ -78,8 +79,7 @@ fun MinuteDropDownMenu(
7879
selectedMinute: String,
7980
onMinuteSelected: (String) -> Unit
8081
) {
81-
val minuteList =
82-
"0 5 10 15 20 25 30 35 40 45 50 55 60".split(" ").toList()
82+
val minuteList = stringArrayResource(id = R.array.rule_minute_array)
8383
var isDropDownMenuExpanded by remember { mutableStateOf(false) }
8484

8585
Button(

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

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<string name="running_map_location_button">🎯</string>
116116
<string name="running_start_progress_description">러닝 시작을 기다리고 있어요</string>
117117

118-
<!--라닝 종료 화면-->
118+
<!-- 러닝 종료 화면 -->
119119
<string name="running_finish_tool_bar">러닝 종료</string>
120120
<string name="running_finish_positive_btn">자랑할래요</string>
121121
<string name="running_finish_negative_btn">괜찮아요</string>
@@ -124,4 +124,59 @@
124124
<string name="running_finish_snackbar_action">종료하기</string>
125125
<string name="running_start_error_message">러닝 도중 에러가 발생했어요! 죄송해요..</string>
126126

127+
<!-- 규칙 생성 시 요일 -->
128+
<string-array name="rule_date_array">
129+
<item>월</item>
130+
<item>화</item>
131+
<item>수</item>
132+
<item>목</item>
133+
<item>금</item>
134+
<item>토</item>
135+
<item>일</item>
136+
</string-array>
137+
138+
<!-- 규칙 생성 시 시간 -->
139+
<string-array name="rule_hour_array">
140+
<item>0</item>
141+
<item>1</item>
142+
<item>2</item>
143+
<item>3</item>
144+
<item>4</item>
145+
<item>5</item>
146+
<item>6</item>
147+
<item>7</item>
148+
<item>8</item>
149+
<item>9</item>
150+
<item>10</item>
151+
<item>11</item>
152+
<item>12</item>
153+
<item>13</item>
154+
<item>14</item>
155+
<item>15</item>
156+
<item>16</item>
157+
<item>17</item>
158+
<item>18</item>
159+
<item>19</item>
160+
<item>20</item>
161+
<item>21</item>
162+
<item>22</item>
163+
<item>23</item>
164+
</string-array>
165+
166+
<!-- 규칙 생성 시 분 -->
167+
<string-array name="rule_minute_array">
168+
<item>0</item>
169+
<item>5</item>
170+
<item>10</item>
171+
<item>15</item>
172+
<item>20</item>
173+
<item>25</item>
174+
<item>30</item>
175+
<item>35</item>
176+
<item>40</item>
177+
<item>45</item>
178+
<item>50</item>
179+
<item>55</item>
180+
</string-array>
181+
127182
</resources>

0 commit comments

Comments
 (0)