feat(global): include font awesome ✨

weareopensource · Oct 24, 2019 · 5fa4bc5 · 5fa4bc5
1 parent 0ce96df
commit 5fa4bc5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/Cartfile b/Cartfile
@@ -12,3 +12,4 @@ github "pixeldock/RxAppState" ~> 1.5.1
 github "adamwaite/Validator" ~> 3.2.1 
 github "kishikawakatsumi/KeychainAccess"
 github "devxoul/Toaster"
+github "thii/FontAwesome.swift"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -14,3 +14,4 @@ github "adamwaite/Validator" "v3.2.1"
 github "devxoul/Toaster" "2.2.0"
 github "kishikawakatsumi/KeychainAccess" "v3.2.1"
 github "pixeldock/RxAppState" "1.6.0"
+github "thii/FontAwesome.swift" "1.8.2"
diff --git a/waosSwift.xcodeproj/project.pbxproj b/waosSwift.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		BF05418F2361EF98008628CF /* FontAwesome.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF05418E2361EF98008628CF /* FontAwesome.framework */; };
+		BF0541902361EF98008628CF /* FontAwesome.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF05418E2361EF98008628CF /* FontAwesome.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BF058D772282BCAC00E2A077 /* AuthSigninController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF058D762282BCAC00E2A077 /* AuthSigninController.swift */; };
 		BF058D792282BCB600E2A077 /* AuthFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF058D782282BCB600E2A077 /* AuthFlow.swift */; };
 		BF058D7B2282BCC500E2A077 /* AuthSigninReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF058D7A2282BCC500E2A077 /* AuthSigninReactor.swift */; };
@@ -132,8 +134,23 @@
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		BF0541912361EF98008628CF /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				BF0541902361EF98008628CF /* FontAwesome.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		BF05418D2361964F008628CF /* waosSwift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = waosSwift.entitlements; sourceTree = "<group>"; };
+		BF05418E2361EF98008628CF /* FontAwesome.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FontAwesome.framework; path = Carthage/Build/iOS/FontAwesome.framework; sourceTree = "<group>"; };
 		BF058D762282BCAC00E2A077 /* AuthSigninController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthSigninController.swift; sourceTree = "<group>"; };
 		BF058D782282BCB600E2A077 /* AuthFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthFlow.swift; sourceTree = "<group>"; };
 		BF058D7A2282BCC500E2A077 /* AuthSigninReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthSigninReactor.swift; sourceTree = "<group>"; };
@@ -262,6 +279,7 @@
 			files = (
 				BF78B62A229D3F090057157A /* Toaster.framework in Frameworks */,
 				BF9A3642228C33A900EE2AB8 /* ReactorKitRuntime.framework in Frameworks */,
+				BF05418F2361EF98008628CF /* FontAwesome.framework in Frameworks */,
 				BF9A3643228C33A900EE2AB8 /* ReactorKit.framework in Frameworks */,
 				BF794D41226856E6000B19F3 /* Differentiator.framework in Frameworks */,
 				BF4A2F37225B4F7F0001B4CE /* RxFlow.framework in Frameworks */,
@@ -461,6 +479,7 @@
 		BF4A2F30225B4F7F0001B4CE /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				BF05418E2361EF98008628CF /* FontAwesome.framework */,
 				BF19509322B4EC2C00C593E5 /* RxRelay.framework */,
 				BF313C70229E64C200ADECF2 /* Validator.framework */,
 				BF78B629229D3F090057157A /* Toaster.framework */,
@@ -829,6 +848,7 @@
 				BF8E75CD221EBCA30057F710 /* SwiftLint */,
 				BF85C200225639BC00C8DDB8 /* SwiftGen */,
 				BF4A2F19225B4A310001B4CE /* Carthage */,
+				BF0541912361EF98008628CF /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
@@ -992,6 +1012,7 @@
 				"$(SRCROOT)/Carthage/Build/iOS/Toaster.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/Validator.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/RxRelay.framework",
+				"$(SRCROOT)/Carthage/Build/iOS/FontAwesome.framework",
 			);
 			name = Carthage;
 			outputFileListPaths = (

diff --git a/waosSwift/config/BridgingHeader.h b/waosSwift/config/BridgingHeader.h
@@ -6,3 +6,4 @@
 @import SnapKit;
 @import RxAppState;
 @import Validator;
+@import FontAwesome;
diff --git a/waosSwift/modules/core/flows/CoreFlow.swift b/waosSwift/modules/core/flows/CoreFlow.swift
@@ -32,8 +32,8 @@ final class CoreFlow: Flow {
         let secondFlow = SecondFlow(withServices: self.services)
 
         Flows.whenReady(flow1: tasksFlow, flow2: secondFlow) { [unowned self] (root1: UINavigationController, root2: UINavigationController) in
-            let tabBarItem1 = UITabBarItem(title: L10n.taskTitle, image: nil, selectedImage: nil)
-            let tabBarItem2 = UITabBarItem(title: L10n.secondTitle, image: nil, selectedImage: nil)
+            let tabBarItem1 = UITabBarItem(title: L10n.taskTitle, image: UIImage.fontAwesomeIcon(code: "fa-tasks", style: .solid, textColor: .blue, size: CGSize(width: 30, height: 30)), selectedImage: nil)
+            let tabBarItem2 = UITabBarItem(title: L10n.taskTitle, image: UIImage.fontAwesomeIcon(code: "fa-sun", style: .solid, textColor: .blue, size: CGSize(width: 30, height: 30)), selectedImage: nil)
 
             root1.tabBarItem = tabBarItem1
             root1.title = L10n.taskTitle