Named colours

1 files changed, 17 insertions, 80 deletions

diff --git a/Juick/Main.storyboard b/Juick/Main.storyboard
index 68df202..13f6304 100644
--- a/Juick/Main.storyboard
+++ b/Juick/Main.storyboard
@@ -42,15 +42,13 @@
             </objects>
             <point key="canvasLocation" x="1520.8" y="-964.76761619190415"/>
         </scene>
-        <!--Navigation Controller-->
+        <!--Today-->
         <scene sceneID="NkO-CZ-YSO">
             <objects>
                 <navigationController id="k3X-uv-0IF" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" image="ei-clock" id="Qml-qG-fK2">
-                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
-                    </tabBarItem>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="3ze-yo-W7s">
-                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                    <tabBarItem key="tabBarItem" title="Today" image="ei-clock" id="Qml-qG-fK2"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="3ze-yo-W7s">
+                        <rect key="frame" x="0.0" y="20" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -62,10 +60,10 @@
             </objects>
             <point key="canvasLocation" x="-809" y="-162"/>
         </scene>
-        <!--Feed View Controller-->
+        <!--Today-->
         <scene sceneID="uvH-u9-x7X">
             <objects>
-                <tableViewController id="VCH-GK-jaH" customClass="FeedViewController" sceneMemberID="viewController">
+                <tableViewController title="Today" id="VCH-GK-jaH" customClass="FeedViewController" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="tbe-Zb-PfB">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -88,9 +86,7 @@
                             <outlet property="delegate" destination="VCH-GK-jaH" id="a3g-k1-u9r"/>
                         </connections>
                     </tableView>
-                    <tabBarItem key="tabBarItem" title="" image="ei-clock" id="Je4-Zm-Zbu">
-                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
-                    </tabBarItem>
+                    <tabBarItem key="tabBarItem" title="Today" image="ei-clock" id="Je4-Zm-Zbu"/>
                     <toolbarItems/>
                     <navigationItem key="navigationItem" id="M2f-nV-K0C">
                         <barButtonItem key="rightBarButtonItem" image="ei-pencil" id="ovc-xl-vHA">
@@ -231,13 +227,11 @@
             </objects>
             <point key="canvasLocation" x="-1052" y="599"/>
         </scene>
-        <!--Navigation Controller-->
+        <!--Chats-->
         <scene sceneID="slX-NB-ZJR">
             <objects>
                 <navigationController id="bqF-EV-jyA" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" image="ei-envelope" id="uDU-Ru-VA7">
-                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
-                    </tabBarItem>
+                    <tabBarItem key="tabBarItem" title="Chats" image="ei-envelope" id="uDU-Ru-VA7"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="MLM-G7-sIv">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -276,8 +270,7 @@
                             <outlet property="delegate" destination="vqF-gx-pZG" id="xKF-Xt-zWe"/>
                         </connections>
                     </tableView>
-                    <tabBarItem key="tabBarItem" title="" image="ei-envelope" id="vxB-Z9-1il">
-                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
+                    <tabBarItem key="tabBarItem" title="Chats" image="ei-envelope" id="vxB-Z9-1il">
                         <offsetWrapper key="titlePositionAdjustment" horizontal="0.0" vertical="0.0"/>
                     </tabBarItem>
                     <navigationItem key="navigationItem" title="Chats" id="hVh-CA-hQo"/>
@@ -295,7 +288,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="XYj-Y4-lfM">
-                                <rect key="frame" x="4" y="60" width="367" height="603"/>
+                                <rect key="frame" x="4" y="112" width="367" height="551"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -394,35 +387,6 @@
             </objects>
             <point key="canvasLocation" x="-808.79999999999995" y="-856.82158920539734"/>
         </scene>
-        <!--Profile-->
-        <scene sceneID="Zyp-VR-hlj">
-            <objects>
-                <tableViewController title="Profile" id="7Y0-3h-zWt" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="nT3-ZI-i7w">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="tSi-Pj-acC">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="tSi-Pj-acC" id="wk3-ZO-iIr">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                </tableViewCellContentView>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="7Y0-3h-zWt" id="1Bz-sa-FSr"/>
-                            <outlet property="delegate" destination="7Y0-3h-zWt" id="fqT-hp-VZl"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="vgf-KH-dbr"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="vQg-XX-fxE" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-3092" y="-162"/>
-        </scene>
         <!--Tab Bar Controller-->
         <scene sceneID="R7v-av-S80">
             <objects>
@@ -438,7 +402,6 @@
                         <segue destination="YkB-dq-pv4" kind="relationship" relationship="viewControllers" id="uQw-Xa-hwe"/>
                         <segue destination="wJv-nS-OaN" kind="relationship" relationship="viewControllers" id="5Pl-1T-DRQ"/>
                         <segue destination="bqF-EV-jyA" kind="relationship" relationship="viewControllers" id="L49-RF-BJa"/>
-                        <segue destination="c61-bC-EVf" kind="relationship" relationship="viewControllers" id="aPU-HP-Ctr"/>
                     </connections>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="AnM-ht-zf8" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -474,13 +437,11 @@
             </objects>
             <point key="canvasLocation" x="-2610.4000000000001" y="-856.82158920539734"/>
         </scene>
-        <!--Navigation Controller-->
+        <!--Discover-->
         <scene sceneID="rTx-Xr-jP4">
             <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="wJv-nS-OaN" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" image="ei-search" id="Hf1-fH-Ne9">
-                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
-                    </tabBarItem>
+                <navigationController title="Discover" automaticallyAdjustsScrollViewInsets="NO" id="wJv-nS-OaN" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="Discover" image="ei-search" id="Hf1-fH-Ne9"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="HfH-EY-4C6">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
@@ -495,13 +456,11 @@
             </objects>
             <point key="canvasLocation" x="-1748" y="-856.82158920539734"/>
         </scene>
-        <!--Navigation Controller-->
+        <!--Discussions-->
         <scene sceneID="PRP-vE-Jhi">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="YkB-dq-pv4" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" image="ei-bell" id="r5a-uD-dsg">
-                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
-                    </tabBarItem>
+                    <tabBarItem key="tabBarItem" title="Discussions" image="ei-bell" id="r5a-uD-dsg"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="1ry-Mk-20P">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
@@ -516,34 +475,12 @@
             </objects>
             <point key="canvasLocation" x="-3551.1999999999998" y="-857.72113943028489"/>
         </scene>
-        <!--Navigation Controller-->
-        <scene sceneID="y8S-HS-lIv">
-            <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="c61-bC-EVf" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" image="ei-gear" id="529-8F-A6e">
-                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
-                    </tabBarItem>
-                    <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Mr4-B4-jXb">
-                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <nil name="viewControllers"/>
-                    <connections>
-                        <segue destination="7Y0-3h-zWt" kind="relationship" relationship="rootViewController" id="iJd-OZ-Z0w"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="KlJ-5c-fac" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-3839" y="-162"/>
-        </scene>
     </scenes>
     <resources>
         <image name="Splash.png" width="96" height="96"/>
         <image name="ei-bell" width="34" height="32"/>
-        <image name="ei-clock" width="34" height="34"/>
+        <image name="ei-clock" width="30" height="30"/>
         <image name="ei-envelope" width="34" height="26"/>
-        <image name="ei-gear" width="32" height="32"/>
         <image name="ei-pencil" width="30" height="29"/>
         <image name="ei-search" width="32" height="32"/>
     </resources>