Merge pull request #105 from SFSafeSymbols/fix-3.3-information

SFSafeSymbols · May 1, 2022 · ef000d9 · ef000d9
2 parents 25e688a + fd2cd0a
commit ef000d9
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Fixed
 
-- None
+- Added missing 3.3 layerset information.
 
 ## [3.3.1] - 2022-04-14
 

diff --git a/Sources/SFSafeSymbols/Symbols/SFSymbol+3.3.swift b/Sources/SFSafeSymbols/Symbols/SFSymbol+3.3.swift
@@ -3,45 +3,58 @@
 // 3.3 Symbols
 @available(iOS 15.4, macOS 12.3, tvOS 15.4, watchOS 8.5, *)
 public extension SFSymbol {
-    /// No preview available
-    /// Single Localization
+    /// 􁂂
+    /// Single Localization, Single Layerset
     ///
-    /// Layerset information unavailable
+    /// Layersets:
+    /// - Monochrome
     static let cameraMacro = SFSymbol(rawValue: "camera.macro")
 
-    /// No preview available
-    /// Single Localization
+    /// 􁂃
+    /// Single Localization, 2 Layersets
     ///
-    /// Layerset information unavailable
+    /// Layersets:
+    /// - Monochrome
+    /// - Hierarchical
     static let cameraMacroCircle = SFSymbol(rawValue: "camera.macro.circle")
 
-    /// No preview available
-    /// Single Localization
+    /// 􁂄
+    /// Single Localization, 2 Layersets
     ///
-    /// Layerset information unavailable
+    /// Layersets:
+    /// - Monochrome
+    /// - Hierarchical
     static let cameraMacroCircleFill = SFSymbol(rawValue: "camera.macro.circle.fill")
 
-    /// No preview available
-    /// Single Localization
+    /// 􁑢
+    /// Single Localization, 2 Layersets
     ///
-    /// Layerset information unavailable
+    /// Layersets:
+    /// - Monochrome
+    /// - Hierarchical
     static let dotsAndLineVerticalAndCursorarrowRectangle = SFSymbol(rawValue: "dots.and.line.vertical.and.cursorarrow.rectangle")
 
-    /// No preview available
-    /// Single Localization
+    /// 􁎕
+    /// Single Localization, 2 Layersets
     ///
-    /// Layerset information unavailable
+    /// Layersets:
+    /// - Monochrome
+    /// - Hierarchical
     static let keyViewfinder = SFSymbol(rawValue: "key.viewfinder")
 
-    /// No preview available
-    /// Single Localization
+    /// 􁏺
+    /// Single Localization, 2 Layersets
     ///
-    /// Layerset information unavailable
+    /// Layersets:
+    /// - Monochrome
+    /// - Hierarchical
     static let personBadgeKey = SFSymbol(rawValue: "person.badge.key")
 
-    /// No preview available
-    /// Single Localization
+    /// 􁎨
+    /// Single Localization, 2 Layersets
     ///
-    /// Layerset information unavailable
+    /// Layersets:
+    /// - Monochrome
+    /// - Hierarchical
     static let personBadgeKeyFill = SFSymbol(rawValue: "person.badge.key.fill")
 }
diff --git a/SymbolsGenerator/Sources/SymbolsGenerator/Resources/layerset_availability.plist b/SymbolsGenerator/Sources/SymbolsGenerator/Resources/layerset_availability.plist
@@ -4071,6 +4071,16 @@
 			<key>hierarchical</key>
 			<string>2021</string>
 		</dict>
+		<key>camera.macro.circle</key>
+		<dict>
+			<key>hierarchical</key>
+			<string>2021.3</string>
+		</dict>
+		<key>camera.macro.circle.fill</key>
+		<dict>
+			<key>hierarchical</key>
+			<string>2021.3</string>
+		</dict>
 		<key>camera.metering.center.weighted</key>
 		<dict>
 			<key>hierarchical</key>
@@ -5767,6 +5777,11 @@
 			<key>hierarchical</key>
 			<string>2021</string>
 		</dict>
+		<key>dots.and.line.vertical.and.cursorarrow.rectangle</key>
+		<dict>
+			<key>hierarchical</key>
+			<string>2021.3</string>
+		</dict>
 		<key>dpad.down.filled</key>
 		<dict>
 			<key>hierarchical</key>
