diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index f32878b..5fd1c87 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -21,6 +21,8 @@ 70BA1FF827EEB53C000C2567 /* SFReadableSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 70BA1FF727EEB53C000C2567 /* SFReadableSymbols */; }; 70BA1FFB27EEB709000C2567 /* SFSafeSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 70BA1FFA27EEB709000C2567 /* SFSafeSymbols */; }; 70BA1FFF27EEB9B5000C2567 /* SFSafeSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 70BA1FFE27EEB9B5000C2567 /* SFSafeSymbols */; }; + 70F08DA228140DDD0053D8E5 /* SymbolsView_3_3.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70F08DA128140DDD0053D8E5 /* SymbolsView_3_3.swift */; }; + 70F08DA328140DDD0053D8E5 /* SymbolsView_3_3.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70F08DA128140DDD0053D8E5 /* SymbolsView_3_3.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -67,6 +69,7 @@ 70BA1FDA27EEB492000C2567 /* Tests_macOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests_macOS.swift; sourceTree = ""; }; 70BA1FDC27EEB492000C2567 /* Tests_macOSLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests_macOSLaunchTests.swift; sourceTree = ""; }; 70BA1FF327EEB4EE000C2567 /* SFReadableSymbols */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SFReadableSymbols; path = ..; sourceTree = ""; }; + 70F08DA128140DDD0053D8E5 /* SymbolsView_3_3.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolsView_3_3.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -121,6 +124,7 @@ 70BA1FB527EEB490000C2567 /* Shared */ = { isa = PBXGroup; children = ( + 70F08DA028140DC20053D8E5 /* Example */, 70BA1FB627EEB490000C2567 /* ExampleApp.swift */, 70BA1FB727EEB490000C2567 /* ContentView.swift */, 70BA1FB827EEB492000C2567 /* Assets.xcassets */, @@ -180,6 +184,14 @@ name = Frameworks; sourceTree = ""; }; + 70F08DA028140DC20053D8E5 /* Example */ = { + isa = PBXGroup; + children = ( + 70F08DA128140DDD0053D8E5 /* SymbolsView_3_3.swift */, + ); + path = Example; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -351,6 +363,7 @@ buildActionMask = 2147483647; files = ( 70BA1FE027EEB492000C2567 /* ContentView.swift in Sources */, + 70F08DA228140DDD0053D8E5 /* SymbolsView_3_3.swift in Sources */, 70BA1FDE27EEB492000C2567 /* ExampleApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -360,6 +373,7 @@ buildActionMask = 2147483647; files = ( 70BA1FE127EEB492000C2567 /* ContentView.swift in Sources */, + 70F08DA328140DDD0053D8E5 /* SymbolsView_3_3.swift in Sources */, 70BA1FDF27EEB492000C2567 /* ExampleApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -522,7 +536,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 15.4; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -552,7 +566,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 15.4; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7032bd1..bb6128c 100644 --- a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -8,6 +8,15 @@ "revision" : "c61de7a6e9eb1520d32316b06d5932accd974e70", "version" : "2.1.3" } + }, + { + "identity" : "swift-docc-plugin", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-docc-plugin", + "state" : { + "revision" : "3303b164430d9a7055ba484c8ead67a52f7b74f6", + "version" : "1.0.0" + } } ], "version" : 2 diff --git a/Example/Shared/ContentView.swift b/Example/Shared/ContentView.swift index d61cfd5..16ab0e6 100644 --- a/Example/Shared/ContentView.swift +++ b/Example/Shared/ContentView.swift @@ -11,42 +11,51 @@ import SFSafeSymbols struct ContentView: View { var body: some View { - List { - // - // SFReadableSymbols. - // - // - ✅ High readable. (WYSIWYG) - // - ✅ Copy and paste from SF Symbols app. (Cmd + C) - // - 🚫 Can't display symbols in GitHub or other editors. - // - Section("SFReadableSymbols") { - Label("Account", symbol: "􀉯") - Image(symbol: "􀫊") - } - - // - // Standard API. - // - // - ✅ Copy and paste from SF Symbols app. (Cmd + Shift + C) - // - 🚫 Not compile-time safe. - // - 🚫 Not readable. - // - Section("Standard API") { - Label("Account", systemImage: "person.crop.circle.badge.plus") - Image(systemName: "swift") - } - - // - // SFSafeSymbols. - // - // - ✅ Compile-time safe. - // - 🚫 Need type your own. (Possible mistake) - // - 🚫 Even more difficult to read. - // - Section("SFSafeSymbols") { - Label("Account", systemSymbol: .personCropCircleBadgePlus) - Image(systemSymbol: .swift) + NavigationView { + List { + // + // SFReadableSymbols. + // + // - ✅ High readable. (WYSIWYG) + // - ✅ Copy and paste from SF Symbols app. (Cmd + C) + // - 🚫 Can't display symbols in GitHub or other editors. + // + Section("SFReadableSymbols") { + Label("Account", symbol: "􀉯") + Image(symbol: "􀫊") + } + + // + // Standard API. + // + // - ✅ Copy and paste from SF Symbols app. (Cmd + Shift + C) + // - 🚫 Not compile-time safe. + // - 🚫 Not readable. + // + Section("Standard API") { + Label("Account", systemImage: "person.crop.circle.badge.plus") + Image(systemName: "swift") + } + + // + // SFSafeSymbols. + // + // - ✅ Compile-time safe. + // - 🚫 Need type your own. (Possible mistake) + // - 🚫 Even more difficult to read. + // + Section("SFSafeSymbols") { + Label("Account", systemSymbol: .personCropCircleBadgePlus) + Image(systemSymbol: .swift) + } + + NavigationLink { + SymbolsView_3_3() + } label: { + Text("SFSymbols 3.3") + } } + .navigationTitle("SFReadableSymbols") } } } diff --git a/Example/Shared/Example/SymbolsView_3_3.swift b/Example/Shared/Example/SymbolsView_3_3.swift new file mode 100644 index 0000000..6318936 --- /dev/null +++ b/Example/Shared/Example/SymbolsView_3_3.swift @@ -0,0 +1,28 @@ +// +// SymbolsView_3_3.swift +// Example +// +// Created by Yusuke Hosonuma on 2022/04/23. +// + +import SwiftUI + +struct SymbolsView_3_3: View { + var body: some View { + List { + Image(symbol: "􁂂") + Image(symbol: "􁂃") + Image(symbol: "􁂄") + Image(symbol: "􁑢") + Image(symbol: "􁎕") + Image(symbol: "􁏺") + Image(symbol: "􁎨") + } + } +} + +struct SymbolsView_3_3_Previews: PreviewProvider { + static var previews: some View { + SymbolsView_3_3() + } +} diff --git a/Sources/SFReadableSymbols/SFSymbol+3.2.swift b/Sources/SFReadableSymbols/Symbols.swift similarity index 99% rename from Sources/SFReadableSymbols/SFSymbol+3.2.swift rename to Sources/SFReadableSymbols/Symbols.swift index 22c5865..f758a75 100644 --- a/Sources/SFReadableSymbols/SFSymbol+3.2.swift +++ b/Sources/SFReadableSymbols/Symbols.swift @@ -1,4 +1,6 @@ -// SF Symbols version 3.2 (67) +// +// SF Symbols version 3.3 (67.3) +// let symbolsToName: [Character: String] = [ "􀈂": "square.and.arrow.up", "􀈃": "square.and.arrow.up.fill", @@ -3309,6 +3311,19 @@ let symbolsToName: [Character: String] = [ "􀛡": "50.square", "􀛢": "50.square.fill", "􀣺": "applelogo", + // + // 3.3 symbols + // + // - iOS 15.4 + // - macOS 12.3 + // - tvOS 15.4 + // - watchOS 8.5 + // + "􁂂": "camera.macro", + "􁂃": "camera.macro.circle", + "􁂄": "camera.macro.circle.fill", + "􁑢": "dots.and.line.vertical.and.cursorarrow.rectangle", + "􁎕": "key.viewfinder", + "􁏺": "person.badge.key", + "􁎨": "person.badge.key.fill", ] - -