Skip to content

Commit 6e7405d

Browse files
syslogicsyslogic
committed
xml resources updated.
1 parent a938d95 commit 6e7405d

File tree

3 files changed

+58
-38
lines changed

3 files changed

+58
-38
lines changed

‎library/src/main/java/io/syslogic/colorpicker/compose/ColorPickerComponent.kt

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import androidx.compose.ui.platform.LocalContext
2525
import androidx.compose.ui.platform.testTag
2626
import androidx.compose.ui.res.dimensionResource
2727
import androidx.compose.ui.res.painterResource
28+
import androidx.compose.ui.res.stringResource
2829
import androidx.compose.ui.text.style.TextAlign
29-
import androidx.compose.ui.unit.Dp
3030
import androidx.compose.ui.unit.IntSize
3131

3232
import io.syslogic.colorpicker.OnColorChangedListener
@@ -49,8 +49,12 @@ fun ColorPickerComponent(
4949
) {
5050

5151
val context = LocalContext.current
52-
val rowPadding = dimensionResource(R.dimen.compose_row_padding)
5352
val listener: OnColorChangedListener? = onColorChanged
53+
val rowPadding = dimensionResource(R.dimen.compose_row_padding)
54+
val colPadding = dimensionResource(R.dimen.compose_col_padding)
55+
val hsvLabelMinWidth = dimensionResource(R.dimen.compose_hsv_label_min_width)
56+
val hsvLabelPaddingEnd = dimensionResource(R.dimen.compose_hsv_label_padding_end)
57+
val argbValueMinWidth = dimensionResource(R.dimen.compose_argb_value_min_width)
5458

5559
/* The initial value must be `initialColor` for all of them. */
5660
var currentColor: Int by remember { mutableStateOf(initialColor.hashCode()) }
@@ -77,62 +81,66 @@ fun ColorPickerComponent(
7781
if (showHSV || showARGB) {
7882
Row(
7983
verticalAlignment = Alignment.Top,
80-
modifier = Modifier.padding(all = rowPadding)
84+
modifier = Modifier
85+
.padding(all = rowPadding * 4)
8186
) {
8287

8388
if (showHSV) {
8489
Column(
8590
horizontalAlignment = Alignment.Start,
8691
modifier = Modifier
87-
.padding(all = rowPadding)
92+
.padding(all = colPadding)
8893
.weight(0.5F)
8994
) {
9095
Row(
9196
verticalAlignment = Alignment.Top,
9297
modifier = Modifier.padding(all = rowPadding)
9398
) {
9499
Text(
95-
text = "Hue:",
100+
text = stringResource(R.string.text_label_hue),
96101
textAlign = TextAlign.End,
97102
modifier = Modifier
98-
.defaultMinSize(minWidth = Dp(44F))
99-
.testTag("text_hue")
103+
.padding(end = hsvLabelPaddingEnd)
104+
.defaultMinSize(minWidth = hsvLabelMinWidth)
105+
.testTag("text_label_hue")
100106
)
101107
Text(
102-
modifier = Modifier.testTag("value_hue"),
103-
text = "$currentHue"
108+
text = "$currentHue",
109+
modifier = Modifier.testTag("value_hue")
104110
)
105111
}
106112
Row(
107113
verticalAlignment = Alignment.Top,
108114
modifier = Modifier.padding(all = rowPadding)
109115
) {
110116
Text(
111-
text = "Sat:",
117+
text = stringResource(R.string.text_label_sat),
112118
textAlign = TextAlign.End,
113119
modifier = Modifier
114-
.defaultMinSize(minWidth = Dp(44F))
115-
.testTag("text_sat")
120+
.padding(end = hsvLabelPaddingEnd)
121+
.defaultMinSize(minWidth = hsvLabelMinWidth)
122+
.testTag("text_label_sat")
116123
)
117124
Text(
118-
modifier = Modifier.testTag("value_sat"),
119-
text = "$currentSat"
125+
text = "$currentSat",
126+
modifier = Modifier.testTag("value_sat")
120127
)
121128
}
122129
Row(
123130
verticalAlignment = Alignment.Top,
124131
modifier = Modifier.padding(all = rowPadding)
125132
) {
126133
Text(
127-
text = "Val:",
134+
text = stringResource(R.string.text_label_val),
128135
textAlign = TextAlign.End,
129136
modifier = Modifier
130-
.defaultMinSize(minWidth = Dp(44F))
131-
.testTag("text_val")
137+
.padding(end = hsvLabelPaddingEnd)
138+
.defaultMinSize(minWidth = hsvLabelMinWidth)
139+
.testTag("text_label_val")
132140
)
133141
Text(
134-
modifier = Modifier.testTag("value_val"),
135-
text = "$currentVal"
142+
text = "$currentVal",
143+
modifier = Modifier.testTag("value_val")
136144
)
137145
}
138146
}
@@ -142,22 +150,22 @@ fun ColorPickerComponent(
142150
Column(
143151
horizontalAlignment = Alignment.End,
144152
modifier = Modifier
145-
.padding(all = rowPadding)
153+
.padding(all = colPadding)
146154
.weight(0.5F)
147155
) {
148156
Row(
149157
verticalAlignment = Alignment.Top,
150158
modifier = Modifier.padding(all = rowPadding)
151159
) {
152160
Text(
153-
text = "Alpha:",
154-
modifier = Modifier.testTag("text_alpha")
161+
text = stringResource(R.string.text_label_alpha),
162+
modifier = Modifier.testTag("text_label_alpha")
155163
)
156164
Text(
157165
text = getAlphaChannel(currentColor),
158166
textAlign = TextAlign.End,
159167
modifier = Modifier
160-
.defaultMinSize(minWidth = Dp(30F))
168+
.defaultMinSize(minWidth = argbValueMinWidth)
161169
.testTag("value_alpha")
162170
)
163171
}
@@ -166,14 +174,14 @@ fun ColorPickerComponent(
166174
modifier = Modifier.padding(all = rowPadding)
167175
) {
168176
Text(
169-
text = "Blue:",
170-
modifier = Modifier.testTag("text_blue")
177+
text = stringResource(R.string.text_label_Blue),
178+
modifier = Modifier.testTag("text_label_Blue")
171179
)
172180
Text(
173181
text = getBlueChannel(currentColor),
174182
textAlign = TextAlign.End,
175183
modifier = Modifier
176-
.defaultMinSize(minWidth = Dp(30F))
184+
.defaultMinSize(minWidth = argbValueMinWidth)
177185
.testTag("value_blue")
178186
)
179187
}
@@ -182,14 +190,14 @@ fun ColorPickerComponent(
182190
modifier = Modifier.padding(all = rowPadding)
183191
) {
184192
Text(
185-
text = "Red:",
186-
modifier = Modifier.testTag("text_red")
193+
text = stringResource(R.string.text_label_red),
194+
modifier = Modifier.testTag("text_label_red")
187195
)
188196
Text(
189197
text = getRedChannel(currentColor),
190198
textAlign = TextAlign.End,
191199
modifier = Modifier
192-
.defaultMinSize(minWidth = Dp(30F))
200+
.defaultMinSize(minWidth = argbValueMinWidth)
193201
.testTag("value_red")
194202
)
195203
}
@@ -198,14 +206,14 @@ fun ColorPickerComponent(
198206
modifier = Modifier.padding(all = rowPadding)
199207
) {
200208
Text(
201-
text = "Green:",
202-
modifier = Modifier.testTag("text_green")
209+
text = stringResource(R.string.text_label_green),
210+
modifier = Modifier.testTag("text_label_green")
203211
)
204212
Text(
205213
text = getGreenChannel(currentColor),
206214
textAlign = TextAlign.End,
207215
modifier = Modifier
208-
.defaultMinSize(minWidth = Dp(30F))
216+
.defaultMinSize(minWidth = argbValueMinWidth)
209217
.testTag("value_green")
210218
)
211219
}
@@ -293,7 +301,7 @@ fun ColorPickerComponent(
293301
Image(
294302
contentDescription = "Alpha Slider",
295303
contentScale = ContentScale.FillBounds,
296-
painter = AlphaPainter(Size(1030F, 80F)).also {
304+
painter = AlphaPainter(Size(1014F, 80F)).also {
297305
it.setAlphaByColor(currentColor)
298306
},
299307
modifier = Modifier
@@ -338,8 +346,7 @@ fun ColorPickerComponent(
338346

339347
/* Color Selector */
340348
Row(
341-
verticalAlignment = Alignment.CenterVertically,
342-
modifier = Modifier.padding(all = rowPadding)
349+
verticalAlignment = Alignment.CenterVertically
343350
) {
344351

345352
Box(
@@ -349,7 +356,7 @@ fun ColorPickerComponent(
349356
Image(
350357
contentDescription = "Old Color",
351358
contentScale = ContentScale.FillBounds,
352-
painter = ColorPainter(Size(400F, 120F)).also {
359+
painter = ColorPainter(Size(422F, 120F)).also {
353360
it.setValue(initialColor)
354361
},
355362
modifier = Modifier
@@ -381,7 +388,7 @@ fun ColorPickerComponent(
381388
Image(
382389
contentDescription = "New Color",
383390
contentScale = ContentScale.FillBounds,
384-
painter = ColorPainter(Size(400F, 120F)).also {
391+
painter = ColorPainter(Size(422F, 120F)).also {
385392
it.setValue(currentColor)
386393
},
387394
modifier = Modifier

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
<dimen name="margin_double_arrow">4dp</dimen>
1111

12-
<dimen name="compose_row_padding">4dp</dimen>
12+
<dimen name="compose_row_padding">2dp</dimen>
13+
<dimen name="compose_col_padding">2dp</dimen>
14+
<dimen name="compose_hsv_label_min_width">44dp</dimen>
15+
<dimen name="compose_hsv_label_padding_end">4dp</dimen>
16+
<dimen name="compose_argb_value_min_width">30dp</dimen>
1317

1418
</resources>

‎library/src/main/res/values/strings.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,13 @@
22
<resources>
33
<string name="text_color_picker_dialog">Color Picker</string>
44
<string name="text_hexadecimal_value">Hex Value</string>
5+
6+
<string name="text_label_hue">Hue:</string>
7+
<string name="text_label_sat">Sat:</string>
8+
<string name="text_label_val">Val:</string>
9+
<string name="text_label_alpha">Alpha:</string>
10+
<string name="text_label_red">Red:</string>
11+
<string name="text_label_green">Green:</string>
12+
<string name="text_label_Blue">Blue:</string>
13+
514
</resources>

0 commit comments

Comments
 (0)