fix(Button): change colors for disabled style (#310)

Telefonica · Oct 13, 2023 · fb108a1 · fb108a1
1 parent 26a73b3
commit fb108a1
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 13 deletions.
diff --git a/Sources/MisticaSwiftUI/Components/Button/MisticaButtonStyle.swift b/Sources/MisticaSwiftUI/Components/Button/MisticaButtonStyle.swift
@@ -22,7 +22,20 @@ public struct MisticaButtonStyle: ButtonStyle {
 
 // MARK: Styles
 
+private var _opacity = 0.5
+private var _opacityWithBackground = 0.1
+
 public extension ButtonStyle where Self == MisticaButtonStyle {
+    static var opacity: CGFloat {
+        get { _opacity }
+        set { _opacity = newValue }
+    }
+
+    static var opacityWithBackground: CGFloat {
+        get { _opacityWithBackground }
+        set { _opacityWithBackground = newValue }
+    }
+
     static func misticaPrimary(
         small: Bool = false,
         bleedingAlignment: ButtonBleedingAlignment = .none
@@ -43,8 +56,8 @@ public extension ButtonStyle where Self == MisticaButtonStyle {
                     ),
                     .disabled: MisticaButton.StateStyle(
                         textColor: .textButtonPrimary,
-                        backgroundColor: .buttonPrimaryBackground.opacity(0.5),
-                        borderColor: .buttonPrimaryBackground.opacity(0.1)
+                        backgroundColor: .buttonPrimaryBackground.opacity(opacity),
+                        borderColor: .buttonPrimaryBackground.opacity(opacityWithBackground)
                     ),
                     .loading: MisticaButton.StateStyle(
                         textColor: .textButtonPrimary,
@@ -78,8 +91,8 @@ public extension ButtonStyle where Self == MisticaButtonStyle {
                     ),
                     .disabled: MisticaButton.StateStyle(
                         textColor: .textButtonPrimaryInverse,
-                        backgroundColor: .buttonPrimaryBackgroundInverse,
-                        borderColor: .buttonPrimaryBackgroundInverse
+                        backgroundColor: .buttonPrimaryBackgroundInverse.opacity(opacity),
+                        borderColor: .buttonPrimaryBackgroundInverse.opacity(opacityWithBackground)
                     ),
                     .loading: MisticaButton.StateStyle(
                         textColor: .textButtonPrimaryInverse,
@@ -112,9 +125,9 @@ public extension ButtonStyle where Self == MisticaButtonStyle {
                         borderColor: .buttonSecondaryBackgroundSelected
                     ),
                     .disabled: MisticaButton.StateStyle(
-                        textColor: .textButtonSecondary,
+                        textColor: .textButtonSecondary.opacity(opacity),
                         backgroundColor: .clear,
-                        borderColor: .buttonSecondaryBorder
+                        borderColor: .buttonSecondaryBorder.opacity(opacity)
                     ),
                     .loading: MisticaButton.StateStyle(
                         textColor: .textButtonSecondary,
@@ -147,9 +160,9 @@ public extension ButtonStyle where Self == MisticaButtonStyle {
                         borderColor: .buttonSecondaryBorderInverseSelected
                     ),
                     .disabled: MisticaButton.StateStyle(
-                        textColor: .textButtonSecondaryInverse,
+                        textColor: .textButtonSecondaryInverse.opacity(opacity),
                         backgroundColor: .clear,
-                        borderColor: .buttonSecondaryBorderInverse
+                        borderColor: .buttonSecondaryBorderInverse.opacity(opacity)
                     ),
                     .loading: MisticaButton.StateStyle(
                         textColor: .textButtonSecondaryInverse,
@@ -183,8 +196,8 @@ public extension ButtonStyle where Self == MisticaButtonStyle {
                     ),
                     .disabled: MisticaButton.StateStyle(
                         textColor: .textButtonPrimary,
-                        backgroundColor: .buttonDangerBackground,
-                        borderColor: .buttonDangerBackground
+                        backgroundColor: .buttonDangerBackground.opacity(opacity),
+                        borderColor: .buttonDangerBackground.opacity(opacityWithBackground)
                     ),
                     .loading: MisticaButton.StateStyle(
                         textColor: .textButtonPrimary,
@@ -219,7 +232,7 @@ public extension ButtonStyle where Self == MisticaButtonStyle {
                         borderColor: .clear
                     ),
                     .disabled: MisticaButton.StateStyle(
-                        textColor: .textLink,
+                        textColor: .textLink.opacity(opacity),
                         backgroundColor: .clear,
                         borderColor: .clear
                     ),
@@ -256,7 +269,7 @@ public extension ButtonStyle where Self == MisticaButtonStyle {
                         borderColor: .clear
                     ),
                     .disabled: MisticaButton.StateStyle(
-                        textColor: .textButtonSecondaryInverse,
+                        textColor: .textButtonSecondaryInverse.opacity(opacity),
                         backgroundColor: .clear,
                         borderColor: .clear
                     ),
@@ -292,7 +305,7 @@ public extension ButtonStyle where Self == MisticaButtonStyle {
                         borderColor: .clear
                     ),
                     .disabled: MisticaButton.StateStyle(
-                        textColor: .textLinkSnackbar,
+                        textColor: .textLinkSnackbar.opacity(opacity),
                         backgroundColor: .clear,
                         borderColor: .clear
                     ),

diff --git a/...aSwiftUITests/UI/__Snapshots__/ButtonTests/testRegularSizeWithDangerStyle.1.png b/...aSwiftUITests/UI/__Snapshots__/ButtonTests/testRegularSizeWithDangerStyle.1.png
diff --git a/...tUITests/UI/__Snapshots__/ButtonTests/testRegularSizeWithLinkInverseStyle.1.png b/...tUITests/UI/__Snapshots__/ButtonTests/testRegularSizeWithLinkInverseStyle.1.png
diff --git a/...ts/UI/__Snapshots__/ButtonTests/testRegularSizeWithLinkInverseWithChevron.1.png b/...ts/UI/__Snapshots__/ButtonTests/testRegularSizeWithLinkInverseWithChevron.1.png
diff --git a/...icaSwiftUITests/UI/__Snapshots__/ButtonTests/testRegularSizeWithLinkStyle.1.png b/...icaSwiftUITests/UI/__Snapshots__/ButtonTests/testRegularSizeWithLinkStyle.1.png
diff --git a/...ftUITests/UI/__Snapshots__/ButtonTests/testRegularSizeWithLinkWithChevron.1.png b/...ftUITests/UI/__Snapshots__/ButtonTests/testRegularSizeWithLinkWithChevron.1.png
diff --git a/...Tests/UI/__Snapshots__/ButtonTests/testRegularSizeWithPrimaryInverseStyle.1.png b/...Tests/UI/__Snapshots__/ButtonTests/testRegularSizeWithPrimaryInverseStyle.1.png
diff --git a/...sts/UI/__Snapshots__/ButtonTests/testRegularSizeWithSecondaryInverseStyle.1.png b/...sts/UI/__Snapshots__/ButtonTests/testRegularSizeWithSecondaryInverseStyle.1.png
diff --git a/...iftUITests/UI/__Snapshots__/ButtonTests/testRegularSizeWithSecondaryStyle.1.png b/...iftUITests/UI/__Snapshots__/ButtonTests/testRegularSizeWithSecondaryStyle.1.png
diff --git a/...icaSwiftUITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithDangerStyle.1.png b/...icaSwiftUITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithDangerStyle.1.png
diff --git a/...iftUITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithLinkInverseStyle.1.png b/...iftUITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithLinkInverseStyle.1.png
diff --git a/...ests/UI/__Snapshots__/ButtonTests/testSmallSizeWithLinkInverseWithChevron.1.png b/...ests/UI/__Snapshots__/ButtonTests/testSmallSizeWithLinkInverseWithChevron.1.png
diff --git a/...sticaSwiftUITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithLinkStyle.1.png b/...sticaSwiftUITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithLinkStyle.1.png
diff --git a/...wiftUITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithLinkWithChevron.1.png b/...wiftUITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithLinkWithChevron.1.png
diff --git a/...UITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithPrimaryInverseStyle.1.png b/...UITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithPrimaryInverseStyle.1.png
diff --git a/...Tests/UI/__Snapshots__/ButtonTests/testSmallSizeWithSecondaryInverseStyle.1.png b/...Tests/UI/__Snapshots__/ButtonTests/testSmallSizeWithSecondaryInverseStyle.1.png
diff --git a/...SwiftUITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithSecondaryStyle.1.png b/...SwiftUITests/UI/__Snapshots__/ButtonTests/testSmallSizeWithSecondaryStyle.1.png