Merge pull request #11 from LiveUI/5.2

FontAwesome 5.2
LiveUI · Jul 25, 2018 · e716102 · e716102
2 parents 88fb689 + 6d98020
commit e716102
Show file tree

Hide file tree

Showing 8 changed files with 460 additions and 103 deletions.
diff --git a/Assets/fa-brands-400.ttf b/Assets/fa-brands-400.ttf
diff --git a/Assets/fa-regular-400.ttf b/Assets/fa-regular-400.ttf
diff --git a/Assets/fa-solid-900.ttf b/Assets/fa-solid-900.ttf
diff --git a/Classes/Enums/Awesome.swift b/Classes/Enums/Awesome.swift
diff --git a/Classes/Enums/AwesomePro.swift b/Classes/Enums/AwesomePro.swift
diff --git a/Generator/Sources/Generator/EnumBuilder.swift b/Generator/Sources/Generator/EnumBuilder.swift
@@ -1,17 +1,17 @@
 import Foundation
 
 func buildEnum (_ name: String, from styles: [String: [Icon]]) -> String {
-	let formatter = DateFormatter()
-	formatter.dateFormat = "dd/MM/yyyy HH:mm"
-	
+    let formatter = DateFormatter()
+    formatter.dateFormat = "dd/MM/yyyy HH:mm"
+
     var content = ""
     content += "//\n//  \(name).swift\n//  AwesomeEnum\n//\n//  Originally created by Ondrej Rafaj on 13/10/2017.\n"
     content += "//  Copyright © 2017 manGoweb UK. All rights reserved.\n//\n"
-	content += "//  This file has been auto-generated on \(formatter.string(from: Date())).\n\nimport Foundation\n\npublic struct \(name) {\n"
+    content += "//  This file has been auto-generated on \(formatter.string(from: Date())).\n\nimport Foundation\n\npublic struct \(name) {\n"
 
     for (var style, list) in styles {
-		if style == "brands" { style = "brand" }
-		
+        if style == "brands" { style = "brand" }
+
         content += "\n    public enum \(style): String, Amazing {\n"
         var names = [String]()
         for icon in list {
@@ -20,12 +20,12 @@ func buildEnum (_ name: String, from styles: [String: [Icon]]) -> String {
             if Int(name.prefix(1)) != nil { name = "fa\(name)" }
             names.append(name)
 
-			content += "        case \(name.isKeyword ? "`\(name)`" : name) = \"\\u{\(icon.unicode)}\"\n"
+            content += "        case \(name.isKeyword ? "`\(name)`" : name) = \"\\u{\(icon.unicode)}\"\n"
         }
 
         content += "\n        public static var all: [\(style)] {\n            return [ \(names.map {"\(style).\($0)"}.joined(separator: ", ")) ]\n        }\n"
-		content += "\n        public static var keys: [String] {\n            return [ \(list.map {"\"\($0.name)\""}.joined(separator: ", ")) ]\n        }\n"
-		content += "\n        public static var labels: [String] {\n            return [ \(list.map {"\"\($0.name.split(separator: "-").map { $0.firstUppercased() }.joined(separator: " "))\""}.joined(separator: ", ")) ]\n        }\n"
+        content += "\n        public static var keys: [String] {\n            return [ \(list.map {"\"\($0.name)\""}.joined(separator: ", ")) ]\n        }\n"
+        content += "\n        public static var labels: [String] {\n            return [ \(list.map {"\"\($0.name.split(separator: "-").map { $0.firstUppercased() }.joined(separator: " "))\""}.joined(separator: ", ")) ]\n        }\n"
         content += "\n        public var code: String {\n            return rawValue\n        }\n"
         content += "\n        public var fontType: AwesomeFont {\n            return \(name).Font.\(style)\n        }\n"
 

