diff --git a/ComputerSolitaire/Views/Cards/CardView.swift b/ComputerSolitaire/Views/Cards/CardView.swift index 28173df..71afacc 100644 --- a/ComputerSolitaire/Views/Cards/CardView.swift +++ b/ComputerSolitaire/Views/Cards/CardView.swift @@ -17,7 +17,13 @@ enum CardStyle: String, CaseIterable, Identifiable { case simple case pixel - static let defaultValue: CardStyle = .simple + static var defaultValue: CardStyle { +#if os(macOS) + .classic +#else + .simple +#endif + } var id: String { rawValue } diff --git a/ComputerSolitaire/Views/Cards/Styles/SimpleCardViews.swift b/ComputerSolitaire/Views/Cards/Styles/SimpleCardViews.swift index 41858e2..57bb91e 100644 --- a/ComputerSolitaire/Views/Cards/Styles/SimpleCardViews.swift +++ b/ComputerSolitaire/Views/Cards/Styles/SimpleCardViews.swift @@ -60,12 +60,14 @@ struct SimpleCardFrontView: View { ZStack { SimpleCardBase(fill: SimplePalette.face, chrome: chrome) - HStack(alignment: .firstTextBaseline, spacing: 0) { + HStack(alignment: .top, spacing: 0) { Text(card.rank.label) - .font(.custom("Charter-Bold", size: cardSize.width * 0.27)) + .font(.system(size: cardSize.width * 0.35, weight: .semibold, design: .serif)) + .fontWidth(.condensed) Spacer(minLength: 0) Image(systemName: card.suit.symbolName) .font(.system(size: cardSize.width * 0.22, weight: .semibold)) + .offset(y: cardSize.width * 0.055) .accessibilityHidden(true) } .foregroundStyle(inkColor) diff --git a/ComputerSolitaireTests/Shared/CardStyleTests.swift b/ComputerSolitaireTests/Shared/CardStyleTests.swift index 0db5e05..00ca53b 100644 --- a/ComputerSolitaireTests/Shared/CardStyleTests.swift +++ b/ComputerSolitaireTests/Shared/CardStyleTests.swift @@ -3,9 +3,14 @@ import XCTest @MainActor final class CardStyleTests: XCTestCase { - func testDefaultStyleIsSimple() { + func testDefaultStyleMatchesPlatform() { +#if os(macOS) + XCTAssertEqual(CardStyle.defaultValue, .classic) + XCTAssertEqual(CardStyle.defaultValue.rawValue, "classic") +#else XCTAssertEqual(CardStyle.defaultValue, .simple) XCTAssertEqual(CardStyle.defaultValue.rawValue, "simple") +#endif } func testOnlyCurrentRawValuesResolveToStyles() {