From 26f4aa56d9e3471e6eb26812f174954177c2fd6c Mon Sep 17 00:00:00 2001
From: Abe Pazos <abe@hamoid.com>
Date: Sat, 18 Dec 2021 19:58:04 +0100
Subject: [PATCH] Fix PaletteStudio color sorting (#213)

---
 orx-palette/src/main/kotlin/PaletteStudio.kt | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/orx-palette/src/main/kotlin/PaletteStudio.kt b/orx-palette/src/main/kotlin/PaletteStudio.kt
index cff72210..c9e1b6a1 100644
--- a/orx-palette/src/main/kotlin/PaletteStudio.kt
+++ b/orx-palette/src/main/kotlin/PaletteStudio.kt
@@ -157,17 +157,13 @@ class PaletteStudio(
 
     private fun createPalette(colors: List<ColorRGBa>): Palette {
         val sortedColors = when (sortBy) {
-            SortBy.DARKEST -> {
-                val darkest = Comparator<ColorRGBa> { c1: ColorRGBa, c2: ColorRGBa -> (getLuminance(c1) - getLuminance(c2)).toInt() }
-                colors.sortedWith(darkest)
+            SortBy.DARKEST -> colors.sortedBy {
+                getLuminance(it)
             }
-            SortBy.BRIGHTEST -> {
-                val brightest = Comparator<ColorRGBa> { c1: ColorRGBa, c2: ColorRGBa -> (getLuminance(c2) - getLuminance(c1)).toInt() }
-                colors.sortedWith(brightest)
-            }
-            SortBy.NO_SORTING -> {
-                colors
+            SortBy.BRIGHTEST -> colors.sortedByDescending {
+                getLuminance(it)
             }
+            SortBy.NO_SORTING -> colors
         }
 
         return assemblePalette(sortedColors)