Skip to content

Commit 4e2bc1b

Browse files
committed
styles updated.
1 parent 5b1d8e9 commit 4e2bc1b

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

library/src/main/java/io/syslogic/colorpicker/compose/BasePainter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ abstract class BasePainter(override val intrinsicSize: Size) : Painter() {
6464
/* Tracker Dimensions */
6565
satValTrackerRadius1 = 9F * density
6666
satValTrackerRadius2 = 8F * density
67-
alphaTrackerWidth = 4F * density
67+
alphaTrackerWidth = 6F * density
6868
hueTrackerHeight = 4F * density
6969

7070
/* Tracker Styles */
71-
trackerCornerRadius = 2F * density
72-
trackerStrokeWidth = 1F * density
7371
trackerStrokeColorOuter = Color.Black.hashCode()
7472
trackerStrokeColorInner = Color.White.hashCode()
73+
trackerCornerRadius = 2F * density
74+
trackerStrokeWidth = 1F * density
7575

7676
/* Border Styles */
7777
borderCornerRadius = 2F

library/src/main/java/io/syslogic/colorpicker/compose/ColorPickerDialog.kt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fun ColorPickerDialog(
5858
color = colorResource(id = R.color.cardview_light_background),
5959
modifier = Modifier
6060
.layoutId(DialogSurface)
61-
.testTag("surface")
61+
.testTag("dialog_surface")
6262
) {
6363
Column(
6464
modifier = Modifier
@@ -76,7 +76,12 @@ fun ColorPickerDialog(
7676
fontSize = toSp(dp = dimensionResource(R.dimen.compose_dialog_title_font_size)),
7777
fontFamily = FontFamily.Default,
7878
fontWeight = FontWeight.Bold
79-
)
79+
),
80+
modifier = Modifier
81+
.padding(dimensionResource(R.dimen.compose_dialog_title_padding))
82+
.layoutId(DialogTitleText)
83+
.testTag("dialog_title")
84+
8085
)
8186
Icon(
8287
imageVector = Icons.Filled.Close,
@@ -86,6 +91,8 @@ fun ColorPickerDialog(
8691
.width(dimensionResource(R.dimen.compose_dialog_close_icon_size))
8792
.height(dimensionResource(R.dimen.compose_dialog_close_icon_size))
8893
.clickable { showDialog(false) }
94+
.layoutId(DialogCloseIcon)
95+
.testTag("dialog_icon")
8996
)
9097
}
9198

@@ -97,14 +104,15 @@ fun ColorPickerDialog(
97104
modifier = Modifier
98105
.wrapContentHeight()
99106
.wrapContentWidth()
107+
.layoutId(EmbeddedColorPicker)
100108
) {
101109
ColorPickerComponent(
102110
initialColor = Color(currentColor),
103111
onColorChanged = onColorChanged,
104112
showAlpha = showAlpha,
105-
showHex = showHex,
106113
showHSV = showHSV,
107-
showARGB = showARGB
114+
showARGB = showARGB,
115+
showHex = showHex
108116
)
109117
}
110118
}

library/src/main/java/io/syslogic/colorpicker/compose/LayoutId.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ enum class LayoutId {
99
AlphaPanel,
1010
SatValPanel,
1111
HuePanel,
12-
1312
OldColor,
1413
NewColor,
15-
16-
DialogSurface
14+
EmbeddedColorPicker,
15+
DialogSurface,
16+
DialogTitleText,
17+
DialogCloseIcon
1718
}

library/src/main/res/values/dimens.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
<dimen name="compose_dialog_border_radius">4dp</dimen>
2222
<dimen name="compose_dialog_column_padding">6dp</dimen>
2323
<dimen name="compose_dialog_spacer_height">8dp</dimen>
24+
<dimen name="compose_dialog_close_icon_size">24dp</dimen>
2425
<dimen name="compose_dialog_title_font_size">22dp</dimen>
25-
<dimen name="compose_dialog_close_icon_size">30dp</dimen>
26+
<dimen name="compose_dialog_title_padding">2dp</dimen>
2627

2728
</resources>

0 commit comments

Comments
 (0)