Allow SwiftUI Colors and Fonts to be nullable

Author: rwbutler

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.3.1] - 2021-11-09
+## Changed
+- Allow Color and Font for typography styles in SwiftUI to be nullable.
+
 ## [4.3.0] - 2021-11-09
 ## Added
 - Support for disabling font scaling either system-wide and/or per-font.

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -280,7 +280,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 1220;
+				LastUpgradeCheck = 1310;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -611,6 +611,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = TypographyKit/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 4.3.1;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.rwbutler.TypographyKit-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -626,6 +627,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = TypographyKit/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 4.3.1;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.rwbutler.TypographyKit-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/TypographyKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/TypographyKit.xcodeproj/project.pbxproj

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/TypographyKit.xcodeproj/xcshareddata/xcschemes/TypographyKit-Example.xcscheme

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'TypographyKit'
-  s.version          = '4.3.0'
+  s.version          = '4.3.1'
   s.summary          = 'Consistent & accessible visual styling on iOS with support for Dynamic Type'
   s.swift_version    = '5.0'
   s.description      = <<-DESC

Example/TypographyKit/Info.plist

@@ -30,12 +30,14 @@ struct FontTextStyleParser {
 private extension FontTextStyleParser {
 
     mutating func parse(_ key: String, _ value: [String: Any]) {
-        //Already Parsed
-        if typographyFontStyles[key] != nil { return }
-        
-        //Already found to be invalid
-        if invalidStyles[key] != nil { return }
-            
+        // Already Parsed
+        if typographyFontStyles[key] != nil {
+            return
+        }
+        // Already found to be invalid
+        if invalidStyles[key] != nil {
+            return
+        }
         backTrace.append(key)
         switch parseFontTextStyle(key, value) {
         case .success(let color):

TypographyKit.podspec

@@ -7,6 +7,6 @@
 
 import Foundation
 
-@objc public protocol TypographyKitViewControllerDelegate: class {
+@objc public protocol TypographyKitViewControllerDelegate: AnyObject {
     @objc func viewControllerDidFinish()
 }

TypographyKit/Classes/FontTextStyleParser.swift

@@ -15,24 +15,26 @@ private struct TypographyStyle: ViewModifier {
 
     @Environment(\.sizeCategory) var sizeCategory
 
-    var color: Color {
+    var color: Color? {
         guard let textColor = Typography(for: style)?.textColor else {
-            return Color.black
+            return nil
         }
         return Color(textColor)
     }
 
-    var font: Font {
+    var font: Font? {
         guard let font = Typography(for: style)?.font() else {
-            return Font.body
+            return nil
         }
         return Font.custom(font.fontName, size: font.pointSize)
     }
 
     var style: UIFont.TextStyle
 
     func body(content: Content) -> some View {
-        return content.font(font).foregroundColor(color)
+        return content
+            .font(font)
+            .foregroundColor(color)
     }
 
 }