Skip to content

Commit 7e67356

Browse files
authored
Merge pull request #117 from YAPP-Github/refactor/#104-redesign_onboarding
[Refactor/#104] 온보딩 화면 리디자인 적용
2 parents 63deaf0 + 11ad16a commit 7e67356

File tree

50 files changed

+574
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+574
-97
lines changed

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.compose.runtime.remember
2020
import androidx.compose.runtime.setValue
2121
import androidx.compose.ui.Modifier
2222
import androidx.compose.ui.geometry.Offset
23-
import androidx.compose.ui.graphics.Brush
2423
import androidx.compose.ui.graphics.Color
2524
import androidx.compose.ui.graphics.StrokeCap
2625
import androidx.compose.ui.tooling.preview.Preview
@@ -59,11 +58,7 @@ fun BitnagilProgressBar(
5958
if (animatedProgress > 0) {
6059
val progressEndX = size.width * animatedProgress
6160
drawLine(
62-
brush = Brush.horizontalGradient(
63-
colors = listOf(color.gradientStartColor, color.gradientEndColor),
64-
startX = 0f,
65-
endX = progressEndX,
66-
),
61+
color = color.progressColor,
6762
start = Offset(0f, size.height / 2),
6863
end = Offset(progressEndX, size.height / 2),
6964
strokeWidth = strokeWidth,
@@ -75,16 +70,14 @@ fun BitnagilProgressBar(
7570

7671
@Immutable
7772
data class BitnagilProgressBarColor(
78-
val gradientStartColor: Color,
79-
val gradientEndColor: Color,
73+
val progressColor: Color,
8074
val backgroundColor: Color,
8175
) {
8276
companion object {
8377
@Composable
8478
fun default(): BitnagilProgressBarColor = BitnagilProgressBarColor(
85-
gradientStartColor = BitnagilTheme.colors.progressBarGradientStartColor,
86-
gradientEndColor = BitnagilTheme.colors.progressBarGradientEndColor,
87-
backgroundColor = BitnagilTheme.colors.white,
79+
progressColor = BitnagilTheme.colors.orange500,
80+
backgroundColor = BitnagilTheme.colors.coolGray97,
8881
)
8982
}
9083
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ fun BitnagilProgressTopBar(
2020
progress: Float,
2121
onBackClick: () -> Unit,
2222
modifier: Modifier = Modifier,
23+
showProgress: Boolean,
2324
) {
2425
Row(
2526
modifier = modifier
@@ -35,10 +36,12 @@ fun BitnagilProgressTopBar(
3536
tint = BitnagilTheme.colors.coolGray10,
3637
)
3738

38-
BitnagilProgressBar(
39-
progress = progress,
40-
modifier = Modifier,
41-
)
39+
if (showProgress) {
40+
BitnagilProgressBar(
41+
progress = progress,
42+
modifier = Modifier,
43+
)
44+
}
4245
}
4346
}
4447

@@ -48,5 +51,6 @@ private fun BitnagilProgressTopBarPreview() {
4851
BitnagilProgressTopBar(
4952
progress = 1f,
5053
onBackClick = {},
54+
showProgress = true,
5155
)
5256
}
14.2 KB
22 KB
12.4 KB
11.2 KB
12.2 KB
33.3 KB
7.73 KB
12.3 KB

0 commit comments

Comments
 (0)