Updated ScaledFont

- now a Swift Package
- added a SwiftUI example

Author: kharrison

ScaledFont/ScaledFont/Noteworthy.plist renamed to ScaledFont/Fonts/Noteworthy.plist

@@ -2,77 +2,77 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UICTFontTextStyleTitle0</key>
+	<key>largeTitle</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Light</string>
 		<key>fontSize</key>
 		<integer>34</integer>
 	</dict>
-	<key>UICTFontTextStyleTitle1</key>
+	<key>title</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Light</string>
 		<key>fontSize</key>
 		<integer>28</integer>
 	</dict>
-	<key>UICTFontTextStyleTitle2</key>
+	<key>title2</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Light</string>
 		<key>fontSize</key>
 		<integer>22</integer>
 	</dict>
-	<key>UICTFontTextStyleTitle3</key>
+	<key>title3</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Light</string>
 		<key>fontSize</key>
 		<integer>20</integer>
 	</dict>
-	<key>UICTFontTextStyleHeadline</key>
+	<key>headline</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Bold</string>
 		<key>fontSize</key>
 		<integer>17</integer>
 	</dict>
-	<key>UICTFontTextStyleSubhead</key>
+	<key>subheadline</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Light</string>
 		<key>fontSize</key>
 		<integer>15</integer>
 	</dict>
-	<key>UICTFontTextStyleBody</key>
+	<key>body</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Light</string>
 		<key>fontSize</key>
 		<integer>17</integer>
 	</dict>
-	<key>UICTFontTextStyleCallout</key>
+	<key>callout</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Light</string>
 		<key>fontSize</key>
 		<integer>16</integer>
 	</dict>
-	<key>UICTFontTextStyleFootnote</key>
+	<key>footnote</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Light</string>
 		<key>fontSize</key>
 		<integer>13</integer>
 	</dict>
-	<key>UICTFontTextStyleCaption1</key>
+	<key>caption</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Light</string>
 		<key>fontSize</key>
 		<integer>12</integer>
 	</dict>
-	<key>UICTFontTextStyleCaption2</key>
+	<key>caption2</key>
 	<dict>
 		<key>fontName</key>
 		<string>Noteworthy-Light</string>

ScaledFont/ScaledFont/NotoSerif.plist renamed to ScaledFont/Fonts/NotoSerif.plist

@@ -2,77 +2,77 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UICTFontTextStyleTitle0</key>
+	<key>largeTitle</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif</string>
 		<key>fontSize</key>
 		<integer>34</integer>
 	</dict>
-	<key>UICTFontTextStyleTitle1</key>
+	<key>title</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif</string>
 		<key>fontSize</key>
 		<integer>28</integer>
 	</dict>
-	<key>UICTFontTextStyleTitle2</key>
+	<key>title2</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif</string>
 		<key>fontSize</key>
 		<integer>22</integer>
 	</dict>
-	<key>UICTFontTextStyleTitle3</key>
+	<key>title3</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif</string>
 		<key>fontSize</key>
 		<integer>20</integer>
 	</dict>
-	<key>UICTFontTextStyleHeadline</key>
+	<key>headline</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif-Bold</string>
 		<key>fontSize</key>
 		<integer>17</integer>
 	</dict>
-	<key>UICTFontTextStyleSubhead</key>
+	<key>subheadline</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif-Italic</string>
 		<key>fontSize</key>
 		<integer>15</integer>
 	</dict>
-	<key>UICTFontTextStyleBody</key>
+	<key>body</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif</string>
 		<key>fontSize</key>
 		<integer>17</integer>
 	</dict>
-	<key>UICTFontTextStyleCallout</key>
+	<key>callout</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif</string>
 		<key>fontSize</key>
 		<integer>16</integer>
 	</dict>
-	<key>UICTFontTextStyleFootnote</key>
+	<key>footnote</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif</string>
 		<key>fontSize</key>
 		<integer>13</integer>
 	</dict>
-	<key>UICTFontTextStyleCaption1</key>
+	<key>caption</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif-Italic</string>
 		<key>fontSize</key>
 		<integer>12</integer>
 	</dict>
-	<key>UICTFontTextStyleCaption2</key>
+	<key>caption2</key>
 	<dict>
 		<key>fontName</key>
 		<string>NotoSerif-Italic</string>

ScaledFont/ScaledFont/Noto_Serif/LICENSE.txt renamed to ScaledFont/Fonts/Noto_Serif/LICENSE.txt

@@ -2,43 +2,85 @@
 
 ## Using Dynamic Type With Custom Fonts
 
