v0.4.2

Author: rwbutler

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -389,7 +389,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
+			shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"error: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -495,6 +495,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
 			};
 			name = Debug;
 		};
@@ -542,6 +543,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

Example/TypographyKit.xcodeproj/project.pbxproj

@@ -15,7 +15,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication,
                      didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-        // Override point for customization after application launch.
         return true
     }
 

Example/TypographyKit/AppDelegate.swift

@@ -6,6 +6,8 @@
         "text": "gold"
 	},
 	"typography-kit": {
+        "minimum-point-size": 10,
+        "maximum-point-size": 100,
 		"point-step-size": 2,
 		"point-step-multiplier": 1
 	},

Example/TypographyKit/TypographyKit.json

@@ -241,12 +241,18 @@ You may specify your own point step size and multiplier by inclusion of a dictio
 
 	<key>typography-kit</key>
 	<dict>
+	  <key>minimum-point-size</key>
+		<integer>10</integer>
+		<key>maximum-point-size</key>
+		<integer>100</integer>
 		<key>point-step-size</key>
 		<integer>2</integer>
 		<key>point-step-multiplier</key>
 		<integer>1</integer>
 	</dict>
 
+Optionally, you may clamp the font point size to a lower and / or upper bound using the `minimum-point-size` and `maximum-point-size` properties.
+
 ### Remote Configuration
 TypographyKit also allows you to host your configuration remotely so that your colors and font styles can be updated dynamically. To do so, simply add the following line to your app delegate so that it is invoked when your app finishes launching:
 

README.md

@@ -1,35 +1,15 @@
-#
-# Be sure to run `pod lib lint TypographyKit.podspec' to ensure this is a
-# valid spec before submitting.
-#
-# Any lines starting with a # are optional, but their use is encouraged
-# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
-#
-
 Pod::Spec.new do |s|
   s.name             = 'TypographyKit'
-  s.version          = '0.4.0'
+  s.version          = '0.4.2'
   s.summary          = 'Visually consistent, accessible type for your iOS application.'
   s.swift_version    = '4.1'
   s.description      = <<-DESC
 TypographyKit makes it easy to define typography styles in your iOS app helping you achieve visual consistency in your design as well as supporting Dynamic Type even where using custom fonts.
                        DESC
-
   s.homepage         = 'https://github.com/rwbutler/TypographyKit'
-  # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'rwbutler' => 'github@rwbutler.com' }
   s.source           = { :git => 'https://github.com/rwbutler/TypographyKit.git', :tag => s.version.to_s }
-  # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
-
   s.ios.deployment_target = '8.0'
-
   s.source_files = 'TypographyKit/Classes/**/*'
-  
-  # s.resource_bundles = {
-  #   'TypographyKit' => ['TypographyKit/Assets/*.png']
-  # }
-
-  # s.public_header_files = 'Pod/Classes/**/*.h'
-  # s.frameworks = 'UIKit', 'MapKit'
 end

TypographyKit.podspec

@@ -7,6 +7,16 @@
 //
 
 struct ConfigurationSettings {
+    let minimumPointSize: Float?
+    let maximumPointSize: Float?
     let pointStepSize: Float
     let pointStepMultiplier: Float
+
+    init(minimumPointSize: Float? = nil, maximumPointSize: Float? = nil,
+         pointStepSize: Float = 2.0, pointStepMultiplier: Float = 1.0) {
+        self.minimumPointSize = minimumPointSize
+        self.maximumPointSize = maximumPointSize
+        self.pointStepSize = pointStepSize
+        self.pointStepMultiplier = pointStepMultiplier
+    }
 }

TypographyKit/Classes/ConfigurationSettings.swift

