diff --git a/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.dark_iPad.png b/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.dark_iPad.png index d20031f0f0..3a9f9b73fa 100644 Binary files a/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.dark_iPad.png and b/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.dark_iPad.png differ diff --git a/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.dark_iPhone.png b/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.dark_iPhone.png index 45bfcdd9f7..5447a47681 100644 Binary files a/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.dark_iPhone.png and b/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.dark_iPhone.png differ diff --git a/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.light_iPad.png b/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.light_iPad.png index a7c24fb682..243d9f268a 100644 Binary files a/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.light_iPad.png and b/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.light_iPad.png differ diff --git a/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.light_iPhone.png b/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.light_iPhone.png index a280eb8ce6..421d0a0167 100644 Binary files a/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.light_iPhone.png and b/Demo/SnapshotTests/__Snapshots__/ComponentViewTests/PanelDemoView.light_iPhone.png differ diff --git a/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.dark_iPad.png b/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.dark_iPad.png index ed3eb3900a..0529b846be 100644 Binary files a/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.dark_iPad.png and b/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.dark_iPad.png differ diff --git a/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.dark_iPhone.png b/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.dark_iPhone.png index 97bbd4ee7f..fcf6408c33 100644 Binary files a/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.dark_iPhone.png and b/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.dark_iPhone.png differ diff --git a/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.light_iPad.png b/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.light_iPad.png index ee7210c91c..c0d03af665 100644 Binary files a/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.light_iPad.png and b/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.light_iPad.png differ diff --git a/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.light_iPhone.png b/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.light_iPhone.png index eba177d453..46c8880467 100644 Binary files a/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.light_iPhone.png and b/Demo/SnapshotTests/__Snapshots__/RecyclingViewTests/SettingsViewDemoView.light_iPhone.png differ diff --git a/FinniversKit.xcworkspace/xcshareddata/swiftpm/Package.resolved b/FinniversKit.xcworkspace/xcshareddata/swiftpm/Package.resolved index f48fc8ea8b..eb604c9985 100644 --- a/FinniversKit.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/FinniversKit.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/warp-ds/warp-ios.git", "state" : { - "revision" : "47cdf208cbaa44b76713da510046a7d935eb978e", - "version" : "0.0.17" + "revision" : "ae6d80f9fd3477ebf487cc060306697b557cc532", + "version" : "0.0.22" } } ], diff --git a/FinniversKit/Sources/Base Components/ButtonStyle.swift b/FinniversKit/Sources/Base Components/ButtonStyle.swift index 5470eb107d..c82393f14e 100644 --- a/FinniversKit/Sources/Base Components/ButtonStyle.swift +++ b/FinniversKit/Sources/Base Components/ButtonStyle.swift @@ -9,7 +9,7 @@ public struct InlineFlatStyle: ButtonStyle { private let font: Font private let textColor: Color - public init(size: Button.Size = .normal, textColor: Color = .backgroundPrimary) { + public init(size: Button.Size = .normal, textColor: Color = .textLink) { self.font = size == .normal ? .finnFont(.bodyStrong) : .finnFont(.detailStrong) self.textColor = textColor } @@ -31,7 +31,7 @@ public struct FlatStyle: ButtonStyle { public init( size: Button.Size = .normal, - textColor: Color = .backgroundPrimary, + textColor: Color = .textLink, fullWidth: Bool = true, padding: EdgeInsets = .init(top: Warp.Spacing.spacing100, leading: Warp.Spacing.spacing200, bottom: Warp.Spacing.spacing100, trailing: Warp.Spacing.spacing200) ) { @@ -66,7 +66,7 @@ public struct DefaultStyle: ButtonStyle { public init( size: Button.Size = .normal, - textColor: Color = .backgroundPrimary, + textColor: Color = .textLink, fullWidth: Bool = true, padding: EdgeInsets = .init(top: Warp.Spacing.spacing100, leading: Warp.Spacing.spacing200, bottom: Warp.Spacing.spacing100, trailing: Warp.Spacing.spacing200) ) { @@ -97,7 +97,7 @@ public struct DefaultStyle: ButtonStyle { .cornerRadius(Warp.Spacing.spacing100) .roundedBorder( radius: Warp.Spacing.spacing100, - color: configuration.isPressed ? .borderActive : .backgroundDisabled + color: configuration.isPressed ? .borderActive : .borderDisabled ) } } @@ -111,7 +111,7 @@ public struct CallToAction: ButtonStyle { public init( size: Button.Size = .normal, - background: Color = .backgroundPrimary, + background: Color = Warp.Color.buttonPrimaryBackground, fullWidth: Bool = true, isEnabled: Binding? = nil, padding: EdgeInsets? = nil diff --git a/FinniversKit/Sources/Components/Button/Button/Button+Style.swift b/FinniversKit/Sources/Components/Button/Button/Button+Style.swift index bcc26fcdf9..fe2db778af 100644 --- a/FinniversKit/Sources/Components/Button/Button/Button+Style.swift +++ b/FinniversKit/Sources/Components/Button/Button/Button+Style.swift @@ -223,12 +223,12 @@ public extension Button.Style { stateStyles: [ .normal: Button.StateStyle( textColor: .textInverted, - backgroundColor: .backgroundPrimary, + backgroundColor: Warp.UIColor.buttonPrimaryBackground, borderColor: nil ), .highlighted: Button.StateStyle( textColor: nil, - backgroundColor: .backgroundPrimaryActive, + backgroundColor: Warp.UIColor.buttonPrimaryBackgroundActive, borderColor: nil ), .disabled: Button.StateStyle( diff --git a/FinniversKit/Sources/Components/Panel/Panel+Style.swift b/FinniversKit/Sources/Components/Panel/Panel+Style.swift index 425a269d0f..7026b14661 100644 --- a/FinniversKit/Sources/Components/Panel/Panel+Style.swift +++ b/FinniversKit/Sources/Components/Panel/Panel+Style.swift @@ -17,7 +17,7 @@ extension Panel { switch self { case .plain: return .background case .info: return .backgroundInfoSubtle - case .tips: return Warp.UIColor.badgeSponsoredBackground + case .tips: return .backgroundInfoSubtle case .newFunctionality: return .backgroundPositiveSubtle case .success: return .backgroundPositiveSubtle case .warning: return .backgroundWarningSubtle diff --git a/FinniversKit/Sources/Components/SelectionView/Cells/SelectionOptionCell.swift b/FinniversKit/Sources/Components/SelectionView/Cells/SelectionOptionCell.swift index ab3c5779e6..79c91ce629 100644 --- a/FinniversKit/Sources/Components/SelectionView/Cells/SelectionOptionCell.swift +++ b/FinniversKit/Sources/Components/SelectionView/Cells/SelectionOptionCell.swift @@ -68,7 +68,7 @@ final class SelectionOptionCell: UITableViewCell { private func setup() { isAccessibilityElement = true - backgroundColor = .background + backgroundColor = .clear setDefaultSelectedBackgound() hideCheckmark(true) @@ -94,10 +94,10 @@ final class SelectionOptionCell: UITableViewCell { } private func hideCheckmark(_ hide: Bool) { - iconImageView.tintColor = hide ? .iconPrimary : .backgroundPrimary + iconImageView.tintColor = hide ? .icon : .iconPrimary titleLabel.font = hide ? .body : .bodyStrong - titleLabel.textColor = iconImageView.tintColor + titleLabel.textColor = hide ? .text : .textLink checkmarkImageView.isHidden = hide } diff --git a/FinniversKit/Sources/Components/SelectionView/SelectionView.swift b/FinniversKit/Sources/Components/SelectionView/SelectionView.swift index 35190b4bb3..9045f388ca 100644 --- a/FinniversKit/Sources/Components/SelectionView/SelectionView.swift +++ b/FinniversKit/Sources/Components/SelectionView/SelectionView.swift @@ -25,7 +25,7 @@ public final class SelectionView: UIView { tableView.translatesAutoresizingMaskIntoConstraints = false tableView.delegate = self tableView.dataSource = self - tableView.backgroundColor = .background + tableView.backgroundColor = .clear tableView.rowHeight = SelectionView.rowHeight tableView.estimatedRowHeight = SelectionView.rowHeight tableView.separatorInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0) diff --git a/FinniversKit/Sources/Recycling/ListViews/Settings/View/SettingsView.swift b/FinniversKit/Sources/Recycling/ListViews/Settings/View/SettingsView.swift index b9b33a5627..088079cde1 100644 --- a/FinniversKit/Sources/Recycling/ListViews/Settings/View/SettingsView.swift +++ b/FinniversKit/Sources/Recycling/ListViews/Settings/View/SettingsView.swift @@ -32,7 +32,7 @@ public class SettingsView: UIView { lazy var tableView: UITableView = { let tableView = UITableView(frame: .zero, style: .grouped) - tableView.backgroundColor = .background + tableView.backgroundColor = .surfaceSunken tableView.separatorStyle = .none tableView.dataSource = self tableView.delegate = self diff --git a/Package.swift b/Package.swift index 6bc3931501..63bce59fc5 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/warp-ds/warp-ios.git", "0.0.17"..."999.0.0") + .package(url: "https://github.com/warp-ds/warp-ios.git", "0.0.22"..."999.0.0") ], targets: [ .target(