@@ -8100,6 +8115,11 @@
 			<key>hierarchical</key>
 			<string>2021</string>
 		</dict>
+		<key>key.viewfinder</key>
+		<dict>
+			<key>hierarchical</key>
+			<string>2021.3</string>
+		</dict>
 		<key>keyboard.badge.ellipsis</key>
 		<dict>
 			<key>hierarchical</key>
@@ -9811,6 +9831,16 @@
 			<key>hierarchical</key>
 			<string>2021</string>
 		</dict>
+		<key>person.badge.key</key>
+		<dict>
+			<key>hierarchical</key>
+			<string>2021.3</string>
+		</dict>
+		<key>person.badge.key.fill</key>
+		<dict>
+			<key>hierarchical</key>
+			<string>2021.3</string>
+		</dict>
 		<key>person.badge.minus</key>
 		<dict>
 			<key>hierarchical</key>
@@ -14260,6 +14290,17 @@
 			<key>watchOS</key>
 			<string>6.0</string>
 		</dict>
+		<key>2019.1</key>
+		<dict>
+			<key>iOS</key>
+			<string>13.1</string>
+			<key>macOS</key>
+			<string>10.15</string>
+			<key>tvOS</key>
+			<string>13.0</string>
+			<key>watchOS</key>
+			<string>6.1</string>
+		</dict>
 		<key>2020</key>
 		<dict>
 			<key>iOS</key>
@@ -14326,6 +14367,17 @@
 			<key>watchOS</key>
 			<string>8.3</string>
 		</dict>
+		<key>2021.3</key>
+		<dict>
+			<key>iOS</key>
+			<string>15.4</string>
+			<key>macOS</key>
+			<string>12.3</string>
+			<key>tvOS</key>
+			<string>15.4</string>
+			<key>watchOS</key>
+			<string>8.5</string>
+		</dict>
 	</dict>
 </dict>
 </plist>
diff --git a/SymbolsGenerator/Sources/SymbolsGenerator/Resources/symbol_names.txt b/SymbolsGenerator/Sources/SymbolsGenerator/Resources/symbol_names.txt
@@ -1,6 +1,6 @@
 //
-// Retrieved via the SFSymbols app (Version 3.1) (sort by name, select all, right-click and select 'Copy Names')
-// Updated on November 13 2021
+// Retrieved via the SFSymbols app (Version 3.3) (sort by name, select all, right-click and select 'Copy Names')
+// Updated on April 24 2022
 //
 
 0.circle
@@ -908,6 +908,9 @@ camera.circle.fill
 camera.fill
 camera.fill.badge.ellipsis
 camera.filters
+camera.macro
+camera.macro.circle
+camera.macro.circle.fill
 camera.metering.center.weighted
 camera.metering.center.weighted.average
 camera.metering.matrix
@@ -1321,6 +1324,7 @@ dot.squareshape
 dot.squareshape.fill
 dot.squareshape.split.2x2
 dot.viewfinder
+dots.and.line.vertical.and.cursorarrow.rectangle
 dpad
 dpad.down.filled
 dpad.fill
@@ -1838,6 +1842,7 @@ key
 key.fill
 key.icloud
 key.icloud.fill
+key.viewfinder
 keyboard
 keyboard.badge.ellipsis
 keyboard.chevron.compact.down
@@ -2274,6 +2279,8 @@ person.3.sequence.fill
 person.and.arrow.left.and.arrow.right
 person.badge.clock
 person.badge.clock.fill
+person.badge.key
+person.badge.key.fill
 person.badge.minus
 person.badge.plus
 person.circle

diff --git a/SymbolsGenerator/Sources/SymbolsGenerator/Resources/symbol_previews.txt b/SymbolsGenerator/Sources/SymbolsGenerator/Resources/symbol_previews.txt
diff --git a/SymbolsGenerator/Sources/SymbolsGenerator/main.swift b/SymbolsGenerator/Sources/SymbolsGenerator/main.swift
@@ -58,7 +58,8 @@ symbolRestrictions = symbolRestrictions.merging(missingSymbolRestrictions) { ori
     return original
 }
 
-let versionsWithNoLayersetInfo = ["3.3"]
+let versionsWithNoLayersetInfo: [String] = []
+
 func otherAliases(for symbolName: String) -> [ScannedSymbol] {
     var result: [String] = []
     let olderAliases = nameAliases.filter { $0.newName == symbolName }.map(\.oldName)