Change colors (#410)

* Change colors * Update colors * Change background color * Fix tests * sync * Rerecord snapshots --------- Co-authored-by: Milad Ajilianabbasi <[email protected]> Co-authored-by: Nina Røsdal Graneggen <[email protected]>
finn-no · Aug 7, 2024 · 8e3f758 · 8e3f758
1 parent f318b2c
commit 8e3f758
Show file tree

Hide file tree

Showing 25 changed files with 5 additions and 3 deletions.
diff --git a/...o/SnapshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPad_darkMode.png b/...o/SnapshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPad_darkMode.png
diff --git a/...SnapshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPhone_darkMode.png b/...SnapshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPhone_darkMode.png
diff --git a/...mo/SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPad_darkMode.png b/...mo/SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPad_darkMode.png
diff --git a/.../SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPhone_darkMode.png b/.../SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPhone_darkMode.png
diff --git a/.../SnapshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPad_darkMode.png b/.../SnapshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPad_darkMode.png
diff --git a/...napshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPhone_darkMode.png b/...napshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPhone_darkMode.png
diff --git a/...hotTests/__Snapshots__/FilterContainerTests/testContextFilter.iPad_darkMode.png b/...hotTests/__Snapshots__/FilterContainerTests/testContextFilter.iPad_darkMode.png
diff --git a/...otTests/__Snapshots__/FilterContainerTests/testContextFilter.iPad_lightMode.png b/...otTests/__Snapshots__/FilterContainerTests/testContextFilter.iPad_lightMode.png
diff --git a/...tTests/__Snapshots__/FilterContainerTests/testContextFilter.iPhone_darkMode.png b/...tTests/__Snapshots__/FilterContainerTests/testContextFilter.iPhone_darkMode.png
diff --git a/...Tests/__Snapshots__/FilterContainerTests/testContextFilter.iPhone_lightMode.png b/...Tests/__Snapshots__/FilterContainerTests/testContextFilter.iPhone_lightMode.png
diff --git a/...ests/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPad_darkMode.png b/...ests/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPad_darkMode.png
diff --git a/...sts/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPad_lightMode.png b/...sts/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPad_lightMode.png
diff --git a/...ts/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPhone_darkMode.png b/...ts/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPhone_darkMode.png
diff --git a/...s/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPhone_lightMode.png b/...s/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPhone_lightMode.png
diff --git a/.../__Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPad_darkMode.png b/.../__Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPad_darkMode.png
diff --git a/...__Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPad_lightMode.png b/...__Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPad_lightMode.png
diff --git a/..._Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPhone_darkMode.png b/..._Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPhone_darkMode.png
diff --git a/...Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPhone_lightMode.png b/...Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPhone_lightMode.png
diff --git a/...otTests/__Snapshots__/FilterContainerTests/testSingleVertical.iPad_darkMode.png b/...otTests/__Snapshots__/FilterContainerTests/testSingleVertical.iPad_darkMode.png
diff --git a/...tTests/__Snapshots__/FilterContainerTests/testSingleVertical.iPad_lightMode.png b/...tTests/__Snapshots__/FilterContainerTests/testSingleVertical.iPad_lightMode.png
diff --git a/...Tests/__Snapshots__/FilterContainerTests/testSingleVertical.iPhone_darkMode.png b/...Tests/__Snapshots__/FilterContainerTests/testSingleVertical.iPhone_darkMode.png
diff --git a/...ests/__Snapshots__/FilterContainerTests/testSingleVertical.iPhone_lightMode.png b/...ests/__Snapshots__/FilterContainerTests/testSingleVertical.iPhone_lightMode.png
diff --git a/Sources/Charcoal/Filters/Root/RootFilterViewController.swift b/Sources/Charcoal/Filters/Root/RootFilterViewController.swift
@@ -53,7 +53,7 @@ final class RootFilterViewController: FilterViewController {
         let action = #selector(handleResetButtonTap)
         let button = UIBarButtonItem(title: "reset".localized(), style: .plain, target: self, action: action)
         let font = UIFont.bodyStrong
-        let textColor = UIColor.text
+        let textColor = UIColor.textLink
         button.setTitleTextAttributes([.font: font, .foregroundColor: textColor])
         button.setTitleTextAttributes([.font: font, .foregroundColor: textColor.withAlphaComponent(0.3)], for: .disabled)
         return button

diff --git a/Sources/Charcoal/Selection/Views/SelectionTagViewCell.swift b/Sources/Charcoal/Selection/Views/SelectionTagViewCell.swift
@@ -27,7 +27,8 @@ final class SelectionTagViewCell: UICollectionViewCell {
         let button = RemoveButton(withAutoLayout: true)
         button.adjustsImageWhenHighlighted = false
         button.imageEdgeInsets = SelectionTagViewCell.removeButtonEdgeInsets
-        button.setImage(UIImage(named: .removeFilterValue), for: .normal)
+        button.tintColor = .iconInverted
+        button.setImage(UIImage(named: .removeFilterValue).withRenderingMode(.alwaysTemplate), for: .normal)
         button.addTarget(self, action: #selector(handleRemoveButtonTap), for: .touchUpInside)
         return button
     }()

diff --git a/Sources/Charcoal/Theme.swift b/Sources/Charcoal/Theme.swift
@@ -4,10 +4,11 @@
 
 import FinniversKit
 import UIKit
+import Warp
 
 public class Theme {
     /// The background used for charcoal will be different in dark mode than the standard FinniversKit as charcoal
     /// components are presented on top of other elements, then in order to achieve more contrast and a sense of levels
     /// we need to override the value for the main background color for dark mode.
-    public static var mainBackground: UIColor = .background
+    public static var mainBackground: UIColor = Warp.UIToken.surfaceElevated100
 }