diff --git a/Backpack-SwiftUI/Badge/Classes/BPKBadge+Style.swift b/Backpack-SwiftUI/Badge/Classes/BPKBadge+Style.swift index cb171d754..f23654563 100644 --- a/Backpack-SwiftUI/Badge/Classes/BPKBadge+Style.swift +++ b/Backpack-SwiftUI/Badge/Classes/BPKBadge+Style.swift @@ -19,40 +19,38 @@ internal extension BPKBadge.Style { var backgroundColor: BPKColor { switch self { - case .normal: - return .skyGrayTint07.darkVariant(.blackTint02) - case .strong: - return .skyGray.darkVariant(.white) case .success: - return .glencoe + return BPKColor.statusSuccessFillColor case .warning: - return .erfoud + return BPKColor.statusWarningFillColor case .destructive: - return .panjin + return BPKColor.statusDangerFillColor case .inverse: - return .white + return BPKColor.surfaceDefaultColor case .outline: - return .clear + return BPKColor.white.withAlphaComponent(0) + case .normal: + return BPKColor.surfaceHighlightColor + case .strong: + return BPKColor.corePrimaryColor } } var foregroundColor: BPKColor { switch self { - case .normal: - return .textPrimaryColor - case .strong: - return .white.darkVariant(.skyGray) - case .destructive, .outline: - return .white - default: - return .skyGray + case .success, .warning, .destructive: + return BPKColor.textOnLightColor + case .outline, .strong: + return BPKColor.textOnDarkColor + case .normal, .inverse: + return BPKColor.textPrimaryColor } } var borderColor: BPKColor? { switch self { case .outline: - return .white + return BPKColor.textOnDarkColor default: return nil } diff --git a/Backpack-SwiftUI/Badge/Classes/BPKBadge.swift b/Backpack-SwiftUI/Badge/Classes/BPKBadge.swift index 3cfce147b..02c41fbdc 100644 --- a/Backpack-SwiftUI/Badge/Classes/BPKBadge.swift +++ b/Backpack-SwiftUI/Badge/Classes/BPKBadge.swift @@ -98,6 +98,30 @@ fileprivate extension View { struct BPKBadge_Previews: PreviewProvider { static var previews: some View { - BPKBadge("Success", icon: .return) + let styles: [(BPKBadge.Style, String, BPKIcon, Bool)] = [ + (.normal, "Normal", .tickCircle, false), + (.strong, "Strong", .tickCircle, false), + (.success, "Success", .tickCircle, false), + (.warning, "Warning", .helpCircle, false), + (.destructive, "Critical", .exclamation, false), + (.inverse, "Inverse", .tickCircle, true), + (.outline, "Outline", .tickCircle, true) + ] + return Group { + ForEach([ColorScheme.light, ColorScheme.dark], id: \.self) { scheme in + VStack(alignment: .leading, spacing: 0) { + ForEach(styles, id: \.0) { style in + BPKBadge(style.1, icon: style.2) + .badgeStyle(style.0) + .padding(10) + .background(style.3 ? BPKColor.surfaceHighlightColor : BPKColor.surfaceDefaultColor) + + } + + } + .previewLayout(.sizeThatFits) + .preferredColorScheme(scheme) + } + } } } diff --git a/Backpack-SwiftUI/Tests/Badge/BPKBadgeTests.swift b/Backpack-SwiftUI/Tests/Badge/BPKBadgeTests.swift index c683e190d..5c939710b 100644 --- a/Backpack-SwiftUI/Tests/Badge/BPKBadgeTests.swift +++ b/Backpack-SwiftUI/Tests/Badge/BPKBadgeTests.swift @@ -22,32 +22,30 @@ import SwiftUI class BPKBadgeTests: XCTestCase { - let styles: [BPKBadge.Style] = [ - .normal, - .strong, - .success, - .warning, - .destructive, - .inverse, - .outline + let styles: [(BPKBadge.Style, BPKColor)] = [ + (.normal, .surfaceDefaultColor), + (.strong, .surfaceDefaultColor), + (.success, .surfaceDefaultColor), + (.warning, .surfaceDefaultColor), + (.destructive, .surfaceDefaultColor), + (.inverse, .surfaceHighlightColor), + (.outline, .surfaceHighlightColor) ] private func testView(icon: BPKIcon? = nil) -> some View { - ZStack { - Color(.skyGrayTint06.darkVariant(.black)) - VStack { - ForEach(styles, id: \.self) { - BPKBadge("Test badge", icon: icon) - .badgeStyle($0) - } + VStack(spacing: 0) { + ForEach(styles, id: \.0) { + BPKBadge("Test badge", icon: icon) + .badgeStyle($0.0) + .padding(4) + .background($0.1) } - .padding() } } - - func test_allBadgesWithoutIcon() { - // Then - assertSnapshot(testView()) + +func test_allBadgesWithoutIcon() { + // Then + assertSnapshot(testView()) } func test_allBadgesWithIcon() { diff --git a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.dark-mode.png b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.dark-mode.png index fd7c9566c..17ac2738e 100644 Binary files a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.dark-mode.png and b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.dark-mode.png differ diff --git a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.light-mode.png b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.light-mode.png index 700314e82..ae1297c5a 100644 Binary files a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.light-mode.png and b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.light-mode.png differ diff --git a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.rtl.png b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.rtl.png index ae9d9a681..141dee394 100644 Binary files a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.rtl.png and b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithIcon.rtl.png differ diff --git a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.dark-mode.png b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.dark-mode.png index 8acd2d74d..fbbd76d40 100644 Binary files a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.dark-mode.png and b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.dark-mode.png differ diff --git a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.light-mode.png b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.light-mode.png index 44ad6e5f8..056098b1e 100644 Binary files a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.light-mode.png and b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.light-mode.png differ diff --git a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.rtl.png b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.rtl.png index 14621bfbc..ef2dd3b10 100644 Binary files a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.rtl.png and b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_allBadgesWithoutIcon.rtl.png differ diff --git a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_badgeWillKeepSingleLine.light-mode.png b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_badgeWillKeepSingleLine.light-mode.png index 52cbb1f96..8cb52e076 100644 Binary files a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_badgeWillKeepSingleLine.light-mode.png and b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_badgeWillKeepSingleLine.light-mode.png differ diff --git a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_badgeWillKeepSingleLine.rtl.png b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_badgeWillKeepSingleLine.rtl.png index a811a4e42..96dc704b4 100644 Binary files a/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_badgeWillKeepSingleLine.rtl.png and b/Backpack-SwiftUI/Tests/Badge/__Snapshots__/BPKBadgeTests/test_badgeWillKeepSingleLine.rtl.png differ diff --git a/Backpack/Badge/Classes/Badge.swift b/Backpack/Badge/Classes/Badge.swift index 041adfa58..19a1a0709 100644 --- a/Backpack/Badge/Classes/Badge.swift +++ b/Backpack/Badge/Classes/Badge.swift @@ -79,7 +79,7 @@ public class BPKBadge: UIView { label.textColor = type.textColor if type == .outline { - layer.borderColor = BPKColor.white.cgColor + layer.borderColor = BPKColor.textOnDarkColor.cgColor layer.borderWidth = BPKBorderWidthSm } @@ -127,25 +127,18 @@ public class BPKBadge: UIView { guard traitCollection.userInterfaceStyle != previousTraitCollection?.userInterfaceStyle else { return } updateLookAndFeel() } - - func changeContent(color: UIColor) { - guard type == .outline else { return } - backgroundColor = BPKColor.clear - layer.borderColor = color.cgColor - label.textColor = color - } } fileprivate extension BPKBadgeType { var textColor: UIColor { switch self { - case .outline, .destructive: - return BPKColor.white - case .normal: + case .success, .warning, .destructive: + return BPKColor.textOnLightColor + case .outline, .strong: + return BPKColor.textOnDarkColor + case .normal, .inverse: return BPKColor.textPrimaryColor - case .strong: - return BPKColor.dynamicColor(withLightVariant: BPKColor.white, darkVariant: BPKColor.skyGray) - default: + case .light: return BPKColor.skyGray } } @@ -153,21 +146,21 @@ fileprivate extension BPKBadgeType { var backgroundColor: UIColor { switch self { case .success: - return BPKColor.glencoe + return BPKColor.statusSuccessFillColor case .warning: - return BPKColor.erfoud + return BPKColor.statusWarningFillColor case .destructive: - return BPKColor.panjin + return BPKColor.statusDangerFillColor case .light: return BPKColor.skyGrayTint07 case .inverse: - return BPKColor.white + return BPKColor.surfaceDefaultColor case .outline: - return BPKColor.white.withAlphaComponent(0.2) + return BPKColor.white.withAlphaComponent(0) case .normal: - return BPKColor.dynamicColor(withLightVariant: BPKColor.skyGrayTint07, darkVariant: BPKColor.blackTint02) + return BPKColor.surfaceHighlightColor case .strong: - return BPKColor.dynamicColor(withLightVariant: BPKColor.skyGray, darkVariant: BPKColor.white) + return BPKColor.corePrimaryColor } } } diff --git a/Backpack/Tests/SnapshotTests/Badge/BPKBadgeSnapshotTest.swift b/Backpack/Tests/SnapshotTests/Badge/BPKBadgeSnapshotTest.swift index abb5ec460..07b0d4485 100644 --- a/Backpack/Tests/SnapshotTests/Badge/BPKBadgeSnapshotTest.swift +++ b/Backpack/Tests/SnapshotTests/Badge/BPKBadgeSnapshotTest.swift @@ -43,7 +43,7 @@ class BPKBadgeSnapshotTest: XCTestCase { private func createViewWithTypes(andIcon icon: BPKBadge.Icon? = nil) -> UIView { let stackView = createStackView() let parentView = UIView(frame: .zero) - parentView.backgroundColor = BPKColor.skyGrayTint06 + parentView.translatesAutoresizingMaskIntoConstraints = false parentView.addSubview(stackView) diff --git a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithLeadingIcon.1.png b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithLeadingIcon.1.png index 0f57e7aec..2595cbb98 100644 Binary files a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithLeadingIcon.1.png and b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithLeadingIcon.1.png differ diff --git a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithLeadingIcon.2.png b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithLeadingIcon.2.png index c3ffaa800..21363abb9 100644 Binary files a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithLeadingIcon.2.png and b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithLeadingIcon.2.png differ diff --git a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTrailingIcon.1.png b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTrailingIcon.1.png index 75578e367..80dab890f 100644 Binary files a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTrailingIcon.1.png and b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTrailingIcon.1.png differ diff --git a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTrailingIcon.2.png b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTrailingIcon.2.png index 46a39cd7c..9d8089c1b 100644 Binary files a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTrailingIcon.2.png and b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTrailingIcon.2.png differ diff --git a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTypes.1.png b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTypes.1.png index 1ce980784..c72ae0fc0 100644 Binary files a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTypes.1.png and b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTypes.1.png differ diff --git a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTypes.2.png b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTypes.2.png index 930f3297d..1609e045d 100644 Binary files a/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTypes.2.png and b/Backpack/Tests/SnapshotTests/Badge/__Snapshots__/BPKBadgeSnapshotTest/testViewSnapshotWithTypes.2.png differ diff --git a/screenshots/iPhone 8-badge___all_dm.png b/screenshots/iPhone 8-badge___all_dm.png index bfae23320..629ee6dd6 100644 Binary files a/screenshots/iPhone 8-badge___all_dm.png and b/screenshots/iPhone 8-badge___all_dm.png differ diff --git a/screenshots/iPhone 8-badge___all_lm.png b/screenshots/iPhone 8-badge___all_lm.png index e961de34f..5af6d14ae 100644 Binary files a/screenshots/iPhone 8-badge___all_lm.png and b/screenshots/iPhone 8-badge___all_lm.png differ diff --git a/screenshots/iPhone 8-button___primaryOnDark_dm.png b/screenshots/iPhone 8-button___primaryOnDark_dm.png index 6287f8fc1..af97aab8a 100644 Binary files a/screenshots/iPhone 8-button___primaryOnDark_dm.png and b/screenshots/iPhone 8-button___primaryOnDark_dm.png differ diff --git a/screenshots/iPhone 8-button___primaryOnDark_lm.png b/screenshots/iPhone 8-button___primaryOnDark_lm.png index fe4b66ded..6a9cafa90 100644 Binary files a/screenshots/iPhone 8-button___primaryOnDark_lm.png and b/screenshots/iPhone 8-button___primaryOnDark_lm.png differ diff --git a/screenshots/iPhone 8-button___primaryOnLight_lm.png b/screenshots/iPhone 8-button___primaryOnLight_lm.png index ef593bf56..3676b8e0b 100644 Binary files a/screenshots/iPhone 8-button___primaryOnLight_lm.png and b/screenshots/iPhone 8-button___primaryOnLight_lm.png differ diff --git a/screenshots/iPhone 8-button___secondaryOnDark_lm.png b/screenshots/iPhone 8-button___secondaryOnDark_lm.png index 0b984ef06..71a833913 100644 Binary files a/screenshots/iPhone 8-button___secondaryOnDark_lm.png and b/screenshots/iPhone 8-button___secondaryOnDark_lm.png differ diff --git a/screenshots/iPhone 8-calendar___custom-style_dm.png b/screenshots/iPhone 8-calendar___custom-style_dm.png index 46833caf1..b682cd1f5 100644 Binary files a/screenshots/iPhone 8-calendar___custom-style_dm.png and b/screenshots/iPhone 8-calendar___custom-style_dm.png differ diff --git a/screenshots/iPhone 8-calendar___custom-style_lm.png b/screenshots/iPhone 8-calendar___custom-style_lm.png index 8da0a22bd..1ff815b9e 100644 Binary files a/screenshots/iPhone 8-calendar___custom-style_lm.png and b/screenshots/iPhone 8-calendar___custom-style_lm.png differ diff --git a/screenshots/iPhone 8-calendar___with-prices_dm.png b/screenshots/iPhone 8-calendar___with-prices_dm.png index 9f738eb09..cf0f79737 100644 Binary files a/screenshots/iPhone 8-calendar___with-prices_dm.png and b/screenshots/iPhone 8-calendar___with-prices_dm.png differ diff --git a/screenshots/iPhone 8-calendar___with-prices_lm.png b/screenshots/iPhone 8-calendar___with-prices_lm.png index 607a319ab..32fc966ad 100644 Binary files a/screenshots/iPhone 8-calendar___with-prices_lm.png and b/screenshots/iPhone 8-calendar___with-prices_lm.png differ diff --git a/screenshots/iPhone 8-dialog___delete-confirmation_dm.png b/screenshots/iPhone 8-dialog___delete-confirmation_dm.png index 0ecf8c9c7..31bf2d108 100644 Binary files a/screenshots/iPhone 8-dialog___delete-confirmation_dm.png and b/screenshots/iPhone 8-dialog___delete-confirmation_dm.png differ diff --git a/screenshots/iPhone 8-dialog___delete-confirmation_lm.png b/screenshots/iPhone 8-dialog___delete-confirmation_lm.png index 5800fcb4e..e6b415537 100644 Binary files a/screenshots/iPhone 8-dialog___delete-confirmation_lm.png and b/screenshots/iPhone 8-dialog___delete-confirmation_lm.png differ diff --git a/screenshots/iPhone 8-dialog___in-app-messaging_dm.png b/screenshots/iPhone 8-dialog___in-app-messaging_dm.png index b76e200c5..4e76d84a3 100644 Binary files a/screenshots/iPhone 8-dialog___in-app-messaging_dm.png and b/screenshots/iPhone 8-dialog___in-app-messaging_dm.png differ diff --git a/screenshots/iPhone 8-dialog___in-app-messaging_lm.png b/screenshots/iPhone 8-dialog___in-app-messaging_lm.png index 99af3e57d..51f08dfb6 100644 Binary files a/screenshots/iPhone 8-dialog___in-app-messaging_lm.png and b/screenshots/iPhone 8-dialog___in-app-messaging_lm.png differ diff --git a/screenshots/iPhone 8-dialog___no-icon_dm.png b/screenshots/iPhone 8-dialog___no-icon_dm.png index 4caf004d5..55cb222ef 100644 Binary files a/screenshots/iPhone 8-dialog___no-icon_dm.png and b/screenshots/iPhone 8-dialog___no-icon_dm.png differ diff --git a/screenshots/iPhone 8-dialog___no-icon_lm.png b/screenshots/iPhone 8-dialog___no-icon_lm.png index 488d0a75e..72db40894 100644 Binary files a/screenshots/iPhone 8-dialog___no-icon_lm.png and b/screenshots/iPhone 8-dialog___no-icon_lm.png differ diff --git a/screenshots/iPhone 8-dialog___no-title-no-icon_dm.png b/screenshots/iPhone 8-dialog___no-title-no-icon_dm.png index 638ca8911..35c30d9c1 100644 Binary files a/screenshots/iPhone 8-dialog___no-title-no-icon_dm.png and b/screenshots/iPhone 8-dialog___no-title-no-icon_dm.png differ diff --git a/screenshots/iPhone 8-dialog___no-title-no-icon_lm.png b/screenshots/iPhone 8-dialog___no-title-no-icon_lm.png index cd4cf90d4..42f25c7fe 100644 Binary files a/screenshots/iPhone 8-dialog___no-title-no-icon_lm.png and b/screenshots/iPhone 8-dialog___no-title-no-icon_lm.png differ diff --git a/screenshots/iPhone 8-dialog___no-title_dm.png b/screenshots/iPhone 8-dialog___no-title_dm.png index 44753795a..3b316f156 100644 Binary files a/screenshots/iPhone 8-dialog___no-title_dm.png and b/screenshots/iPhone 8-dialog___no-title_dm.png differ diff --git a/screenshots/iPhone 8-dialog___no-title_lm.png b/screenshots/iPhone 8-dialog___no-title_lm.png index 581a24412..b573f4f57 100644 Binary files a/screenshots/iPhone 8-dialog___no-title_lm.png and b/screenshots/iPhone 8-dialog___no-title_lm.png differ diff --git a/screenshots/iPhone 8-dialog___success_dm.png b/screenshots/iPhone 8-dialog___success_dm.png index 64d0b4e6b..309d26c6e 100644 Binary files a/screenshots/iPhone 8-dialog___success_dm.png and b/screenshots/iPhone 8-dialog___success_dm.png differ diff --git a/screenshots/iPhone 8-dialog___success_lm.png b/screenshots/iPhone 8-dialog___success_lm.png index 86356d714..868b8544e 100644 Binary files a/screenshots/iPhone 8-dialog___success_lm.png and b/screenshots/iPhone 8-dialog___success_lm.png differ diff --git a/screenshots/iPhone 8-dialog___warning_dm.png b/screenshots/iPhone 8-dialog___warning_dm.png index 58c09e34a..51f1871ca 100644 Binary files a/screenshots/iPhone 8-dialog___warning_dm.png and b/screenshots/iPhone 8-dialog___warning_dm.png differ diff --git a/screenshots/iPhone 8-dialog___warning_lm.png b/screenshots/iPhone 8-dialog___warning_lm.png index 4a9686f85..db2cd86f2 100644 Binary files a/screenshots/iPhone 8-dialog___warning_lm.png and b/screenshots/iPhone 8-dialog___warning_lm.png differ diff --git a/screenshots/iPhone 8-dialog___with-cta_dm.png b/screenshots/iPhone 8-dialog___with-cta_dm.png index 4d4cf28ca..b6d2b153d 100644 Binary files a/screenshots/iPhone 8-dialog___with-cta_dm.png and b/screenshots/iPhone 8-dialog___with-cta_dm.png differ diff --git a/screenshots/iPhone 8-dialog___with-cta_lm.png b/screenshots/iPhone 8-dialog___with-cta_lm.png index d43d52931..4f7b969d9 100644 Binary files a/screenshots/iPhone 8-dialog___with-cta_lm.png and b/screenshots/iPhone 8-dialog___with-cta_lm.png differ diff --git a/screenshots/iPhone 8-map___default_dm.png b/screenshots/iPhone 8-map___default_dm.png index 92d6731db..29f6995ed 100644 Binary files a/screenshots/iPhone 8-map___default_dm.png and b/screenshots/iPhone 8-map___default_dm.png differ diff --git a/screenshots/iPhone 8-map___default_lm.png b/screenshots/iPhone 8-map___default_lm.png index 288ce8462..9141008ed 100644 Binary files a/screenshots/iPhone 8-map___default_lm.png and b/screenshots/iPhone 8-map___default_lm.png differ diff --git a/screenshots/iPhone 8-skeleton___all_lm.png b/screenshots/iPhone 8-skeleton___all_lm.png index 80a06ddda..31637f496 100644 Binary files a/screenshots/iPhone 8-skeleton___all_lm.png and b/screenshots/iPhone 8-skeleton___all_lm.png differ diff --git a/screenshots/iPhone 8-star-rating___docs_dm.png b/screenshots/iPhone 8-star-rating___docs_dm.png index 30a700ede..83399a94c 100644 Binary files a/screenshots/iPhone 8-star-rating___docs_dm.png and b/screenshots/iPhone 8-star-rating___docs_dm.png differ diff --git a/screenshots/iPhone 8-star-rating___docs_lm.png b/screenshots/iPhone 8-star-rating___docs_lm.png index c197396a6..8186f1bab 100644 Binary files a/screenshots/iPhone 8-star-rating___docs_lm.png and b/screenshots/iPhone 8-star-rating___docs_lm.png differ diff --git a/screenshots/iPhone 8-swiftui_badge___default_dm.png b/screenshots/iPhone 8-swiftui_badge___default_dm.png index ac194a109..74a0fa9d2 100644 Binary files a/screenshots/iPhone 8-swiftui_badge___default_dm.png and b/screenshots/iPhone 8-swiftui_badge___default_dm.png differ diff --git a/screenshots/iPhone 8-swiftui_badge___default_lm.png b/screenshots/iPhone 8-swiftui_badge___default_lm.png index 6d5e0e064..200a876df 100644 Binary files a/screenshots/iPhone 8-swiftui_badge___default_lm.png and b/screenshots/iPhone 8-swiftui_badge___default_lm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___destructive_dm.png b/screenshots/iPhone 8-swiftui_button___destructive_dm.png index 8c681dee2..1d25e42d9 100644 Binary files a/screenshots/iPhone 8-swiftui_button___destructive_dm.png and b/screenshots/iPhone 8-swiftui_button___destructive_dm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___featured_dm.png b/screenshots/iPhone 8-swiftui_button___featured_dm.png index 228d4ae66..aeb08229e 100644 Binary files a/screenshots/iPhone 8-swiftui_button___featured_dm.png and b/screenshots/iPhone 8-swiftui_button___featured_dm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___link_dm.png b/screenshots/iPhone 8-swiftui_button___link_dm.png index e26ca77ad..1dcf1c818 100644 Binary files a/screenshots/iPhone 8-swiftui_button___link_dm.png and b/screenshots/iPhone 8-swiftui_button___link_dm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___primaryOnDark_dm.png b/screenshots/iPhone 8-swiftui_button___primaryOnDark_dm.png index 8fe117816..8508f5f94 100644 Binary files a/screenshots/iPhone 8-swiftui_button___primaryOnDark_dm.png and b/screenshots/iPhone 8-swiftui_button___primaryOnDark_dm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___primaryOnDark_lm.png b/screenshots/iPhone 8-swiftui_button___primaryOnDark_lm.png index 54c1ee4be..51e0d8282 100644 Binary files a/screenshots/iPhone 8-swiftui_button___primaryOnDark_lm.png and b/screenshots/iPhone 8-swiftui_button___primaryOnDark_lm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___primaryOnLight_dm.png b/screenshots/iPhone 8-swiftui_button___primaryOnLight_dm.png index d847ea53c..56af7ced6 100644 Binary files a/screenshots/iPhone 8-swiftui_button___primaryOnLight_dm.png and b/screenshots/iPhone 8-swiftui_button___primaryOnLight_dm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___primaryOnLight_lm.png b/screenshots/iPhone 8-swiftui_button___primaryOnLight_lm.png index 38e514790..224c4b8d4 100644 Binary files a/screenshots/iPhone 8-swiftui_button___primaryOnLight_lm.png and b/screenshots/iPhone 8-swiftui_button___primaryOnLight_lm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___primary_dm.png b/screenshots/iPhone 8-swiftui_button___primary_dm.png index d9463943f..c0bbf34a4 100644 Binary files a/screenshots/iPhone 8-swiftui_button___primary_dm.png and b/screenshots/iPhone 8-swiftui_button___primary_dm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___primary_lm.png b/screenshots/iPhone 8-swiftui_button___primary_lm.png index 3d3d65c7b..45975600e 100644 Binary files a/screenshots/iPhone 8-swiftui_button___primary_lm.png and b/screenshots/iPhone 8-swiftui_button___primary_lm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___secondary_dm.png b/screenshots/iPhone 8-swiftui_button___secondary_dm.png index 44c48f49c..dfd73b8e2 100644 Binary files a/screenshots/iPhone 8-swiftui_button___secondary_dm.png and b/screenshots/iPhone 8-swiftui_button___secondary_dm.png differ diff --git a/screenshots/iPhone 8-swiftui_button___secondary_lm.png b/screenshots/iPhone 8-swiftui_button___secondary_lm.png index c7b074eba..59027b672 100644 Binary files a/screenshots/iPhone 8-swiftui_button___secondary_lm.png and b/screenshots/iPhone 8-swiftui_button___secondary_lm.png differ diff --git a/screenshots/iPhone 8-swiftui_switch___default_dm.png b/screenshots/iPhone 8-swiftui_switch___default_dm.png index 8e6097b90..ae89f2d82 100644 Binary files a/screenshots/iPhone 8-swiftui_switch___default_dm.png and b/screenshots/iPhone 8-swiftui_switch___default_dm.png differ diff --git a/screenshots/iPhone 8-swiftui_switch___default_lm.png b/screenshots/iPhone 8-swiftui_switch___default_lm.png index 9f0bab197..2e6348156 100644 Binary files a/screenshots/iPhone 8-swiftui_switch___default_lm.png and b/screenshots/iPhone 8-swiftui_switch___default_lm.png differ diff --git a/screenshots/iPhone 8-switch___default_dm.png b/screenshots/iPhone 8-switch___default_dm.png index 9abc280f3..583dd8638 100644 Binary files a/screenshots/iPhone 8-switch___default_dm.png and b/screenshots/iPhone 8-switch___default_dm.png differ diff --git a/screenshots/iPhone 8-switch___default_lm.png b/screenshots/iPhone 8-switch___default_lm.png index de2154818..6da9495a0 100644 Binary files a/screenshots/iPhone 8-switch___default_lm.png and b/screenshots/iPhone 8-switch___default_lm.png differ diff --git a/screenshots/iPhone 8-toast___default_dm.png b/screenshots/iPhone 8-toast___default_dm.png index c5b2d8e03..f0311e981 100644 Binary files a/screenshots/iPhone 8-toast___default_dm.png and b/screenshots/iPhone 8-toast___default_dm.png differ diff --git a/screenshots/iPhone 8-toast___default_lm.png b/screenshots/iPhone 8-toast___default_lm.png index 0b5c9ffcb..c3a0059ec 100644 Binary files a/screenshots/iPhone 8-toast___default_lm.png and b/screenshots/iPhone 8-toast___default_lm.png differ