Merge pull request #54 from acsalu/revamp-color-expression

Revamp color expression

Emome.xcodeproj/project.pbxproj

@@ -12,13 +12,12 @@
 		85902B3DCE963DC4D680B59D /* Pods_Emome.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85FF42BE84B4AE0D14439A0B /* Pods_Emome.framework */; };
 		900148541BB8726200EB992C /* EmomeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 900148531BB8726200EB992C /* EmomeTests.swift */; };
 		9001486D1BB984CE00EB992C /* EMOEmotionSelectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9001486C1BB984CE00EB992C /* EMOEmotionSelectionTests.swift */; };
-		900C464A1BE6D38E00EB4D70 /* EMOEmomeWelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 900C46491BE6D38E00EB4D70 /* EMOEmomeWelcomeViewController.swift */; };
 		9030FF491BFA415700948793 /* EMOSuggestionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9030FF481BFA415700948793 /* EMOSuggestionView.swift */; };
 		9030FF4B1BFA416300948793 /* EMOSuggestionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9030FF4A1BFA416300948793 /* EMOSuggestionView.xib */; };
 		9030FF4E1BFA419100948793 /* EMOSuggestion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9030FF4D1BFA419100948793 /* EMOSuggestion.swift */; };
 		9030FF511BFAC92300948793 /* EMOEnums.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9030FF501BFAC92300948793 /* EMOEnums.swift */; };
+		903A2DE11C07B27C00C8964A /* EMOColorSplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 903A2DE01C07B27C00C8964A /* EMOColorSplashViewController.swift */; };
 		906190B61BE6E4BC0061E103 /* EmoEmomeColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 906190B51BE6E4BC0061E103 /* EmoEmomeColors.swift */; };
-		907C0F411BDEA8E700C896D3 /* EMOEmotionMeterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 907C0F401BDEA8E700C896D3 /* EMOEmotionMeterViewController.swift */; };
 		907C0F431BDEA94C00C896D3 /* EMOScenarioSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 907C0F421BDEA94C00C896D3 /* EMOScenarioSelectionViewController.swift */; };
 		907C0F451BDEA9AC00C896D3 /* EMOSeggestionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 907C0F441BDEA9AC00C896D3 /* EMOSeggestionViewController.swift */; };
 		907EDAFD1BB9990E00E49E34 /* EmomeUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 907EDAFC1BB9990E00E49E34 /* EmomeUITests.swift */; };
@@ -27,9 +26,11 @@
 		90B15D501BEDA029000E1B55 /* EMOAccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90B15D4F1BEDA029000E1B55 /* EMOAccountViewController.swift */; };
 		90B9A8161C016A510008DAF4 /* GCDUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90B9A8151C016A510008DAF4 /* GCDUtils.swift */; };
 		90C6FD481BB0B5CF009F9FB3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90C6FD471BB0B5CF009F9FB3 /* AppDelegate.swift */; };
-		90C6FD4A1BB0B5CF009F9FB3 /* EMOEmotionSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90C6FD491BB0B5CF009F9FB3 /* EMOEmotionSelectionViewController.swift */; };
 		90C6FD4F1BB0B5CF009F9FB3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 90C6FD4E1BB0B5CF009F9FB3 /* Assets.xcassets */; };
 		90C6FD521BB0B5CF009F9FB3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 90C6FD501BB0B5CF009F9FB3 /* LaunchScreen.storyboard */; };
