Skip to content

Commit d591e4d

Browse files
authored
chore: Version Up (1.4.0 -> 1.4.1) 🔥🔥🔥 (#324)
* fix: YDSOption 컴포넌트의 옵션 개수에 따라 특정 항목이 보이지 않는 문제 수정(FlowRow로 변경) * fix: 앱 이름 변경(attendance-android -> YAPP)
1 parent ebf3488 commit d591e4d

4 files changed

Lines changed: 26 additions & 23 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_name">attendance-android-test</string>
3+
<string name="app_name">YAPP(DEV)</string>
44
</resources>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<resources>
2-
<string name="app_name">attendance-android</string>
3-
</resources>
2+
<string name="app_name">YAPP</string>
3+
</resources>

buildSrc/src/main/java/com/yapp/buildsrc/Configs.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ object Configs {
1818
const val APPLICATION_ID = "com.yapp.attendance"
1919
const val MIN_SDK = 26
2020
const val TARGET_SDK = 33
21-
const val VERSION_CODE = 100400
22-
const val VERSION_NAME = "1.4.0"
21+
const val VERSION_CODE = 100401
22+
const val VERSION_NAME = "1.4.1"
2323

2424
const val KOTLIN_COMPILER_EXTENSION = "1.4.3"
2525
}

common/src/main/java/com/yapp/common/yds/YDSOption.kt

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
package com.yapp.common.yds
22

3-
import androidx.compose.foundation.layout.Column
4-
import androidx.compose.foundation.layout.Row
5-
import androidx.compose.foundation.layout.padding
3+
import androidx.compose.foundation.layout.*
64
import androidx.compose.runtime.Composable
75
import androidx.compose.ui.Modifier
86
import androidx.compose.ui.unit.dp
97

8+
@OptIn(ExperimentalLayoutApi::class)
109
@Composable
11-
fun YDSOption(types: List<String>, selectedType: String?, onTypeClicked: (String) -> Unit) {
12-
val rowNum = 2
13-
Column {
14-
repeat(types.size / rowNum) { row ->
15-
Row {
16-
repeat(rowNum) { index ->
17-
val type = types[rowNum * row + index]
18-
YDSChoiceButton(
19-
text = type,
20-
modifier = Modifier.padding(end = 12.dp, bottom = 12.dp),
21-
state = if (selectedType == type) YdsButtonState.ENABLED else YdsButtonState.DISABLED,
22-
onClick = { onTypeClicked(type) }
23-
)
24-
}
25-
}
10+
fun YDSOption(
11+
modifier: Modifier = Modifier,
12+
horizontalArrangement: Arrangement.Horizontal = Arrangement.spacedBy(12.dp),
13+
types: List<String>,
14+
selectedType: String?,
15+
onTypeClicked: (String) -> Unit
16+
) {
17+
FlowRow(
18+
modifier = modifier,
19+
horizontalArrangement = horizontalArrangement,
20+
) {
21+
repeat(types.size) { index ->
22+
val type = types[index]
23+
YDSChoiceButton(
24+
text = type,
25+
modifier = Modifier.padding(bottom = 12.dp),
26+
state = if (selectedType == type) YdsButtonState.ENABLED else YdsButtonState.DISABLED,
27+
onClick = { onTypeClicked(type) }
28+
)
2629
}
2730
}
2831
}

0 commit comments

Comments
 (0)