Merge branch 'develop'

lukepistrol · Jul 5, 2023 · 49d35a5 · 49d35a5
2 parents d6fe0ff + 5f3675c
commit 49d35a5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/Demo App/Demo App/ContentView.swift b/Demo App/Demo App/ContentView.swift
@@ -27,16 +27,24 @@ struct ContentView: View {
         VStack {
             Label("Hello, World!", systemImage: Symbols.globe())
             Spacer()
-            LazyVGrid(columns: .init(repeating: GridItem(.fixed(50)), count: 5), content: {
-                ForEach(Symbols.allCases, id: \.self.rawValue) { symbol in
+            LazyVGrid(columns: columns) {
+                ForEach(Symbols.allCases) { symbol in
                     symbol.image
                         .imageScale(.medium)
                         .font(.largeTitle)
                 }
-            })
+            }
         }
         .padding()
     }
+
+    private var columns: [GridItem] {
+        .init(repeating: GridItem(.fixed(50)), count: 5)
+    }
+}
+
+extension Symbols: Identifiable {
+    var id: String { self.rawValue }
 }
 
 #Preview {

diff --git a/Sources/SFSymbolsMacroImpl/SFSymbolsMacro.swift b/Sources/SFSymbolsMacroImpl/SFSymbolsMacro.swift
@@ -96,9 +96,11 @@ public struct SFSymbolMacro: MemberMacro {
     }
 
     private static func assertUINSImage(for id: (SymbolPair)) throws {
-        if let _ = NSImage(systemSymbolName: id.id, accessibilityDescription: nil) {
-            return
-        }
+        #if canImport(UIKit)
+        if let _ = UIImage(systemName: id.id) { return }
+        #else
+        if let _ = NSImage(systemSymbolName: id.id, accessibilityDescription: nil) { return }
+        #endif
         throw DiagnosticsError(diagnostics: [
             .init(node: id.node, message: SFSymbolDiagnostic.noValidSFSymbol(symbol: id.0))
         ])