+		90EFFD851C0806BF005AD750 /* EMOHomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90EFFD841C0806BF005AD750 /* EMOHomeViewController.swift */; };
+		90EFFD871C08C9CB005AD750 /* EMOEmotionColorButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90EFFD861C08C9CA005AD750 /* EMOEmotionColorButton.swift */; };
+		90EFFD8B1C090258005AD750 /* EMOHomeActionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90EFFD8A1C090258005AD750 /* EMOHomeActionButton.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -59,13 +60,12 @@
 		900148531BB8726200EB992C /* EmomeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmomeTests.swift; sourceTree = "<group>"; };
 		900148551BB8726200EB992C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9001486C1BB984CE00EB992C /* EMOEmotionSelectionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOEmotionSelectionTests.swift; sourceTree = "<group>"; };
-		900C46491BE6D38E00EB4D70 /* EMOEmomeWelcomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOEmomeWelcomeViewController.swift; sourceTree = "<group>"; };
 		9030FF481BFA415700948793 /* EMOSuggestionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOSuggestionView.swift; sourceTree = "<group>"; };
 		9030FF4A1BFA416300948793 /* EMOSuggestionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EMOSuggestionView.xib; sourceTree = "<group>"; };
 		9030FF4D1BFA419100948793 /* EMOSuggestion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOSuggestion.swift; sourceTree = "<group>"; };
 		9030FF501BFAC92300948793 /* EMOEnums.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOEnums.swift; sourceTree = "<group>"; };
+		903A2DE01C07B27C00C8964A /* EMOColorSplashViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOColorSplashViewController.swift; sourceTree = "<group>"; };
 		906190B51BE6E4BC0061E103 /* EmoEmomeColors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmoEmomeColors.swift; sourceTree = "<group>"; };
-		907C0F401BDEA8E700C896D3 /* EMOEmotionMeterViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOEmotionMeterViewController.swift; sourceTree = "<group>"; };
 		907C0F421BDEA94C00C896D3 /* EMOScenarioSelectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOScenarioSelectionViewController.swift; sourceTree = "<group>"; };
 		907C0F441BDEA9AC00C896D3 /* EMOSeggestionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOSeggestionViewController.swift; sourceTree = "<group>"; };
 		907EDAFA1BB9990E00E49E34 /* EmomeUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EmomeUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -77,10 +77,12 @@
 		90B9A8151C016A510008DAF4 /* GCDUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GCDUtils.swift; sourceTree = "<group>"; };
 		90C6FD441BB0B5CE009F9FB3 /* Emome.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Emome.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		90C6FD471BB0B5CF009F9FB3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		90C6FD491BB0B5CF009F9FB3 /* EMOEmotionSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EMOEmotionSelectionViewController.swift; sourceTree = "<group>"; };
 		90C6FD4E1BB0B5CF009F9FB3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		90C6FD511BB0B5CF009F9FB3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		90C6FD531BB0B5CF009F9FB3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		90EFFD841C0806BF005AD750 /* EMOHomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOHomeViewController.swift; sourceTree = "<group>"; };
+		90EFFD861C08C9CA005AD750 /* EMOEmotionColorButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOEmotionColorButton.swift; sourceTree = "<group>"; };
+		90EFFD8A1C090258005AD750 /* EMOHomeActionButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EMOHomeActionButton.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -133,6 +135,8 @@
 			children = (
 				9030FF481BFA415700948793 /* EMOSuggestionView.swift */,
 				9030FF4A1BFA416300948793 /* EMOSuggestionView.xib */,
+				90EFFD861C08C9CA005AD750 /* EMOEmotionColorButton.swift */,
+				90EFFD8A1C090258005AD750 /* EMOHomeActionButton.swift */,
 			);
 			name = UI;
 			sourceTree = "<group>";
@@ -150,10 +154,11 @@
 		907C0F461BDEA9B100C896D3 /* ViewControllers */ = {
 			isa = PBXGroup;
 			children = (
-				90979B3A1BF8E83200F0DD67 /* EmomeTab */,
-				90979B3B1BF8E84000F0DD67 /* MyIdeasTab */,
-				90DC3F4A1BFD057F0064DE5D /* MeTab */,
+				90EFFD8C1C090E9E005AD750 /* Emome */,
+				90979B3B1BF8E84000F0DD67 /* Suggest */,
+				90DC3F4A1BFD057F0064DE5D /* Me */,
 				35E703041BE6E3CD0001B75D /* SpotifyApiTestViewController.swift */,
+				90EFFD841C0806BF005AD750 /* EMOHomeViewController.swift */,
 			);
 			name = ViewControllers;
 			sourceTree = "<group>";
@@ -167,24 +172,12 @@
 			path = EmomeUITests;
 			sourceTree = "<group>";
 		};
