Skip to content

Commit 0022a2a

Browse files
committed
Chore: 탑바, 플로팅 버튼 컴포넌트 변경된 아이콘 적용
1 parent 074c754 commit 0022a2a

3 files changed

Lines changed: 16 additions & 8 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private fun BitnagilFloatingButtonPreview() {
186186
onClick = {},
187187
),
188188
FloatingActionItem(
189-
icon = R.drawable.ic_add_routine,
189+
icon = R.drawable.ic_routine_add,
190190
text = "루틴 등록",
191191
onClick = {},
192192
),

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ 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
89
import androidx.compose.runtime.Composable
910
import androidx.compose.ui.Alignment
1011
import androidx.compose.ui.Modifier
1112
import androidx.compose.ui.tooling.preview.Preview
1213
import androidx.compose.ui.unit.dp
14+
import com.threegap.bitnagil.designsystem.BitnagilTheme
1315
import com.threegap.bitnagil.designsystem.R
14-
import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
16+
import com.threegap.bitnagil.designsystem.component.atom.BitnagilIconButton
1517
import com.threegap.bitnagil.designsystem.component.atom.BitnagilProgressBar
16-
import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
1718

1819
@Composable
1920
fun BitnagilProgressTopBar(
@@ -29,9 +30,11 @@ fun BitnagilProgressTopBar(
2930
verticalAlignment = Alignment.CenterVertically,
3031
horizontalArrangement = Arrangement.spacedBy(10.dp),
3132
) {
32-
BitnagilIcon(
33-
id = R.drawable.ic_back_arrow_36,
34-
modifier = Modifier.clickableWithoutRipple(onClick = onBackClick),
33+
BitnagilIconButton(
34+
id = R.drawable.ic_chevron_left_lg,
35+
onClick = onBackClick,
36+
modifier = Modifier.size(40.dp),
37+
tint = BitnagilTheme.colors.coolGray10,
3538
)
3639

3740
BitnagilProgressBar(

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.RowScope
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.height
99
import androidx.compose.foundation.layout.padding
10+
import androidx.compose.foundation.layout.size
1011
import androidx.compose.material3.HorizontalDivider
1112
import androidx.compose.material3.Text
1213
import androidx.compose.runtime.Composable
@@ -17,6 +18,7 @@ import androidx.compose.ui.unit.dp
1718
import com.threegap.bitnagil.designsystem.BitnagilTheme
1819
import com.threegap.bitnagil.designsystem.R
1920
import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
21+
import com.threegap.bitnagil.designsystem.component.atom.BitnagilIconButton
2022
import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
2123

2224
@Composable
@@ -39,8 +41,11 @@ fun BitnagilTopBar(
3941
.padding(start = 4.dp)
4042
.clickableWithoutRipple { onBackClick() },
4143
) {
42-
BitnagilIcon(
43-
id = R.drawable.ic_back_arrow_36,
44+
BitnagilIconButton(
45+
id = R.drawable.ic_chevron_left_lg,
46+
onClick = onBackClick,
47+
modifier = Modifier.size(40.dp),
48+
tint = BitnagilTheme.colors.coolGray10,
4449
)
4550
}
4651
}

0 commit comments

Comments
 (0)