@@ -38,15 +38,18 @@ extension ParsingService {
     }
 
     func parse(_ configEntries: [String: Any]) -> ParsingServiceResult? {
-        var configuration: ConfigurationSettings = ConfigurationSettings(pointStepSize: 2.0,
-                                                                         pointStepMultiplier: 1.0)
+        var configuration: ConfigurationSettings = ConfigurationSettings()
         var typographyColors: [String: UIColor] = [:]
         var typographyStyles: [String: Typography] = [:]
 
         if let typographyKitConfig = configEntries["typography-kit"] as? [String: Float],
             let pointStepSize = typographyKitConfig["point-step-size"],
             let pointStepMultiplier = typographyKitConfig["point-step-multiplier"] {
-            configuration = ConfigurationSettings(pointStepSize: pointStepSize,
+            let minimumPointSize = typographyKitConfig["minimum-point-size"]
+            let maximumPointSize = typographyKitConfig["maximum-point-size"]
+            configuration = ConfigurationSettings(minimumPointSize: minimumPointSize,
+                                                  maximumPointSize: maximumPointSize,
+                                                  pointStepSize: pointStepSize,
                                                   pointStepMultiplier: pointStepMultiplier)
         }
         var colorAliases: [String: String] = [:] // keys which are synonyms for other colors
@@ -66,22 +69,20 @@ extension ParsingService {
             for (fontTextStyleKey, fontTextStyle) in fontTextStyles {
                 let fontName = fontTextStyle[ConfigurationKey.fontName.rawValue] as? String
                 let pointSize = fontTextStyle[ConfigurationKey.pointSize.rawValue] as? Float
-                var textColor: UIColor? = nil
+                var textColor: UIColor?
                 if let textColorName = fontTextStyle[ConfigurationKey.textColor.rawValue] as? String {
                     if let color = typographyColors[textColorName] {
                         textColor = color
                     } else {
                         textColor = TypographyColor(string: textColorName)?.uiColor
                     }
                 }
-                var letterCase: LetterCase? = nil
+                var letterCase: LetterCase?
                 if let letterCaseName = fontTextStyle[ConfigurationKey.letterCase.rawValue] as? String {
                     letterCase = LetterCase(rawValue: letterCaseName)
                 }
-                typographyStyles[fontTextStyleKey] = Typography(fontName: fontName,
-                                                                fontSize: pointSize,
-                                                                letterCase: letterCase,
-                                                                textColor: textColor)
+                typographyStyles[fontTextStyleKey] = Typography(fontName: fontName, fontSize: pointSize,
+                                                                letterCase: letterCase, textColor: textColor)
             }
         }
         return (configurationSettings: configuration,

TypographyKit/Classes/ParsingService.swift

@@ -56,6 +56,12 @@ public struct Typography {
         pointSize += (TypographyKit.pointStepSize
             * contentSizeCategoryStepMultiplier
             * TypographyKit.pointStepMultiplier)
+        if let minimumPointSize = TypographyKit.minimumPointSize, pointSize < minimumPointSize {
+            pointSize = minimumPointSize
+        }
+        if let maximumPointSize = TypographyKit.maximumPointSize, maximumPointSize < pointSize {
+            pointSize = maximumPointSize
+        }
         return UIFont(name: fontName, size: CGFloat(pointSize))
     }
 }

TypographyKit/Classes/Typography.swift

@@ -30,6 +30,14 @@ public struct TypographyKit {
         return .plist // default
     }()
 
+    public static var minimumPointSize: Float? = {
+        return configuration?.configurationSettings.minimumPointSize
+    }()
+
+    public static var maximumPointSize: Float? = {
+        return configuration?.configurationSettings.maximumPointSize
+    }()
+
     public static var pointStepSize: Float = {
         return configuration?.configurationSettings.pointStepSize ?? 2.0
     }()
@@ -90,7 +98,7 @@ private extension TypographyKit {
     }
 
     private static func parseConfiguration(data: Data) -> ParsingServiceResult? {
-        var parsingService: ParsingService? = nil
+        var parsingService: ParsingService?
         switch configurationType {
         case .plist:
             parsingService = PropertyListParsingService()