Merge pull request #272 from adevinta/feature/components/intents

[Colors] Rename some intents name
adevinta · Jul 28, 2023 · 8cd10ed · 8cd10ed
2 parents 5a83044 + fa08f79
commit 8cd10ed
Show file tree

Hide file tree

Showing 58 changed files with 141 additions and 154 deletions.
diff --git a/core/Demo/Classes/BadgeUIView_Previews.swift b/core/Demo/Classes/BadgeUIView_Previews.swift
@@ -76,7 +76,7 @@ struct BadgeUIView_Previews: PreviewProvider {
             ),
             BadgeUIView(
                 theme: SparkTheme.shared,
-                intent: .primary,
+                intent: .main,
                 size: .normal,
                 value: 22,
                 format: .overflowCounter(maxValue: 20)
@@ -96,7 +96,7 @@ struct BadgeUIView_Previews: PreviewProvider {
             ),
             BadgeUIView(
                 theme: SparkTheme.shared,
-                intent: .primary
+                intent: .main
             ),
             BadgeUIView(
                 theme: SparkTheme.shared,
@@ -105,7 +105,7 @@ struct BadgeUIView_Previews: PreviewProvider {
             ),
             BadgeUIView(
                 theme: SparkTheme.shared,
-                intent: .secondary,
+                intent: .support,
                 value: 23
             ),
             BadgeUIView(

diff --git a/core/Demo/Classes/BadgeView_Previews.swift b/core/Demo/Classes/BadgeView_Previews.swift
@@ -50,7 +50,7 @@ struct BadgeView_Previews: PreviewProvider {
                         smallCustomBadgeValue = 18
                         smallCustomBadgeSize = .normal
                         smallCustomBadgeIsOutlined.toggle()
-                        smallCustomBadgeType = .primary
+                        smallCustomBadgeType = .main
                     }
                     Button("Change Dange Badge") {
                         standartDangerBadgeType = .neutral
@@ -61,7 +61,7 @@ struct BadgeView_Previews: PreviewProvider {
                                 Text("Default Badge")
                                 BadgeView(
                                     theme: theme,
-                                    intent: .primary,
+                                    intent: .main,
                                     value: 3
                                 )
                                 .format(badgeFormat)
@@ -118,14 +118,14 @@ struct BadgeView_Previews: PreviewProvider {
                                 Text("Text")
                                 BadgeView(
                                     theme: SparkTheme.shared,
-                                    intent: .primary
+                                    intent: .main
                                 )
                             }
                             HStack {
                                 Text("Text")
                                 BadgeView(
                                     theme: SparkTheme.shared,
-                                    intent: .secondary
+                                    intent: .support
                                 )
                             }
                             HStack {

diff --git a/core/Sources/Components/Badge/Properties/Public/BadgeIntentType.swift b/core/Sources/Components/Badge/Properties/Public/BadgeIntentType.swift
@@ -15,7 +15,7 @@ public enum BadgeIntentType: CaseIterable {
     case danger
     case info
     case neutral
-    case primary
-    case secondary
+    case main
+    case support
     case success
 }
diff --git a/core/Sources/Components/Badge/UseCase/GetIntentColors/BadgeGetIntentColorsUseCase.swift b/core/Sources/Components/Badge/UseCase/GetIntentColors/BadgeGetIntentColorsUseCase.swift
@@ -47,13 +47,13 @@ final class BadgeGetIntentColorsUseCase: BadgeGetIntentColorsUseCaseable {
                 borderColor: surfaceColor,
                 foregroundColor: colors.feedback.onNeutral
             )
-        case .primary:
+        case .main:
             return BadgeColors(
                 backgroundColor: colors.main.main,
                 borderColor: surfaceColor,
                 foregroundColor: colors.main.onMain
             )
-        case .secondary:
+        case .support:
             return BadgeColors(
                 backgroundColor: colors.support.support,
                 borderColor: surfaceColor,

diff --git a/core/Sources/Components/Badge/UseCase/GetIntentColors/BadgeGetIntentColorsUseCaseTests.swift b/core/Sources/Components/Badge/UseCase/GetIntentColors/BadgeGetIntentColorsUseCaseTests.swift
@@ -46,13 +46,13 @@ final class BadgeGetColorsUseCaseTests: XCTestCase {
                 expectedTextToken: mockedExpectedColors.feedback.onNeutral
             ),
             .init(
-                givenIntent: .primary,
+                givenIntent: .main,
                 expectedBackgroundToken: mockedExpectedColors.main.main,
                 expectedBorderToken: mockedExpectedSurfaceColor,
                 expectedTextToken: mockedExpectedColors.main.onMain
             ),
             .init(
-                givenIntent: .secondary,
+                givenIntent: .support,
                 expectedBackgroundToken: mockedExpectedColors.support.support,
                 expectedBorderToken: mockedExpectedSurfaceColor,
                 expectedTextToken: mockedExpectedColors.support.onSupport

diff --git a/core/Sources/Components/Button/Enum/ButtonIntent.swift b/core/Sources/Components/Button/Enum/ButtonIntent.swift
@@ -11,24 +11,11 @@ import Foundation
 /// A button intent is used to apply a color scheme to a button.
 @frozen
 public enum ButtonIntent: CaseIterable {
-    /// Intent used for warning-feedback.
     case alert
-
-    /// Intent used for error-feedback.
     case danger
-
-    /// Intent used for neutral-feedback.
+    case main
     case neutral
-
-    /// Defines a primary button with primary colors.
-    case primary
-
-    /// Defines a secondary button with secondary colors.
-    case secondary
-
-    /// Intent used for success-feedback.
     case success
-
-    /// Intent used for surface-buttons.
+    case support
     case surface
 }
diff --git a/core/Sources/Components/Button/UseCase/GetColors/ButtonGetColorsUseCaseTests.swift b/core/Sources/Components/Button/UseCase/GetColors/ButtonGetColorsUseCaseTests.swift
@@ -21,7 +21,7 @@ final class ButtonGetColorsUseCaseTests: XCTestCase {
             let intentsMock = ButtonColors.mocked()
 
             return GetColors(
-                givenIntent: .primary,
+                givenIntent: .main,
                 givenVariant: $0,
                 givenColors: intentsMock,
                 expectedforegroundColorToken: intentsMock.foregroundColor,

diff --git a/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantContrastUseCase.swift b/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantContrastUseCase.swift
@@ -22,15 +22,15 @@ struct ButtonVariantGetContrastUseCase: ButtonGetVariantUseCaseable {
         let backgroundColor = colors.base.surface
 
         switch intent {
-        case .primary:
+        case .main:
             return .init(
                 foregroundColor: colors.main.main,
                 backgroundColor: backgroundColor,
                 pressedBackgroundColor: colors.states.mainContainerPressed,
                 borderColor: borderColor,
                 pressedBorderColor: pressedBorderColor
             )
-        case .secondary:
+        case .support:
             return .init(
                 foregroundColor: colors.support.support,
                 backgroundColor: backgroundColor,

diff --git a/.../Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantContrastUseCaseTests.swift b/.../Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantContrastUseCaseTests.swift
@@ -18,7 +18,7 @@ final class ButtonVariantGetContrastUseCaseTests: ButtonVariantUseCaseTests {
         let sut = self.sut()
 
         // When
-        let colors = sut.execute(intent: .primary, colors: self.theme.colors, dims: self.theme.dims)
+        let colors = sut.execute(intent: .main, colors: self.theme.colors, dims: self.theme.dims)
 
         // Then
         XCTAssertEqual(
@@ -40,7 +40,7 @@ final class ButtonVariantGetContrastUseCaseTests: ButtonVariantUseCaseTests {
         let sut = self.sut()
 
         // When
-        let colors = sut.execute(intent: .secondary, colors: self.theme.colors, dims: self.theme.dims)
+        let colors = sut.execute(intent: .support, colors: self.theme.colors, dims: self.theme.dims)
 
         // Then
         XCTAssertEqual(

diff --git a/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantFilledUseCase.swift b/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantFilledUseCase.swift
@@ -21,15 +21,15 @@ struct ButtonGetVariantFilledUseCase: ButtonGetVariantUseCaseable {
         let pressedBorderColor = ColorTokenDefault.clear
 
         switch intent {
-        case .primary:
+        case .main:
             return .init(
                 foregroundColor: colors.main.onMain,
                 backgroundColor: colors.main.main,
                 pressedBackgroundColor: colors.states.mainPressed,
                 borderColor: borderColor,
                 pressedBorderColor: pressedBorderColor
             )
-        case .secondary:
+        case .support:
             return .init(
                 foregroundColor: colors.support.onSupport,
                 backgroundColor: colors.support.support,

diff --git a/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantFilledUseCaseTests.swift b/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantFilledUseCaseTests.swift
@@ -18,7 +18,7 @@ final class ButtonGetVariantFilledUseCaseTests: ButtonVariantUseCaseTests {
         let sut = self.sut()
 
         // When
-        let colors = sut.execute(intent: .primary, colors: self.theme.colors, dims: self.theme.dims)
+        let colors = sut.execute(intent: .main, colors: self.theme.colors, dims: self.theme.dims)
 
         // Then
         XCTAssertEqual(
@@ -40,7 +40,7 @@ final class ButtonGetVariantFilledUseCaseTests: ButtonVariantUseCaseTests {
         let sut = self.sut()
 
         // When
-        let colors = sut.execute(intent: .secondary, colors: self.theme.colors, dims: self.theme.dims)
+        let colors = sut.execute(intent: .support, colors: self.theme.colors, dims: self.theme.dims)
 
         // Then
         XCTAssertEqual(

diff --git a/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantGhostUseCase.swift b/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantGhostUseCase.swift
@@ -23,15 +23,15 @@ struct ButtonGetVariantGhostUseCase: ButtonGetVariantUseCaseable {
         let dim5 = dims.dim5
 
         switch intent {
-        case .primary:
+        case .main:
             return .init(
                 foregroundColor: colors.main.main,
                 backgroundColor: ColorTokenDefault.clear,
                 pressedBackgroundColor: colors.main.main.opacity(dim5),
                 borderColor: borderColor,
                 pressedBorderColor: pressedBorderColor
             )
-        case .secondary:
+        case .support:
             return .init(
                 foregroundColor: colors.support.support,
                 backgroundColor: ColorTokenDefault.clear,

diff --git a/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantGhostUseCaseTests.swift b/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantGhostUseCaseTests.swift
@@ -18,7 +18,7 @@ final class ButtonGetVariantGhostUseCaseTests: ButtonVariantUseCaseTests {
         let sut = self.sut()
 
         // When
-        let colors = sut.execute(intent: .primary, colors: self.theme.colors, dims: self.theme.dims)
+        let colors = sut.execute(intent: .main, colors: self.theme.colors, dims: self.theme.dims)
 
         // Then
         XCTAssertEqual(
@@ -40,7 +40,7 @@ final class ButtonGetVariantGhostUseCaseTests: ButtonVariantUseCaseTests {
         let sut = self.sut()
 
         // When
-        let colors = sut.execute(intent: .secondary, colors: self.theme.colors, dims: self.theme.dims)
+        let colors = sut.execute(intent: .support, colors: self.theme.colors, dims: self.theme.dims)
 
         // Then
         XCTAssertEqual(

diff --git a/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantOutlinedUseCase.swift b/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantOutlinedUseCase.swift
@@ -22,15 +22,15 @@ struct ButtonGetVariantOutlinedUseCase: ButtonGetVariantUseCaseable {
         let backgroundColor = colors.base.surface
 
         switch intent {
-        case .primary:
+        case .main:
             return .init(
                 foregroundColor: colors.main.main,
                 backgroundColor: backgroundColor,
                 pressedBackgroundColor: colors.main.main.opacity(dim5),
                 borderColor: colors.main.main,
                 pressedBorderColor: colors.main.main
             )
-        case .secondary:
+        case .support:
             return .init(
                 foregroundColor: colors.support.support,
                 backgroundColor: backgroundColor,

diff --git a/.../Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantOutlinedUseCaseTests.swift b/.../Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantOutlinedUseCaseTests.swift
@@ -18,7 +18,7 @@ final class ButtonGetVariantOutlinedUseCaseTests: ButtonVariantUseCaseTests {
         let sut = self.sut()
 
         // When
-        let colors = sut.execute(intent: .primary, colors: self.theme.colors, dims: self.theme.dims)
+        let colors = sut.execute(intent: .main, colors: self.theme.colors, dims: self.theme.dims)
 
         // Then
         XCTAssertEqual(
@@ -40,7 +40,7 @@ final class ButtonGetVariantOutlinedUseCaseTests: ButtonVariantUseCaseTests {
         let sut = self.sut()
 
         // When
-        let colors = sut.execute(intent: .secondary, colors: self.theme.colors, dims: self.theme.dims)
+        let colors = sut.execute(intent: .support, colors: self.theme.colors, dims: self.theme.dims)
 
         // Then
         XCTAssertEqual(

diff --git a/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantTintedUseCase.swift b/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantTintedUseCase.swift
@@ -21,15 +21,15 @@ struct ButtonGetVariantTintedUseCase: ButtonGetVariantUseCaseable {
         let pressedBorderColor = ColorTokenDefault.clear
 
         switch intent {
-        case .primary:
+        case .main:
             return .init(
                 foregroundColor: colors.main.onMainContainer,
                 backgroundColor: colors.main.mainContainer,
                 pressedBackgroundColor: colors.states.mainContainerPressed,
                 borderColor: borderColor,
                 pressedBorderColor: pressedBorderColor
             )
-        case .secondary:
+        case .support:
             return .init(
                 foregroundColor: colors.support.onSupportContainer,
                 backgroundColor: colors.support.supportContainer,

diff --git a/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantTintedUseCaseTests.swift b/core/Sources/Components/Button/UseCase/GetVariants/ButtonGetVariantTintedUseCaseTests.swift
@@ -18,7 +18,7 @@ final class ButtonGetVariantTintedUseCaseTests: ButtonVariantUseCaseTests {
         let sut = self.sut()
 
         // When
-        let colors = sut.execute(intent: .primary, colors: self.theme.colors, dims: self.theme.dims)
+        let colors = sut.execute(intent: .main, colors: self.theme.colors, dims: self.theme.dims)
 
         // Then
         XCTAssertEqual(
@@ -40,7 +40,7 @@ final class ButtonGetVariantTintedUseCaseTests: ButtonVariantUseCaseTests {
         let sut = self.sut()
 
         // When
-        let colors = sut.execute(intent: .secondary, colors: self.theme.colors, dims: self.theme.dims)
+        let colors = sut.execute(intent: .support, colors: self.theme.colors, dims: self.theme.dims)
 
         // Then
         XCTAssertEqual(

diff --git a/core/Sources/Components/Button/View/Common/ButtonSutTests.swift b/core/Sources/Components/Button/View/Common/ButtonSutTests.swift
@@ -81,7 +81,7 @@ struct ButtonSutTests {
         return sizePossibilities.flatMap { size in
             shapePossibilities.map { shape in
                     .init(
-                        intent: .primary,
+                        intent: .main,
                         variant: .filled,
                         size: size,
                         shape: shape,
@@ -112,7 +112,7 @@ struct ButtonSutTests {
 
         return items.map { item in
             .init(
-                intent: .primary,
+                intent: .main,
                 variant: .filled,
                 size: .medium,
                 shape: .rounded,

diff --git a/core/Sources/Components/Button/ViewModel/ButtonViewModelTests.swift b/core/Sources/Components/Button/ViewModel/ButtonViewModelTests.swift
@@ -216,7 +216,7 @@ final class ButtonViewModelTests: XCTestCase {
 
     func test_published_properties_on_load() throws {
         // GIVEN
-        let intentMock: ButtonIntent = .secondary
+        let intentMock: ButtonIntent = .support
         let variantMock: ButtonVariant = .outlined
         let sizeMock: ButtonSize = .medium
         let shapeMock: ButtonShape = .rounded
@@ -403,7 +403,7 @@ final class ButtonViewModelTests: XCTestCase {
         // GIVEN
         let newThemeMock = themeMock
 
-        let intentMock: ButtonIntent = .secondary
+        let intentMock: ButtonIntent = .support
         let variantMock: ButtonVariant = .outlined
         let sizeMock: ButtonSize = .medium
         let shapeMock: ButtonShape = .rounded
@@ -491,12 +491,12 @@ final class ButtonViewModelTests: XCTestCase {
     func test_set_intent_with_new_value() {
         self.testSetIntent(
             givenValue: .danger,
-            givenNewValue: .primary
+            givenNewValue: .main
         )
     }
 
     func test_set_intent_without_new_value() {
-        let valueMock: ButtonIntent = .primary
+        let valueMock: ButtonIntent = .main
         self.testSetIntent(
             givenValue: valueMock,
             givenNewValue: valueMock
@@ -1120,7 +1120,7 @@ final class ButtonViewModelTests: XCTestCase {
 private extension ButtonViewModelTests {
 
     private func classToTest(
-        intent: ButtonIntent = .primary,
+        intent: ButtonIntent = .main,
         variant: ButtonVariant = .tinted,
         size: ButtonSize = .medium,
         shape: ButtonShape = .rounded,

diff --git a/core/Sources/Components/Chip/Enum/ChipIntent.swift b/core/Sources/Components/Chip/Enum/ChipIntent.swift
@@ -10,8 +10,8 @@ import Foundation
 
 /// The various intent color a chip may have.
 public enum ChipIntent: CaseIterable {
-    case primary
-    case secondary
+    case main
+    case support
     case surface
     case success
     case danger