From e29c670cf30d49c4ac4fdf1ef9aa0ea42551723f Mon Sep 17 00:00:00 2001
From: Ricardo Matias <ricardo.matias0@gmail.com>
Date: Sat, 25 Apr 2020 10:11:21 +0200
Subject: [PATCH] Remove dead code and make getLuminance and getContrast public

---
 orx-palette/src/main/kotlin/ColorUtils.kt    | 25 +++-----------------
 orx-palette/src/main/kotlin/PaletteStudio.kt |  1 +
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/orx-palette/src/main/kotlin/ColorUtils.kt b/orx-palette/src/main/kotlin/ColorUtils.kt
index 1d2f55db..09ac5b65 100644
--- a/orx-palette/src/main/kotlin/ColorUtils.kt
+++ b/orx-palette/src/main/kotlin/ColorUtils.kt
@@ -4,31 +4,12 @@ import org.openrndr.color.ColorRGBa
 import org.openrndr.color.Linearity
 
 // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
-internal fun getLuminance(color: ColorRGBa): Double = 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b
+fun getLuminance(color: ColorRGBa): Double = 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b
 
 // see http://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
-internal fun getContrast(colorA: ColorRGBa, colorB: ColorRGBa): Double {
+fun getContrast(colorA: ColorRGBa, colorB: ColorRGBa): Double {
     val l1 = getLuminance(colorA)
     val l2 = getLuminance(colorB)
 
-    return if (l1 > l2) (l1 + 0.05) / (l2 + 0.05) else (l2 + 0.05) / (l1 + 0.05);
+    return if (l1 > l2) (l1 + 0.05) / (l2 + 0.05) else (l2 + 0.05) / (l1 + 0.05)
 }
-
-// TODO(ricardomatias) Remove this when 0.3.36 is released
-internal fun fromHex(hex: String): ColorRGBa {
-    val parsedHex = hex.replace("#", "")
-    val len = parsedHex.length
-    val mult = len / 3
-
-    val colors = (0..2).map { idx ->
-        var c = parsedHex.substring(idx * mult, (idx + 1) * mult)
-
-        c = if (len == 3) c + c else c
-
-        Integer.valueOf(c, 16)
-    }
-
-    val (r, g, b) = colors
-
-    return ColorRGBa(r / 255.0, g / 255.0, b / 255.0, 1.0, Linearity.SRGB)
-}
\ No newline at end of file
diff --git a/orx-palette/src/main/kotlin/PaletteStudio.kt b/orx-palette/src/main/kotlin/PaletteStudio.kt
index 4a140e26..833e6e31 100644
--- a/orx-palette/src/main/kotlin/PaletteStudio.kt
+++ b/orx-palette/src/main/kotlin/PaletteStudio.kt
@@ -13,6 +13,7 @@ import org.openrndr.color.ColorRGBa.Companion.GREEN
 import org.openrndr.color.ColorRGBa.Companion.PINK
 import org.openrndr.color.ColorRGBa.Companion.RED
 import org.openrndr.color.ColorRGBa.Companion.YELLOW
+import org.openrndr.color.ColorRGBa.Companion.fromHex
 import org.openrndr.resourceUrl
 import java.io.File
 import java.net.URL