Skip to content

Commit f67a92f

Browse files
committed
Ui: EmotionRecommendRoutineButton 컴포넌트 리디자인 반영
1 parent 1c05e2d commit f67a92f

1 file changed

Lines changed: 36 additions & 21 deletions

File tree

presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/block/EmotionRecommendRoutineButton.kt

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package com.threegap.bitnagil.presentation.recommendroutine.component.block
22

3+
import androidx.compose.foundation.Image
34
import androidx.compose.foundation.background
4-
import androidx.compose.foundation.border
5-
import androidx.compose.foundation.layout.Arrangement
5+
import androidx.compose.foundation.layout.Box
66
import androidx.compose.foundation.layout.Row
7+
import androidx.compose.foundation.layout.Spacer
78
import androidx.compose.foundation.layout.fillMaxWidth
9+
import androidx.compose.foundation.layout.height
810
import androidx.compose.foundation.layout.padding
911
import androidx.compose.foundation.layout.size
1012
import androidx.compose.foundation.shape.RoundedCornerShape
1113
import androidx.compose.material3.Text
1214
import androidx.compose.runtime.Composable
1315
import androidx.compose.ui.Alignment
1416
import androidx.compose.ui.Modifier
17+
import androidx.compose.ui.res.painterResource
1518
import androidx.compose.ui.tooling.preview.Preview
1619
import androidx.compose.ui.unit.dp
1720
import com.threegap.bitnagil.designsystem.BitnagilTheme
1821
import com.threegap.bitnagil.designsystem.R
19-
import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
2022
import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
2123

2224
@Composable
@@ -25,38 +27,51 @@ fun EmotionRecommendRoutineButton(
2527
modifier: Modifier = Modifier,
2628
) {
2729
Row(
28-
verticalAlignment = Alignment.CenterVertically,
29-
horizontalArrangement = Arrangement.Start,
3030
modifier = modifier
3131
.fillMaxWidth()
32-
.border(
33-
width = 1.dp,
34-
color = BitnagilTheme.colors.navy100,
35-
shape = RoundedCornerShape(12.dp),
36-
)
3732
.background(
38-
color = BitnagilTheme.colors.white,
33+
color = BitnagilTheme.colors.coolGray10,
3934
shape = RoundedCornerShape(12.dp),
4035
)
41-
.clickableWithoutRipple { onClick() }
4236
.padding(
43-
vertical = 16.dp,
44-
horizontal = 24.dp,
37+
vertical = 14.dp,
38+
horizontal = 16.dp,
4539
),
40+
verticalAlignment = Alignment.CenterVertically,
4641
) {
47-
BitnagilIcon(
48-
id = R.drawable.ic_plus,
49-
tint = BitnagilTheme.colors.navy400,
42+
Image(
43+
painter = painterResource(id = R.drawable.default_marble),
44+
contentDescription = null,
5045
modifier = Modifier
5146
.padding(end = 10.dp)
52-
.size(20.dp),
47+
.size(24.dp),
5348
)
5449

5550
Text(
56-
text = "오늘의 감정 루틴 추천 받기",
57-
color = BitnagilTheme.colors.navy400,
58-
style = BitnagilTheme.typography.body2Medium,
51+
text = "내 기분에 맞는 루틴 추천받기",
52+
color = BitnagilTheme.colors.white,
53+
style = BitnagilTheme.typography.body2SemiBold,
5954
)
55+
56+
Spacer(modifier = Modifier.weight(1f))
57+
58+
Box(
59+
modifier = Modifier
60+
.background(
61+
color = BitnagilTheme.colors.orange500,
62+
shape = RoundedCornerShape(8.dp),
63+
)
64+
.height(38.dp)
65+
.clickableWithoutRipple { onClick() }
66+
.padding(vertical = 10.dp, horizontal = 16.dp),
67+
contentAlignment = Alignment.Center,
68+
) {
69+
Text(
70+
text = "추천받기",
71+
color = BitnagilTheme.colors.white,
72+
style = BitnagilTheme.typography.caption1SemiBold,
73+
)
74+
}
6075
}
6176
}
6277

0 commit comments

Comments
 (0)