Skip to content

[macOS] Adding theme tokens #2168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanielMorM merged 13 commits into from
Jun 5, 2025
Merged

[macOS] Adding theme tokens #2168

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
364eaaf
Adding tokens for macOS
DanielMorM May 29, 2025
184a6b8
Revert change for platformColorValue
DanielMorM May 29, 2025
f0b7fe5
Fixing build
DanielMorM May 29, 2025
90ddc4f
Addressing comments
DanielMorM May 29, 2025
54e79e5
Moving ColorTokens out of common
DanielMorM May 30, 2025
d9fe770
Sync PRs
DanielMorM Jun 2, 2025
12602f7
Use @Available
DanielMorM Jun 2, 2025
b218848
Merge remote-tracking branch 'origin/main' into user/damoral/addin-ma…
DanielMorM Jun 2, 2025
9fb57cc
Addressing comments
DanielMorM Jun 2, 2025
7d1d1ad
Remove extra line
DanielMorM Jun 2, 2025
b69414c
Merge remote-tracking branch 'origin/main' into user/damoral/addin-ma…
DanielMorM Jun 4, 2025
595c9a0
Addressing comments
DanielMorM Jun 4, 2025
4a926b2
Merge branch 'main' into user/damoral/addin-macos-tokens
DanielMorM Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Sources/FluentUI_common/Core/Theme/FluentTheme+Tokens.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public extension FluentTheme {
case background3Pressed
case background3Selected
case background4
case background4Hover
case background4Pressed
case background4Selected
case background5
Expand All @@ -44,6 +45,7 @@ public extension FluentTheme {
case foreground1
case foreground2
case foreground3
case foreground4
case foregroundDisabled1
case foregroundDisabled2
case foregroundOnColor
Expand Down Expand Up @@ -194,7 +196,7 @@ extension FluentTheme {
case .foreground2:
color = .init(light: GlobalTokens.neutralSwiftUIColor(.grey38),
dark: GlobalTokens.neutralSwiftUIColor(.grey84))
case .foreground3:
case .foreground3, .foreground4:
Comment thread
DanielMorM marked this conversation as resolved.
Outdated
color = .init(light: GlobalTokens.neutralSwiftUIColor(.grey50),
dark: GlobalTokens.neutralSwiftUIColor(.grey68))
case .foregroundDisabled1:
Expand Down Expand Up @@ -280,7 +282,7 @@ extension FluentTheme {
color = .init(light: GlobalTokens.neutralSwiftUIColor(.grey92),
dark: GlobalTokens.neutralSwiftUIColor(.grey30),
darkElevated: GlobalTokens.neutralSwiftUIColor(.grey30))
case .background4:
case .background4, .background4Hover:
color = .init(light: GlobalTokens.neutralSwiftUIColor(.grey98),
dark: GlobalTokens.neutralSwiftUIColor(.grey20),
darkElevated: GlobalTokens.neutralSwiftUIColor(.grey24))
Expand Down
23 changes: 20 additions & 3 deletions Sources/FluentUI_macOS/Theme/FluentTheme+AppKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public extension FluentTheme {
///
/// - Parameter token: The `TypographyTokens` value to be retrieved.
/// - Parameter adjustsForContentSizeCategory: If true, the resulting font will change size according to Dynamic Type specifications.
/// - Parameter contentSizeCategory: An overridden `UIContentSizeCategory` to conform to.
/// - Returns: A `UIFont` for the given token.
@objc(typographyForToken:adjustsForContentSizeCategory:)
func typography(_ token: TypographyToken,
Expand All @@ -27,7 +26,25 @@ public extension FluentTheme {

extension FluentTheme: PlatformThemeProviding {
public static func platformColorValue(_ token: ColorToken, defaultColor: DynamicColor) -> DynamicColor? {
// Overrides to follow
return nil
let overrideColor: DynamicColor?
switch token {
case .background2:
overrideColor = .init(light: GlobalTokens.neutralSwiftUIColor(.white), dark: GlobalTokens.neutralSwiftUIColor(.grey16))
Comment thread
DanielMorM marked this conversation as resolved.
Outdated
case .background4:
overrideColor = .init(light: GlobalTokens.neutralSwiftUIColor(.grey96), dark: GlobalTokens.neutralSwiftUIColor(.grey8))
case .background4Hover:
overrideColor = .init(light: GlobalTokens.neutralSwiftUIColor(.grey92), dark: GlobalTokens.neutralSwiftUIColor(.grey12))
case .background6:
overrideColor = .init(light: GlobalTokens.neutralSwiftUIColor(.grey88), dark: GlobalTokens.neutralSwiftUIColor(.black))
case .brandStroke1:
overrideColor = .init(light: GlobalTokens.neutralSwiftUIColor(.white), dark: GlobalTokens.neutralSwiftUIColor(.grey16))
Comment thread
DanielMorM marked this conversation as resolved.
Outdated
case .foreground4:
overrideColor = .init(light: GlobalTokens.neutralSwiftUIColor(.grey44), dark: GlobalTokens.neutralSwiftUIColor(.grey60))
case .strokeAccessible:
overrideColor = .init(light: GlobalTokens.neutralSwiftUIColor(.grey38), dark: GlobalTokens.neutralSwiftUIColor(.grey68))
default:
overrideColor = nil
}
return overrideColor
}
}
Loading