diff --git a/Generator/Sources/Generator/StringExtensions.swift b/Generator/Sources/Generator/StringExtensions.swift
@@ -1,79 +1,78 @@
 import Foundation
 
 extension Substring {
-	func firstUppercased() -> Substring {
-		return prefix(1).uppercased() + dropFirst()
-	}
+    func firstUppercased() -> Substring {
+        return prefix(1).uppercased() + dropFirst()
+    }
 }
 
 extension String {
-
-	func firstUppercased() -> String {
-		return prefix(1).uppercased() + dropFirst()
-	}
-
-	var isKeyword: Bool {
-		switch self {
-		case
-		"associativity",
-		"break",
-		"case",
-		"catch",
-		"class",
-		"continue",
-		"convenience",
-		"default",
-		"deinit",
-		"didSet",
-		"do",
-		"else",
-		"enum",
-		"extension",
-		"fallthrough",
-		"false",
-		"final",
-		"for",
-		"func",
-		"get",
-		"guard",
-		"if",
-		"in",
-		"infix",
-		"init",
-		"inout",
-		"internal",
-		"lazy",
-		"let",
-		"mutating",
-		"nil",
-		"operator",
-		"override",
-		"postfix",
-		"precedence",
-		"prefix",
-		"private",
-		"public",
-		"repeat",
-		"required",
-		"return",
-		"self",
-		"set",
-		"static",
-		"struct",
-		"subscript",
-		"super",
-		"switch",
-		"throws",
-		"true",
-		"try",
-		"var",
-		"weak",
-		"where",
-		"while",
-		"willSet":
-			return true
-		default:
-			return false
-		}
-	}
+    func firstUppercased() -> String {
+        return prefix(1).uppercased() + dropFirst()
+    }
+
+    var isKeyword: Bool {
+        switch self {
+        case
+        "associativity",
+        "break",
+        "case",
+        "catch",
+        "class",
+        "continue",
+        "convenience",
+        "default",
+        "deinit",
+        "didSet",
+        "do",
+        "else",
+        "enum",
+        "extension",
+        "fallthrough",
+        "false",
+        "final",
+        "for",
+        "func",
+        "get",
+        "guard",
+        "if",
+        "in",
+        "infix",
+        "init",
+        "inout",
+        "internal",
+        "lazy",
+        "let",
+        "mutating",
+        "nil",
+        "operator",
+        "override",
+        "postfix",
+        "precedence",
+        "prefix",
+        "private",
+        "public",
+        "repeat",
+        "required",
+        "return",
+        "self",
+        "set",
+        "static",
+        "struct",
+        "subscript",
+        "super",
+        "switch",
+        "throws",
+        "true",
+        "try",
+        "var",
+        "weak",
+        "where",
+        "while",
+        "willSet":
+            return true
+        default:
+            return false
+        }
+    }
 }
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Awesome
 
-[![Font Awesome](https://img.shields.io/badge/Font%20Awesome-5.1.0-brightgreen.svg)](https://fontawesome.com/v5.1.0/icons)
+[![Font Awesome](https://img.shields.io/badge/Font%20Awesome-5.2.0-brightgreen.svg)](https://fontawesome.com/v5.2.0/icons)
 [![Slack](https://img.shields.io/badge/join-slack-745EAF.svg?style=flat)](http://bit.ly/2B0dEyt)
 [![Version](https://img.shields.io/cocoapods/v/AwesomeEnum.svg?style=flat)](http://cocoapods.org/pods/AwesomeEnum)
 [![License](https://img.shields.io/cocoapods/l/AwesomeEnum.svg?style=flat)](http://cocoapods.org/pods/AwesomeEnum)
@@ -57,7 +57,7 @@ let attributedText = Awesome.regular.envelopeOpen.asAttributedText(fontSize: 17,
 The Font Awesome Free files are included and loaded for you out of the box. Font Awesome Pro licensing terms don't allow to publish the font files however, so we can't add those for you. As such you will need to manually add the fonts to your project and register them before using them:
 
 ```swift
-// AppDelegate application(:didFinishLaunchingWithOptions:)
+// AppDelegate application(_:didFinishLaunchingWithOptions:)
 
 // Load all fonts
 AwesomePro.loadFonts(from: Bundle.main)