feat(Brand): New moves brand and remove prominent

BREAKING CHANGE: Renamed some tokens from the color palettes and removed prominent variant theme and all the code related with ThemeVariant

* IOS-7865 Update movistar mistica color palette for digital hub. Removed/renamed some tokens from MisticaColors protocol. Removed GradientView cause now is not used anymore.

* Run swiftformat

* IOS-7865 Removed O2Classic snapshots.

* IOS-7865 Added new snapshots for the new Movistar color palette.

* IOS-7865 Update ColorToolkit+UIColor with some tokens renamed.

* IOS-8052 Removed all code related with theme variants and prominent.

* Run swiftformat

---------

Co-authored-by: idenjoe <idenjoe@users.noreply.github.com>

CONTRIBUTING.md

@@ -102,7 +102,7 @@ When implementing the component, try to have in mind the following guidelines:
 * Make sure the component reiszes correctly (we support iPad multitasking, so any screen can resize at any given time).
 * Don't forget accessibility (VoiceOver, Dynamic Type...).
 * Pay attention to user interaction (Gestures, Haptics, 3D Touch...)
-* Although this should be transparent to you, take into account themes and multiple brands.
+* Although this should be transparent to you, take into account multiple brands.
 * To help other developers, add documentation about the new component.
 
 ## Testing

README.md

@@ -84,11 +84,10 @@ pod install
 
 ## Configuration
 
-By default the framework components are created with the Movistar's brand style and the `standard` theme variant, to select a different one, configure the brand style and/or variant:
+By default the framework components are created with the Movistar's brand style, to select a different one, configure the brand style:
 
 ```swift
 MisticaConfig.brandStyle = .o2
-MisticaConfig.themeVariant = .prominent
 ```
 
 Remember to initialize Mistica with you desired brand style before the initialize the UI of your app.

Sources/Mistica/Components/Filter/Filter.swift

@@ -102,9 +102,6 @@ public class Filter: UIView {
         setUpSegmentsContentMode(for: traitCollection)
         setUpLayout(for: segmentsContentMode)
         setUpCollectionView()
-
-        // Listen to theme variant changes
-        NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), name: .themeVariantDidChange, object: nil)
     }
 
     override public func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
@@ -115,7 +112,9 @@ public class Filter: UIView {
         }
 
         if traitCollection.userInterfaceStyle != previousTraitCollection?.userInterfaceStyle {
-            themeDidChange()
+            collectionView.backgroundColor = .navigationBarBackground
+            bottomSeparator.image = UIImage(color: .navigationBarDivider)
+            reloadContent()
         }
     }
 
@@ -357,13 +356,3 @@ private extension Filter {
         return segments[index]
     }
 }
-
-// MARK: Theme Variant did change notification
-
-@objc extension Filter {
-    func themeDidChange() {
-        collectionView.backgroundColor = .navigationBarBackground
-        bottomSeparator.image = UIImage(color: .navigationBarDivider)
-        reloadContent()
-    }
-}

Sources/Mistica/Components/Tabs/TabsView.swift

@@ -115,9 +115,6 @@ private extension TabsView {
         setUpDivider()
         setUpCollectionView()
         updateEstimatedItemSize()
-
-        // Listen to theme variant changes
-        NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), name: .themeVariantDidChange, object: nil)
     }
 
     func setUpView() {
@@ -229,14 +226,6 @@ extension TabsView: UICollectionViewDelegate {
     }
 }
 
-// MARK: Theme Variant did change notification
-
-@objc extension TabsView {
-    func themeDidChange() {
-        reloadContent()
-    }
-}
-
 // MARK: UILargeContentViewerInteractionDelegate
 
 extension TabsView: UILargeContentViewerInteractionDelegate {

Sources/MisticaCommon/MisticaConfig.swift

@@ -22,13 +22,6 @@ public enum MisticaConfig {
         }
     }
 
