Merge pull request #35 from gabrieldrn/component/button/fix_icon_butt…

…on_color Fix icon color for icon buttons
gabrieldrn · Nov 9, 2024 · 744b3b6 · 744b3b6
2 parents 96fd19e + 0d49bbe
commit 744b3b6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/buildSrc/src/main/kotlin/com/gabrieldrn/carbon/Configuration.kt b/buildSrc/src/main/kotlin/com/gabrieldrn/carbon/Configuration.kt
@@ -19,9 +19,9 @@ package com.gabrieldrn.carbon
 object Configuration {
     const val majorVersion = 0
     const val minorVersion = 3
-    const val patchVersion = 0
+    const val patchVersion = 1
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 1
+    const val versionCode = 4
     const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
     const val artifactGroup = "io.github.gabrieldrn"
 }
diff --git a/carbon/src/commonMain/kotlin/com/gabrieldrn/carbon/button/ButtonColors.kt b/carbon/src/commonMain/kotlin/com/gabrieldrn/carbon/button/ButtonColors.kt
@@ -113,17 +113,13 @@ internal class ButtonColors private constructor(
         else -> theme.textOnColorDisabled
     }
 
-    val iconColor: Color = if (isIconButton) {
-        theme.iconPrimary
-    } else {
-        when (buttonType) {
-            ButtonType.Tertiary -> theme.buttonTertiary
-            ButtonType.Ghost -> theme.linkPrimary
-            ButtonType.PrimaryDanger -> theme.iconOnColor
-            ButtonType.TertiaryDanger,
-            ButtonType.GhostDanger -> theme.buttonDangerSecondary
-            else -> theme.iconOnColor
-        }
+    val iconColor: Color = when (buttonType) {
+        ButtonType.Tertiary -> theme.buttonTertiary
+        ButtonType.Ghost -> if (isIconButton) theme.iconPrimary else theme.linkPrimary
+        ButtonType.PrimaryDanger -> theme.iconOnColor
+        ButtonType.TertiaryDanger,
+        ButtonType.GhostDanger -> theme.buttonDangerSecondary
+        else -> theme.iconOnColor
     }
 
     val iconActiveColor: Color = if (isIconButton) {
@@ -150,7 +146,7 @@ internal class ButtonColors private constructor(
         ButtonType.Primary,
         ButtonType.Secondary,
         ButtonType.PrimaryDanger -> theme.iconOnColorDisabled
-        else -> theme.iconDisabled // Issue in documentation for Ghost?
+        else -> theme.iconDisabled
     }
 
     override fun equals(other: Any?): Boolean {

diff --git a/carbon/src/commonTest/kotlin/com/gabrieldrn/carbon/button/ButtonColorsTest.kt b/carbon/src/commonTest/kotlin/com/gabrieldrn/carbon/button/ButtonColorsTest.kt
@@ -148,17 +148,13 @@ class ButtonColorsTest : BaseColorsTest() {
             )
 
             assertEquals(
-                expected = if (isIconButton) {
-                    theme.iconPrimary
-                } else {
-                    when (buttonType) {
-                        ButtonType.Tertiary -> theme.buttonTertiary
-                        ButtonType.Ghost -> theme.linkPrimary
-                        ButtonType.PrimaryDanger -> theme.iconOnColor
-                        ButtonType.TertiaryDanger,
-                        ButtonType.GhostDanger -> theme.buttonDangerSecondary
-                        else -> theme.iconOnColor
-                    }
+                expected = when (buttonType) {
+                    ButtonType.Tertiary -> theme.buttonTertiary
+                    ButtonType.Ghost -> if (isIconButton) theme.iconPrimary else theme.linkPrimary
+                    ButtonType.PrimaryDanger -> theme.iconOnColor
+                    ButtonType.TertiaryDanger,
+                    ButtonType.GhostDanger -> theme.buttonDangerSecondary
+                    else -> theme.iconOnColor
                 },
                 actual = colors.iconColor
             )
@@ -194,7 +190,7 @@ class ButtonColorsTest : BaseColorsTest() {
                     ButtonType.Primary,
                     ButtonType.Secondary,
                     ButtonType.PrimaryDanger -> theme.iconOnColorDisabled
-                    else -> theme.iconDisabled // Issue in documentation for Ghost
+                    else -> theme.iconDisabled
                 },
                 actual = colors.iconDisabledColor
             )