File tree Expand file tree Collapse file tree 3 files changed +9
-15
lines changed
core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component Expand file tree Collapse file tree 3 files changed +9
-15
lines changed Original file line number Diff line number Diff line change @@ -94,12 +94,12 @@ data class BitnagilTextButtonColor(
94
94
companion object {
95
95
@Composable
96
96
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 ,
100
100
defaultTextColor = BitnagilTheme .colors.white,
101
- pressedTextColor = BitnagilTheme .colors.coolGray70 ,
102
- disabledTextColor = BitnagilTheme .colors.coolGray70 ,
101
+ pressedTextColor = BitnagilTheme .colors.coolGray20 ,
102
+ disabledTextColor = BitnagilTheme .colors.white ,
103
103
)
104
104
105
105
@Composable
Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Row
5
5
import androidx.compose.foundation.layout.fillMaxWidth
6
6
import androidx.compose.foundation.layout.height
7
7
import androidx.compose.foundation.layout.padding
8
- import androidx.compose.foundation.layout.size
9
8
import androidx.compose.runtime.Composable
10
9
import androidx.compose.ui.Alignment
11
10
import androidx.compose.ui.Modifier
@@ -26,14 +25,13 @@ fun BitnagilProgressTopBar(
26
25
modifier = modifier
27
26
.fillMaxWidth()
28
27
.height(54 .dp)
29
- .padding(start = 4 .dp, end = 18 .dp),
28
+ .padding(end = 76 .dp),
30
29
verticalAlignment = Alignment .CenterVertically ,
31
- horizontalArrangement = Arrangement .spacedBy(10 .dp),
30
+ horizontalArrangement = Arrangement .spacedBy(38 .dp),
32
31
) {
33
32
BitnagilIconButton (
34
33
id = R .drawable.ic_chevron_left_lg,
35
34
onClick = onBackClick,
36
- modifier = Modifier .size(40 .dp),
37
35
tint = BitnagilTheme .colors.coolGray10,
38
36
)
39
37
@@ -48,7 +46,7 @@ fun BitnagilProgressTopBar(
48
46
@Composable
49
47
private fun BitnagilProgressTopBarPreview () {
50
48
BitnagilProgressTopBar (
51
- progress = 0.5f ,
49
+ progress = 1f ,
52
50
onBackClick = {},
53
51
)
54
52
}
Original file line number Diff line number Diff line change @@ -2,13 +2,11 @@ package com.threegap.bitnagil.designsystem.component.block
2
2
3
3
import androidx.compose.foundation.layout.Box
4
4
import androidx.compose.foundation.layout.Column
5
- import androidx.compose.foundation.layout.PaddingValues
6
5
import androidx.compose.foundation.layout.Row
7
6
import androidx.compose.foundation.layout.RowScope
8
7
import androidx.compose.foundation.layout.fillMaxWidth
9
8
import androidx.compose.foundation.layout.height
10
9
import androidx.compose.foundation.layout.padding
11
- import androidx.compose.foundation.layout.size
12
10
import androidx.compose.material3.HorizontalDivider
13
11
import androidx.compose.material3.Text
14
12
import androidx.compose.runtime.Composable
@@ -38,11 +36,9 @@ fun BitnagilTopBar(
38
36
BitnagilIconButton (
39
37
id = R .drawable.ic_chevron_left_lg,
40
38
onClick = onBackClick,
41
- paddingValues = PaddingValues (start = 4 .dp),
42
39
tint = BitnagilTheme .colors.coolGray10,
43
40
modifier = Modifier
44
- .align(Alignment .CenterStart )
45
- .size(40 .dp),
41
+ .align(Alignment .CenterStart ),
46
42
)
47
43
}
48
44
You can’t perform that action at this time.
0 commit comments