-    public static var themeVariant: ThemeVariant = .standard {
-        didSet {
-            MisticaAppearance.setUp(controls: currentStyledControls)
-            NotificationCenter.default.post(name: .themeVariantDidChange, object: nil)
-        }
-    }
-
     public static func styleControls(_ controls: [MisticaControlStyle]) {
         currentStyledControls = controls
         MisticaAppearance.setUp(controls: controls)

Sources/MisticaCommon/Styles/AssetCatalog+Themed.swift → Sources/MisticaCommon/Styles/AssetCatalog.swift

@@ -1,5 +1,5 @@
 //
-//  AssetCatalog+Themed.swift
+//  AssetCatalog.swift
 //
 //  Made with ❤️ by Novum
 //
@@ -17,7 +17,7 @@ extension UIImage {
     ///
     /// - Parameters:
     ///   - brandedImageNamed: asset name
-    ///   - type: if the asset can change per brand, theme or is common
+    ///   - type: if the asset can change per brand or is common
     convenience init?(named: String, type: AssetType) {
         let name = type.assetPath(named)
         self.init(named: name, in: .mistica, compatibleWith: nil)
@@ -30,7 +30,7 @@ extension NSDataAsset {
     ///
     /// - Parameters:
     ///   - brandedImageNamed: asset name
-    ///   - type: if the asset can change per brand, theme or is common
+    ///   - type: if the asset can change per brand or is common
     convenience init?(named: String, type: AssetType) {
         let name = type.assetPath(named)
         self.init(name: name, bundle: .mistica)
@@ -43,48 +43,27 @@ extension Image {
     ///
     /// - Parameters:
     ///   - brandedImageNamed: asset name
-    ///   - type: if the asset can change per brand, theme or is common
+    ///   - type: if the asset can change per brand or is common
     init?(named: String, type: AssetType) {
         let name = type.assetPath(named)
         self.init(name, bundle: .mistica)
     }
 }
 
-extension UIColor {
-    /// Creates a color using the current theme variant.
-    ///
-    /// - Parameters:
-    ///   - defaultColor: color used when the color for the current variant has not been provided
-    ///   - variants: colors for different theme variants
-    convenience init(_ defaultColor: UIColor, variants: [ThemeVariant: UIColor]) {
-        if let current = variants[MisticaConfig.themeVariant] {
-            self.init(cgColor: current.cgColor)
-        } else {
-            self.init(cgColor: defaultColor.cgColor)
-        }
-    }
-}
-
 private extension BrandStyle {
-    /// Build an asset path based on the brand style (movistar, vivo..) and the theme variant (standard, prominent..)
+    /// Build an asset path based on the brand style (movistar, vivo..)
     /// The image name with a 'path' format will be used to locate the asset in the asset catalog.
     ///
     /// - Parameters:
     ///   - name: asset name
-    ///   - variant: brand style variant
     /// - Returns: path to asset inside the asset catalog
-    func assetPath(_ name: String, variant: ThemeVariant) -> String {
-        switch variant {
-        case .standard:
-            return "\(id)/\(name)"
-        default:
-            return "\(id)/\(variant.rawValue)/\(name)"
-        }
+    func assetPath(_ name: String) -> String {
+        "\(id)/\(name)"
     }
 }
 
 private extension AssetType {
-    /// Build an asset path based on the asset type in case the asset can change per brand, theme or is common
+    /// Build an asset path based on the asset type in case the asset can change per brand or is common
     /// The image name with a 'path' format will be used to locate the asset in the asset catalog.
     ///
     /// - Parameter name: asset name
@@ -94,9 +73,7 @@ private extension AssetType {
         case .common:
             return name
         case .branded:
-            return MisticaConfig.brandStyle.assetPath(name, variant: .standard)
-        case .brandedAndThemed:
-            return MisticaConfig.brandStyle.assetPath(name, variant: MisticaConfig.themeVariant)
+            return MisticaConfig.brandStyle.assetPath(name)
         }
     }
 }

Sources/MisticaCommon/Styles/AssetType.swift

@@ -14,7 +14,4 @@ enum AssetType {
 
     // The asset changes per brand style
     case branded
-
-    // The asset changes per brand style and per theme variant
-    case brandedAndThemed
 }