default font for textStyle

prolificinteractive · Apr 18, 2018 · 0d10d7a · 0d10d7a
1 parent f78f364
commit 0d10d7a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Kumi/Core/Font/FontTheme.swift b/Kumi/Core/Font/FontTheme.swift
@@ -155,9 +155,7 @@ public final class FontTheme {
 
     public init?(json: JSON) {
 
-        guard let bodyNormalTextStyle = TextStyleSet(json: json["bodyNormal"]) else {
-            return nil
-        }
+        let bodyNormalTextStyle = TextStyleSet(json: json["bodyNormal"]) ?? .default
 
         self.bodyNormalTextStyle = bodyNormalTextStyle
 

diff --git a/Kumi/Core/Font/TextStyleSet.swift b/Kumi/Core/Font/TextStyleSet.swift
@@ -9,6 +9,10 @@
 import Foundation
 import Marker
 
+public extension TextStyle {
+    static public let `default` = TextStyle(font: Font.systemFont(ofSize: 18))
+}
+
 public struct TextStyleSet {
 
     public var regular: TextStyle {
@@ -29,11 +33,13 @@ public struct TextStyleSet {
 
     fileprivate var _emphasis: TextStyle?
 
-    public init(normal: TextStyle, strong: TextStyle?, emphasis: TextStyle?) {
+    public init(normal: TextStyle, strong: TextStyle? = nil, emphasis: TextStyle? = nil) {
         self._regular = normal
         self._strong = strong ?? normal
         self._emphasis = emphasis ?? normal
     }
 
+    public static let `default` = TextStyleSet(normal: .default)
+
 }
 
diff --git a/Kumi/Core/Kumi.swift b/Kumi/Core/Kumi.swift
@@ -57,7 +57,7 @@ public struct Kumi {
 
     public static func setup(bundle: Bundle) {
         let files = bundle.paths(forResourcesOfType: "json", inDirectory: nil)
-        let jsons = files.flatMap { JSONHelper.readJSON(path: $0) }.filter { !$0["kumi"].isEmpty }
+        let jsons = files.compactMap { JSONHelper.readJSON(path: $0) }.filter { !$0["kumi"].isEmpty }
         for json in jsons {
             switch json["kumi"]["type"].stringValue {
             case "color":