Refactor getColor(Context, Int)

6 years ago · 65af1cc99b
parent b78da920b4
commit 65af1cc99b
1 changed files with 5 additions and 8 deletions
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt
@ -43,15 +43,12 @@ object PaletteUtils {

    @JvmStatic
    fun getColor(context: Context, paletteColor: Int): Int {
-        var paletteColor = paletteColor
-
-        val res = StyledResources(context)
-        val palette = res.palette
-        if (paletteColor < 0 || paletteColor >= palette.size) {
+        val palette = StyledResources(context).palette
+        return if (paletteColor in palette.indices) {
+            palette[paletteColor]
+        } else {
            Log.w("ColorHelper", "Invalid color: $paletteColor. Returning default.")
-            paletteColor = 0
+            palette[0]
        }
-
-        return palette[paletteColor]
    }
 }