Move FluentTheme code to new FluentUI_common module

Package.swift

@@ -16,14 +16,24 @@ let targets: [Target] = [
     ),
     .target(
         name: "FluentUI_ios",
+        dependencies: [
+            .target(name: "FluentUI_common")
+        ],
         path: "Sources/FluentUI_iOS",
         resources: [
             .copy("Resources/Version.plist")
         ]
     ),
     .target(
         name: "FluentUI_macos",
+        dependencies: [
+            .target(name: "FluentUI_common")
+        ],
         path: "Sources/FluentUI_macOS"
+    ),
+    .target(
+        name: "FluentUI_common",
+        path: "Sources/FluentUI_common"
     )
 ]
 

Sources/FluentUI/FluentUI.swift

@@ -3,7 +3,8 @@
 //  Licensed under the MIT License.
 //
 
-#if os(iOS) || os(visionOS)
+@_exported import FluentUI_common
+#if os(iOS) || os(visionOS) || targetEnvironment(macCatalyst)
 @_exported import FluentUI_ios
 #elseif os(macOS)
 @_exported import FluentUI_macos

Sources/FluentUI_iOS/Core/Extensions/Color+Extensions.swift → Sources/FluentUI_common/Core/Extensions/Color+Extensions.swift

@@ -40,15 +40,19 @@ extension Color {
     ///
     /// - Parameter dynamicColor: A dynmic color structure that describes the `Color` to be created.
     init(dynamicColor: DynamicColor) {
-        if #available(iOS 17, *) {
+        if #available(iOS 17, macOS 14, *) {
             self.init(dynamicColor)
         } else {
+#if os(macOS)
+            self.init(nsColor: NSColor(dynamicColor: dynamicColor))
+#else
             self.init(uiColor: UIColor(dynamicColor: dynamicColor))
+#endif // os(macOS)
         }
     }
 
     var dynamicColor: DynamicColor {
-        if #available(iOS 17, *) {
+        if #available(iOS 17, macOS 14, *) {
             var lightEnvironment = EnvironmentValues.init()
             lightEnvironment.colorScheme = .light
 
@@ -58,9 +62,15 @@ extension Color {
             return DynamicColor(light: Color(self.resolve(in: lightEnvironment)),
                                 dark: Color(self.resolve(in: darkEnvironment)))
         } else {
+#if os(macOS)
+            let nsColor = NSColor(self)
+            return DynamicColor(light: Color(nsColor.light),
+                                dark: Color(nsColor.dark))
+#else
             let uiColor = UIColor(self)
             return DynamicColor(light: Color(uiColor.light),
                                 dark: Color(uiColor.dark))
+#endif // os(macOS)
         }
     }
 }

Sources/FluentUI_macOS/Core/Extensions/NSColor+Extensions.swift → Sources/FluentUI_common/Core/Extensions/NSColor+Extensions.swift

@@ -5,7 +5,6 @@
 
 #if canImport(AppKit)
 import AppKit