-		90979B3A1BF8E83200F0DD67 /* EmomeTab */ = {
-			isa = PBXGroup;
-			children = (
-				900C46491BE6D38E00EB4D70 /* EMOEmomeWelcomeViewController.swift */,
-				907C0F401BDEA8E700C896D3 /* EMOEmotionMeterViewController.swift */,
-				907C0F421BDEA94C00C896D3 /* EMOScenarioSelectionViewController.swift */,
-				907C0F441BDEA9AC00C896D3 /* EMOSeggestionViewController.swift */,
-				90C6FD491BB0B5CF009F9FB3 /* EMOEmotionSelectionViewController.swift */,
-			);
-			name = EmomeTab;
-			sourceTree = "<group>";
-		};
-		90979B3B1BF8E84000F0DD67 /* MyIdeasTab */ = {
+		90979B3B1BF8E84000F0DD67 /* Suggest */ = {
 			isa = PBXGroup;
 			children = (
 				90979B3C1BF8EADB00F0DD67 /* EMOMyIdeasViewController.swift */,
 			);
-			name = MyIdeasTab;
+			name = Suggest;
 			sourceTree = "<group>";
 		};
 		90B9A8171C016A540008DAF4 /* Utils */ = {
@@ -234,12 +227,22 @@
 			path = Emome;
 			sourceTree = "<group>";
 		};
-		90DC3F4A1BFD057F0064DE5D /* MeTab */ = {
+		90DC3F4A1BFD057F0064DE5D /* Me */ = {
 			isa = PBXGroup;
 			children = (
 				90B15D4F1BEDA029000E1B55 /* EMOAccountViewController.swift */,
 			);
-			name = MeTab;
+			name = Me;
+			sourceTree = "<group>";
+		};
+		90EFFD8C1C090E9E005AD750 /* Emome */ = {
+			isa = PBXGroup;
+			children = (
+				903A2DE01C07B27C00C8964A /* EMOColorSplashViewController.swift */,
+				907C0F421BDEA94C00C896D3 /* EMOScenarioSelectionViewController.swift */,
+				907C0F441BDEA9AC00C896D3 /* EMOSeggestionViewController.swift */,
+			);
+			name = Emome;
 			sourceTree = "<group>";
 		};
 		A1E2B34085E0F8003C70AC32 /* Frameworks */ = {
@@ -466,18 +469,19 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				907C0F411BDEA8E700C896D3 /* EMOEmotionMeterViewController.swift in Sources */,
 				35E703051BE6E3CD0001B75D /* SpotifyApiTestViewController.swift in Sources */,
 				90979B3D1BF8EADB00F0DD67 /* EMOMyIdeasViewController.swift in Sources */,
+				903A2DE11C07B27C00C8964A /* EMOColorSplashViewController.swift in Sources */,
+				90EFFD851C0806BF005AD750 /* EMOHomeViewController.swift in Sources */,
 				907C0F431BDEA94C00C896D3 /* EMOScenarioSelectionViewController.swift in Sources */,
 				907C0F451BDEA9AC00C896D3 /* EMOSeggestionViewController.swift in Sources */,
-				90C6FD4A1BB0B5CF009F9FB3 /* EMOEmotionSelectionViewController.swift in Sources */,
+				90EFFD871C08C9CB005AD750 /* EMOEmotionColorButton.swift in Sources */,
+				90EFFD8B1C090258005AD750 /* EMOHomeActionButton.swift in Sources */,
 				9030FF491BFA415700948793 /* EMOSuggestionView.swift in Sources */,
 				90C6FD481BB0B5CF009F9FB3 /* AppDelegate.swift in Sources */,
 				90B15D501BEDA029000E1B55 /* EMOAccountViewController.swift in Sources */,
 				906190B61BE6E4BC0061E103 /* EmoEmomeColors.swift in Sources */,
 				908C890D1BE06C1100190BB5 /* EMODataManager.swift in Sources */,
-				900C464A1BE6D38E00EB4D70 /* EMOEmomeWelcomeViewController.swift in Sources */,
 				90B9A8161C016A510008DAF4 /* GCDUtils.swift in Sources */,
 				9030FF511BFAC92300948793 /* EMOEnums.swift in Sources */,
 				9030FF4E1BFA419100948793 /* EMOSuggestion.swift in Sources */,

Emome/AppDelegate.swift

@@ -29,8 +29,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         // Set up logger
         log.setup(.Debug, showThreadName: true, showLogLevel: true, showFileNames: true, showLineNumbers: true, writeToFile: nil, fileLogLevel: .Debug)
-
-        UITabBar.appearance().tintColor = UIColor.emomeThemeColor()
 
         return true
     }

Emome/Assets.xcassets/card-spotify.imageset/Contents.json → Emome/Assets.xcassets/btn-back.imageset/Contents.json

@@ -6,11 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "card-spotify.png",
+      "filename" : "btn-back@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "btn-back@3x.png",
       "scale" : "3x"
     }
   ],

Emome/Assets.xcassets/btn-close.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "btn-close@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "btn-close@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Emome/Assets.xcassets/ic-check.imageset/Contents.json → Emome/Assets.xcassets/btn-done.imageset/Contents.json

@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "ic-check@2x.png",
+      "filename" : "btn-done@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic-check@3x.png",
+      "filename" : "btn-done@3x.png",
       "scale" : "3x"
     }
   ],

Emome/Assets.xcassets/btn-eraser.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "btn-eraser@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "btn-eraser@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Emome/Assets.xcassets/card-yelp.imageset/Contents.json → Emome/Assets.xcassets/btn-next.imageset/Contents.json

@@ -6,11 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "card-yelp.png",
+      "filename" : "btn-next@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "btn-next@3x.png",
       "scale" : "3x"
     }
   ],

Emome/Assets.xcassets/ic-cross.imageset/Contents.json → Emome/Assets.xcassets/img-home.imageset/Contents.json

@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "ic-cross@2x.png",
+      "filename" : "img-home@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic-cross@3x.png",
+      "filename" : "img-home@3x.png",
       "scale" : "3x"
     }
   ],

Emome/Base.lproj/LaunchScreen.storyboard

@@ -16,7 +16,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <animations/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.89803921568627454" green="0.89803921568627454" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>