Skip to content

Commit 679eed8

Browse files
bugfix
1 parent 8e33855 commit 679eed8

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

extendedcolors/src/main/java/com/smarttoolfactory/extendedcolors/model/ColorItem.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ import com.smarttoolfactory.extendedcolors.util.*
99
*/
1010
data class ColorItem(var color: Color) {
1111
val hexARGB
12-
get() = colorToHexAlpha(color)
12+
get() = ColorUtil.colorToHexAlpha(color)
1313

1414
val hex
15-
get() = colorToHex(color)
15+
get() = ColorUtil.colorToHex(color)
1616

1717
val hsvArray
18-
get() = colorToHSV(color)
18+
get() = ColorUtil.colorToHSV(color)
1919

2020
val hslArray
21-
get() = colorToHSL(color)
21+
get() = ColorUtil.colorToHSL(color)
2222

2323
val rgb
24-
get() = colorToARGBArray(color)
24+
get() = ColorUtil.colorToARGBArray(color)
2525

2626
val alpha:Float
2727
get() = color.alpha

extendedcolors/src/main/java/com/smarttoolfactory/extendedcolors/parser/ColorNameParser.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ColorNameParser internal constructor() {
2121

2222
private val rbgData: List<RGBData> by lazy {
2323
colorNameMap.map { entry: Map.Entry<String, String> ->
24-
val rgbArray = hexToRGB(entry.key)
24+
val rgbArray = HexUtil.hexToRGB(entry.key)
2525
val label = entry.value
2626
RGBData(
2727
x = rgbArray[0],
@@ -36,7 +36,7 @@ class ColorNameParser internal constructor() {
3636
* Parse name of [Color]
3737
*/
3838
fun parseColorName(color: Color): String {
39-
val rgbArray = colorToRGBArray(color)
39+
val rgbArray = ColorUtil.colorToRGBArray(color)
4040

4141
val red: Int = rgbArray[0]
4242
val green: Int = rgbArray[1]

0 commit comments

Comments
 (0)