-import SwiftUI
 
 extension NSColor {
 
@@ -51,6 +50,14 @@ extension NSColor {
         return resolvedColorValue(appearance: NSAppearance(named: .darkAqua))
     }
 
+    convenience init(dynamicColor: DynamicColor) {
+        // Simple closure to return a nil NSColor if the passed-in Color is
+        // also nil, since the argument to `NSColor.init(_:)` is not optional.
+        let colorResolver = { $0 != nil ? NSColor($0!) : nil }
+        self.init(light: NSColor(dynamicColor.light),
+                  dark: colorResolver(dynamicColor.dark))
+    }
+
     /// Returns the version of the current color that results from the specified traits as an `NSColor`.
     ///
     /// - Parameter appearance: The user interface appearance to use when resolving the color information.

Sources/FluentUI_iOS/Core/Extensions/UIColor+Extensions.swift → Sources/FluentUI_common/Core/Extensions/UIColor+Extensions.swift

@@ -3,8 +3,8 @@
 //  Licensed under the MIT License.
 //
 
+#if canImport(UIKit)
 import UIKit
-import SwiftUI
 
 extension UIColor {
 
@@ -139,6 +139,8 @@ extension UIColor {
     }
 
     convenience init(dynamicColor: DynamicColor) {
+        // Simple closure to return a nil UIColor if the passed-in Color is
+        // also nil, since the argument to `UIColor.init(_:)` is not optional.
         let colorResolver = { $0 != nil ? UIColor($0!) : nil }
         self.init(light: UIColor(dynamicColor.light),
                   dark: colorResolver(dynamicColor.dark),
@@ -172,3 +174,4 @@ extension UIColor {
         return resolvedColor
     }
 }
+#endif // canImport(UIKit)

Sources/FluentUI_iOS/Core/Theme/Tokens/ControlTokenSet.swift → Sources/FluentUI_common/Core/Theme/Tokens/ControlTokenSet.swift

@@ -316,7 +316,7 @@ public enum ControlTokenValue {
         // Use our global "Hot Pink" in debug builds, to help identify unintentional conversions.
         return UIColor(GlobalTokens.sharedSwiftUIColor(.hotPink, .primary))
 #else
-        return GlobalTokens.neutralColor(.black)
+        return UIColor(GlobalTokens.neutralSwiftUIColor(.black))
 #endif
     }
 #endif // os(iOS) || os(visionOS)

Sources/FluentUI_iOS/Core/Theme/Tokens/DynamicColor.swift → Sources/FluentUI_common/Core/Theme/Tokens/DynamicColor.swift

@@ -6,30 +6,31 @@
 import SwiftUI
 
 /// A container that stores a dynamic set of `Color` values.
-struct DynamicColor: Hashable {
+@objc(MSFDynamicColor)
+public final class DynamicColor: NSObject {
 
     /// Creates a custom `ShapeStyle` that stores a dynamic set of `Color` values.
     ///
     /// - Parameter light: The default `Color` for a light context. Required.
     /// - Parameter dark: The override `Color` for a dark context. Optional.
     /// - Parameter darkElevated: The override `Color` for a dark elevated context. Optional.
-    init(light: Color,
-         dark: Color? = nil,
-         darkElevated: Color? = nil) {
+    public init(light: Color,
+                dark: Color? = nil,
+                darkElevated: Color? = nil) {
         self.light = light
         self.dark = dark
         self.darkElevated = darkElevated
     }
 
-    let light: Color
-    let dark: Color?
-    let darkElevated: Color?
+    public let light: Color
+    public let dark: Color?
+    public let darkElevated: Color?
 }
 
 @available(iOS 17, macOS 14, *)
 extension DynamicColor: ShapeStyle {
     /// Evaluate to a resolved `Color` (in the form of a `ShapeStyle`) given the current `environment`.
-    func resolve(in environment: EnvironmentValues) -> Color.Resolved {
+    public func resolve(in environment: EnvironmentValues) -> Color.Resolved {
         if environment.colorScheme == .dark {
             if environment.isPresented, let darkElevated = darkElevated {
                 return darkElevated.resolve(in: environment)

Sources/FluentUI_iOS/Core/Theme/Tokens/LinearGradientInfo.swift → Sources/FluentUI_common/Core/Theme/Tokens/LinearGradientInfo.swift

@@ -43,8 +43,8 @@ public class LinearGradientInfo: NSObject {
 // MARK: - Extensions
 
 extension LinearGradient {
-    /// Internal property to generate a SwiftUI `LinearGradient` from a gradient info.
-    init(gradientInfo: LinearGradientInfo) {
+    /// Generate a SwiftUI `LinearGradient` from a gradient info.
+    public init(gradientInfo: LinearGradientInfo) {
         if let locations = gradientInfo.locations {
             // Map the colors and locations together.
             let stops: [Gradient.Stop] = zip(gradientInfo.colors, locations).map({ (color, location) in

Sources/FluentUI_iOS/Core/Utilities/AnimationSynchronizer.swift → Sources/FluentUI_common/Core/Utilities/AnimationSynchronizer.swift

@@ -3,7 +3,7 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+import QuartzCore
 
 /// An animation synchronizer syncs homogeneous layer animations by calculating the appropriate timeOffset
 /// of a referenceLayer so that newly added animations can stay in sync with existing animations.

Sources/FluentUI_iOS/Components/ActivityIndicator/ActivityIndicator.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import SwiftUI
 import UIKit
 

Sources/FluentUI_iOS/Components/ActivityIndicator/ActivityIndicatorModifiers.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import SwiftUI
 import UIKit
 

Sources/FluentUI_iOS/Components/ActivityIndicator/ActivityIndicatorTokenSet.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import SwiftUI
 import UIKit
 

Sources/FluentUI_iOS/Components/ActivityIndicator/MSFActivityIndicator.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import SwiftUI
 import UIKit
 

Sources/FluentUI_iOS/Components/Avatar/Avatar.swift

@@ -3,8 +3,9 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+import FluentUI_common
 import SwiftUI
+import UIKit
 
 /// Properties that can be used to customize the appearance of the Avatar.
 @objc public protocol MSFAvatarState {

Sources/FluentUI_iOS/Components/Avatar/AvatarModifiers.swift

@@ -3,8 +3,9 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+import FluentUI_common
 import SwiftUI
+import UIKit
 
 public extension Avatar {
 

Sources/FluentUI_iOS/Components/Avatar/AvatarTokenSet.swift

@@ -3,8 +3,9 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+import FluentUI_common
 import SwiftUI
+import UIKit
 
 public enum AvatarToken: Int, TokenSetKey {
     /// The radius of the corners of the `Avatar`.

Sources/FluentUI_iOS/Components/Avatar/MSFAvatar.swift

@@ -3,8 +3,9 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+import FluentUI_common
 import SwiftUI
+import UIKit
 
 /// UIKit wrapper that exposes the SwiftUI Avatar implementation.
 @objc open class MSFAvatar: ControlHostingView {

Sources/FluentUI_iOS/Components/Avatar/MSFAvatarPresence.swift

@@ -3,8 +3,9 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+import FluentUI_common
 import SwiftUI
+import UIKit
 
 @objc public enum MSFAvatarPresence: Int, CaseIterable {
     case none

Sources/FluentUI_iOS/Components/Avatar/Persona.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import UIKit
 
 // MARK: Persona

Sources/FluentUI_iOS/Components/AvatarGroup/AvatarGroup.swift

@@ -3,8 +3,9 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+import FluentUI_common
 import SwiftUI
+import UIKit
 
 /// Properties that can be used to customize the appearance of the AvatarGroup.
 @objc public protocol MSFAvatarGroupState {

Sources/FluentUI_iOS/Components/AvatarGroup/AvatarGroupModifiers.swift

@@ -3,8 +3,9 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+import FluentUI_common
 import SwiftUI
+import UIKit
 
 public extension AvatarGroup {
 }

Sources/FluentUI_iOS/Components/AvatarGroup/AvatarGroupTokenSet.swift

@@ -3,8 +3,9 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+import FluentUI_common
 import SwiftUI
+import UIKit
 
 public enum AvatarGroupToken: Int, TokenSetKey {
     /// Defines the color around the unread dot.

Sources/FluentUI_iOS/Components/AvatarGroup/MSFAvatarGroup.swift

@@ -3,8 +3,9 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+import FluentUI_common
 import SwiftUI
+import UIKit
 
 /// UIKit wrapper that exposes the SwiftUI AvatarGroup implementation.
 @objc open class MSFAvatarGroup: ControlHostingView {

Sources/FluentUI_iOS/Components/Badge Field/BadgeField.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import UIKit
 
 // MARK: BadgeFieldDelegate

Sources/FluentUI_iOS/Components/Badge Field/BadgeFieldTokenSet.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import UIKit
 
 public enum BadgeFieldToken: Int, TokenSetKey {

Sources/FluentUI_iOS/Components/Badge Field/BadgeStringExtractor.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import UIKit
 
 private struct BadgeStringData {

Sources/FluentUI_iOS/Components/Badge Field/BadgeView.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import UIKit
 
 // MARK: BadgeViewDataSource

Sources/FluentUI_iOS/Components/Badge Field/BadgeViewTokenSet.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import UIKit
 
 public enum BadgeViewToken: Int, TokenSetKey {

Sources/FluentUI_iOS/Components/BarButtonItems/BarButtonItems.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import UIKit
 
 public final class BarButtonItems: NSObject {

Sources/FluentUI_iOS/Components/Bottom Commanding/BottomCommandingController.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import UIKit
 
 @objc(MSFBottomCommandingControllerDelegate)

Sources/FluentUI_iOS/Components/Bottom Commanding/BottomCommandingTokenSet.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import SwiftUI
 
 public enum BottomCommandingToken: Int, TokenSetKey {

Sources/FluentUI_iOS/Components/Bottom Commanding/CommandingItem.swift

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License.
 //
 
+import FluentUI_common
 import UIKit
 
 /// An object representing a command.