Move FluentTheme code to new FluentUI_common module

MicrosoftFluentUI.podspec

@@ -1,4 +1,5 @@
 # Constants
+common_root = 'Sources/FluentUI_common'
 ios_root = 'Sources/FluentUI_iOS'
 macos_root = 'Sources/FluentUI_macOS'
 
@@ -13,14 +14,22 @@ Pod::Spec.new do |s|
   s.homepage         = "https://www.microsoft.com/design/fluent/#/"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { "Microsoft" => "[email protected]"}
-  s.source       = { :git => "https://github.com/microsoft/fluentui-apple.git", :tag => "#{s.version}" }
-  s.swift_version = "5.9"
-  s.module_name = 'FluentUI'
+  s.source           = { :git => "https://github.com/microsoft/fluentui-apple.git", :tag => "#{s.version}" }
+  s.swift_version    = "5.9"
+  s.module_name      = 'FluentUI'
 
+  s.ios.deployment_target = "16.0"
+  s.osx.deployment_target = "12.0"
 
-# iOS
 
-  s.ios.deployment_target = "16.0"
+# Common
+
+  s.subspec 'Core_common' do |core_common|
+    core_common.source_files = ["#{common_root}/#{core_dir}/**/*.{swift,h}"]
+  end
+
+
+# iOS
 
   s.subspec 'Avatar_ios' do |avatar_ios|
     avatar_ios.platform = :ios
@@ -111,6 +120,7 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core_ios' do |core_ios|
     core_ios.platform = :ios
+    core_ios.dependency "#{s.name}/Core_common"
     core_ios.resource_bundle = { 'FluentUIResources-ios' => ["#{ios_root}/#{resources_dir}/**/*.{storyboard,xib,xcassets,strings,stringsdict}"] }
     core_ios.script_phase = { :name => 'Optimize resource bundle',
                               :script => 'REMOVE_UNUSED_RESOURCES_SCRIPT_PATH=${PODS_TARGET_SRCROOT}/scripts/removeUnusedResourcesFromAssets.swift
@@ -354,24 +364,15 @@ fi', :execution_position => :before_compile }
 
 # Mac
 
-  s.osx.deployment_target = "12"
-
-  s.subspec 'Appearance_mac' do |appearance_mac|
-    appearance_mac.platform = :osx
-    appearance_mac.source_files = ["#{macos_root}/#{components_dir}/Appearance/**/*.{swift,h}"]
-  end
-
   s.subspec 'AvatarView_mac' do |avatarview_mac|
     avatarview_mac.platform = :osx
     avatarview_mac.dependency "#{s.name}/Core_mac"
-    avatarview_mac.dependency "#{s.name}/DynamicColor_mac"
     avatarview_mac.source_files = ["#{macos_root}/#{components_dir}/AvatarView/**/*.{swift,h}"]
   end
 
   s.subspec 'BadgeView_mac' do |badgeview_mac|
     badgeview_mac.platform = :osx
     badgeview_mac.dependency "#{s.name}/Core_mac"
-    badgeview_mac.dependency "#{s.name}/DynamicColor_mac"
     badgeview_mac.source_files = ["#{macos_root}/#{components_dir}/Badge/**/*.{swift,h}"]
   end
 
@@ -383,23 +384,17 @@ fi', :execution_position => :before_compile }
 
   s.subspec 'Core_mac' do |core_mac|
     core_mac.platform = :osx
+    core_mac.dependency "#{s.name}/Core_common"
     core_mac.resource_bundle = { 'FluentUIResources-macos' => ["#{macos_root}/#{resources_dir}/**/*.{storyboard,xib,xcassets,strings,stringsdict}"] }
     core_mac.source_files = ["#{macos_root}/#{core_dir}/**/*.{swift,h}"]
   end
 
   s.subspec 'DatePicker_mac' do |datepicker_mac|
     datepicker_mac.platform = :osx
     datepicker_mac.dependency "#{s.name}/Core_mac"
-    datepicker_mac.dependency "#{s.name}/Appearance_mac"
     datepicker_mac.source_files = ["#{macos_root}/#{components_dir}/DatePicker/**/*.{swift,h}"]
   end
 
-  s.subspec 'DynamicColor_mac' do |dynamiccolor_mac|
-    dynamiccolor_mac.platform = :osx
-    dynamiccolor_mac.dependency "#{s.name}/Appearance_mac"
-    dynamiccolor_mac.source_files = ["#{macos_root}/#{components_dir}/DynamicColor/**/*.{swift,h}"]
-  end
-
   s.subspec 'Link_mac' do |link_mac|
     link_mac.platform = :osx
     link_mac.dependency "#{s.name}/Core_mac"

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,11 @@
 //  Licensed under the MIT License.
 //
 
-#if os(iOS) || os(visionOS)
+#if !COCOAPODS
+@_exported import FluentUI_common
+#endif
+
+#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,9 @@
 //  Licensed under the MIT License.
 //
 
+#if !COCOAPODS
+import FluentUI_common
+#endif
 import SwiftUI
 import UIKit
 

Sources/FluentUI_iOS/Components/ActivityIndicator/ActivityIndicatorModifiers.swift

@@ -3,6 +3,9 @@
 //  Licensed under the MIT License.
 //
 
+#if !COCOAPODS
+import FluentUI_common
+#endif
 import SwiftUI
 import UIKit
 

Sources/FluentUI_iOS/Components/ActivityIndicator/ActivityIndicatorTokenSet.swift

@@ -3,6 +3,9 @@
 //  Licensed under the MIT License.
 //
 
+#if !COCOAPODS
+import FluentUI_common
+#endif
 import SwiftUI
 import UIKit
 

Sources/FluentUI_iOS/Components/ActivityIndicator/MSFActivityIndicator.swift

@@ -3,6 +3,9 @@
 //  Licensed under the MIT License.
 //
 
+#if !COCOAPODS
+import FluentUI_common
+#endif
 import SwiftUI
 import UIKit
 

Sources/FluentUI_iOS/Components/Avatar/Avatar.swift

@@ -3,8 +3,11 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+#if !COCOAPODS
+import FluentUI_common
+#endif
 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,11 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+#if !COCOAPODS
+import FluentUI_common
+#endif
 import SwiftUI
+import UIKit
 
 public extension Avatar {
 

Sources/FluentUI_iOS/Components/Avatar/AvatarTokenSet.swift

@@ -3,8 +3,11 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+#if !COCOAPODS
+import FluentUI_common
+#endif
 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,11 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+#if !COCOAPODS
+import FluentUI_common
+#endif
 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,11 @@
 //  Licensed under the MIT License.
 //
 
-import UIKit
+#if !COCOAPODS
+import FluentUI_common
+#endif
 import SwiftUI
+import UIKit
 
 @objc public enum MSFAvatarPresence: Int, CaseIterable {
     case none

Sources/FluentUI_iOS/Components/Avatar/Persona.swift

@@ -3,6 +3,9 @@
 //  Licensed under the MIT License.
 //
 
+#if !COCOAPODS
+import FluentUI_common
+#endif
 import UIKit
 
 // MARK: Persona