Fix styledColorSL regression

It wasn't handling references to color resources that have no selector. Now it is.
LouisCAD · Aug 6, 2021 · 2fc30fb · 2fc30fb
1 parent e0f5a8a
commit 2fc30fb
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/modules/resources/src/androidMain/kotlin/splitties/resources/ColorResources.kt b/modules/resources/src/androidMain/kotlin/splitties/resources/ColorResources.kt
@@ -93,19 +93,12 @@ inline fun View.styledColor(@AttrRes attr: Int) = context.styledColor(attr)
 inline fun appStyledColor(@AttrRes attr: Int) = appCtx.styledColor(attr)
 
 fun Context.styledColorSL(@AttrRes attr: Int): ColorStateList = withResolvedThemeAttribute(attr) {
-    when (resourceId) {
-        0 -> {
-            require(type in TypedValue.TYPE_FIRST_COLOR_INT..TypedValue.TYPE_LAST_COLOR_INT) {
-                unexpectedThemeAttributeTypeErrorMessage(expectedKind = "color")
-            }
-            ColorStateList.valueOf(data)
-        }
-        else -> {
-            require(type == TypedValue.TYPE_STRING && string.startsWith("res/color/")) {
-                unexpectedThemeAttributeTypeErrorMessage(expectedKind = "color")
-            }
-            colorSL(resourceId)
-        }
+    if (type in TypedValue.TYPE_FIRST_COLOR_INT..TypedValue.TYPE_LAST_COLOR_INT) {
+        ColorStateList.valueOf(data)
+    } else if (type == TypedValue.TYPE_STRING && string.startsWith("res/color/")) {
+        colorSL(resourceId)
+    } else {
+        illegalArg(errorMessage = unexpectedThemeAttributeTypeErrorMessage(expectedKind = "color"))
     }
 }