-An example of using custom fonts with dynamic type making use of the `UIFontMetrics` class introduced with iOS 11. It provides examples using the Noteworthy font which is built-in to iOS and the Noto Serif font which was downloaded from google fonts:
+An example of using custom fonts with dynamic type making use of the `UIFontMetrics` class introduced with iOS 11. It provides examples using the Noteworthy font that Apple ships built-in to iOS and the Noto Serif font which you can download from google fonts:
 
 + [Noto Serif](https://fonts.google.com/specimen/Noto+Serif?selection.family=Noto+Serif)
 
-*Refer to LICENSE.txt if you plan on using Noto Serif in a shipping application.*
+*See the LICENSE.txt file if you plan on using Noto Serif in a shipping application.*
 
-**This project requires iOS 11**
+## Sample Targets
 
-### ScaledFont
+There are two targets in this project:
 
-A utility class to help you use custom fonts with dynamic type.
++ Sampler - A UIKit example that requires a minimum of iOS 11
++ SamplerUI - A SwiftUI example that requires a minimum of iOS 14
 
-To use this class you must supply the name of a style dictionary for the font when creating the class. The style dictionary should be stored as a property list file in the main bundle.
+## Swift Package
 
-The style dictionary contains an entry for each text style that uses the raw string value for each `UIFontTextStyle` as the key.
+The ScaledFont implementation is now provided as a Swift Package Manager dependency. You can find the GitHub repository for the package here:
+
++ [ScaledFont on GitHub](https://github.com/kharrison/ScaledFont)
+
+## ScaledFont Details
+
+The `ScaledFont` type is a utility type to help you use custom fonts with dynamic type. You must give the name of a style dictionary for the font when creating the `ScaledFont`. You include the style dictionary as a property list file in the main bundle of your app.
+
+The style dictionary contains an entry for each text style. The available text styles are:
+
++ `largeTitle`, `title`, `title2`, `title3`
++  `headline`, `subheadline`, `body`, `callout`
++  `footnote`, `caption`, `caption2`
 
 The value of each entry is a dictionary with two keys:
 
-+ fontName: A String which is the font name.
-+ fontSize: A number which is the point size to use at the `.large` content size.
++ `fontName`: A `String` which is the font name.
++ `fontSize`: A number which is the point size to use at the `.large` (base) content size.
 
 For example to use a 17 pt Noteworthy-Bold font for the `.headline` style at the `.large` content size:
 
-    <dict>
-        <key>UICTFontTextStyleHeadline</key>
-        <dict>
-            <key>fontName</key>
-            <string>Noteworthy-Bold</string>
-            <key>fontSize</key>
-            <integer>17</integer>
-        </dict>
-    </dict>
+```
+<dict>
+  <key>headline</key>
+  <dict>
+    <key>fontName</key>
+    <string>Noteworthy-Bold</string>
+    <key>fontSize</key>
+    <integer>17</integer>
+  </dict>
+</dict>
+```
 
 You do not need to include an entry for every text style but if you try to use a text style that is not included in the dictionary it will fallback to the system preferred font.
 
-### Further Details
+## Using With UIKit
+
+For `UIKit`, apply the scaled font to text labels, text fields or text views:
+
+ ```swift
+let scaledFont = ScaledFont(fontName: "Noteworthy")
+label.font = scaledFont.font(forTextStyle: .headline)
+label.adjustsFontForContentSizeCategory = true
+```
+
+Remember to set the `adjustsFontFotContentSizeCategory` property to have the font size adjust automatically when the user changes their preferred content size.
+
+## Using With SwiftUI
+
+For `SwiftUI`, add the scaled font to the environment of a view:
+
+ ```swift
+ContentView()
+.environment(\.scaledFont, scaledFont)
+```
+
+Then apply the scaled fint view modifier to any view containing text in the view hierarchy:
+
+ ```swift
+Text("Headline")
+.scaledFont(.headline)
+```
+## Further Details
 
-See the following blog post for further details:
+See this blog post for further details:
 
 + [Using A Custom Font With Dynamic Type](https://useyourloaf.com/blog/using-a-custom-font-with-dynamic-type/)

ScaledFont/ScaledFont/Noto_Serif/NotoSerif-Bold.ttf renamed to ScaledFont/Fonts/Noto_Serif/NotoSerif-Bold.ttf

@@ -1,5 +1,4 @@
-//  Created by Keith Harrison https://useyourloaf.com
-//  Copyright (c) 2017 Keith Harrison. All rights reserved.
+//  Copyright © 2021 Keith Harrison. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
@@ -29,7 +28,6 @@
 
 import UIKit
 
-@UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
-    var window: UIWindow?
+@main
+final class AppDelegate: UIResponder, UIApplicationDelegate {
 }

ScaledFont/ScaledFont/Noto_Serif/NotoSerif-BoldItalic.ttf renamed to ScaledFont/Fonts/Noto_Serif/NotoSerif-BoldItalic.ttf

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}