Skip to content

Commit 9773d20

Browse files
committed
Chore: 공통 컴포넌트 수정
- 탑바 간격 수정 - 버튼 색상 수정
1 parent 2821157 commit 9773d20

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/atom/BitnagilTextButton.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ data class BitnagilTextButtonColor(
9494
companion object {
9595
@Composable
9696
fun default(): BitnagilTextButtonColor = BitnagilTextButtonColor(
97-
defaultBackgroundColor = BitnagilTheme.colors.navy500,
98-
pressedBackgroundColor = BitnagilTheme.colors.navy700,
99-
disabledBackgroundColor = BitnagilTheme.colors.navy50,
97+
defaultBackgroundColor = BitnagilTheme.colors.coolGray10,
98+
pressedBackgroundColor = BitnagilTheme.colors.coolGray5,
99+
disabledBackgroundColor = BitnagilTheme.colors.coolGray96,
100100
defaultTextColor = BitnagilTheme.colors.white,
101-
pressedTextColor = BitnagilTheme.colors.coolGray70,
102-
disabledTextColor = BitnagilTheme.colors.coolGray70,
101+
pressedTextColor = BitnagilTheme.colors.coolGray20,
102+
disabledTextColor = BitnagilTheme.colors.white,
103103
)
104104

105105
@Composable

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/block/BitnagilProgressTopBar.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Row
55
import androidx.compose.foundation.layout.fillMaxWidth
66
import androidx.compose.foundation.layout.height
77
import androidx.compose.foundation.layout.padding
8-
import androidx.compose.foundation.layout.size
98
import androidx.compose.runtime.Composable
109
import androidx.compose.ui.Alignment
1110
import androidx.compose.ui.Modifier
@@ -26,14 +25,13 @@ fun BitnagilProgressTopBar(
2625
modifier = modifier
2726
.fillMaxWidth()
2827
.height(54.dp)
29-
.padding(start = 4.dp, end = 18.dp),
28+
.padding(end = 76.dp),
3029
verticalAlignment = Alignment.CenterVertically,
31-
horizontalArrangement = Arrangement.spacedBy(10.dp),
30+
horizontalArrangement = Arrangement.spacedBy(38.dp),
3231
) {
3332
BitnagilIconButton(
3433
id = R.drawable.ic_chevron_left_lg,
3534
onClick = onBackClick,
36-
modifier = Modifier.size(40.dp),
3735
tint = BitnagilTheme.colors.coolGray10,
3836
)
3937

@@ -48,7 +46,7 @@ fun BitnagilProgressTopBar(
4846
@Composable
4947
private fun BitnagilProgressTopBarPreview() {
5048
BitnagilProgressTopBar(
51-
progress = 0.5f,
49+
progress = 1f,
5250
onBackClick = {},
5351
)
5452
}

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/block/BitnagilTopBar.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ package com.threegap.bitnagil.designsystem.component.block
22

33
import androidx.compose.foundation.layout.Box
44
import androidx.compose.foundation.layout.Column
5-
import androidx.compose.foundation.layout.PaddingValues
65
import androidx.compose.foundation.layout.Row
76
import androidx.compose.foundation.layout.RowScope
87
import androidx.compose.foundation.layout.fillMaxWidth
98
import androidx.compose.foundation.layout.height
109
import androidx.compose.foundation.layout.padding
11-
import androidx.compose.foundation.layout.size
1210
import androidx.compose.material3.HorizontalDivider
1311
import androidx.compose.material3.Text
1412
import androidx.compose.runtime.Composable
@@ -38,11 +36,9 @@ fun BitnagilTopBar(
3836
BitnagilIconButton(
3937
id = R.drawable.ic_chevron_left_lg,
4038
onClick = onBackClick,
41-
paddingValues = PaddingValues(start = 4.dp),
4239
tint = BitnagilTheme.colors.coolGray10,
4340
modifier = Modifier
44-
.align(Alignment.CenterStart)
45-
.size(40.dp),
41+
.align(Alignment.CenterStart),
4642
)
4743
}
4844

0 commit comments

Comments
 (0)