layout fixes

5 files changed, 44 insertions, 60 deletions

diff --git a/Juick/Main.storyboard b/Juick/Main.storyboard
index d6698e4..2a274d9 100644
--- a/Juick/Main.storyboard
+++ b/Juick/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="XnR-Hh-t65">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="zgP-bN-c50">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -10,27 +10,21 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Item-->
-        <scene sceneID="97k-sM-CYI">
+        <!--Navigation Controller-->
+        <scene sceneID="PGG-a7-Z19">
             <objects>
-                <navigationController toolbarHidden="NO" id="meX-Jy-oiG" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Item" id="83t-gu-V4H"/>
-                    <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Rtg-Ag-BXy">
+                <navigationController id="zgP-bN-c50" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="B1R-tc-Ps2">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
-                    <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="tdc-JF-lSX">
-                        <rect key="frame" x="0.0" y="574" width="375" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </toolbar>
                     <connections>
-                        <segue destination="VCH-GK-jaH" kind="relationship" relationship="rootViewController" id="3ou-Pe-XsC"/>
+                        <segue destination="XnR-Hh-t65" kind="relationship" relationship="rootViewController" id="S6h-3C-cZ3"/>
                     </connections>
                 </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="e3G-bn-wym" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="u8u-do-Fxy" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-1153.125" y="-186.75999999999999"/>
+            <point key="canvasLocation" x="-1667" y="-1060"/>
         </scene>
         <!--Thread View Controller-->
         <scene sceneID="hRe-9n-wGd">
@@ -72,9 +66,26 @@
                         <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="calibratedWhite"/>
+                        <toolbar key="tableHeaderView" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="Whi-G7-JTB">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                            <items>
+                                <barButtonItem image="chats_icon" id="eaY-Yt-u9g">
+                                    <connections>
+                                        <action selector="filterAction:" destination="VCH-GK-jaH" id="m3s-pS-GdV"/>
+                                    </connections>
+                                </barButtonItem>
+                                <barButtonItem style="plain" systemItem="flexibleSpace" id="JhF-fJ-DQL"/>
+                                <barButtonItem systemItem="compose" id="ovc-xl-vHA">
+                                    <connections>
+                                        <segue destination="rr1-jx-MLx" kind="push" id="vj1-M0-h6U"/>
+                                    </connections>
+                                </barButtonItem>
+                            </items>
+                        </toolbar>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="prototypeMessage" id="Orz-mD-PnE">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="72" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Orz-mD-PnE" id="WRd-ev-Osb">
                                     <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
@@ -90,20 +101,8 @@
                             <outlet property="delegate" destination="VCH-GK-jaH" id="a3g-k1-u9r"/>
                         </connections>
                     </tableView>
-                    <tabBarItem key="tabBarItem" title="Item" id="Je4-Zm-Zbu"/>
-                    <toolbarItems>
-                        <barButtonItem image="chats_icon" id="eaY-Yt-u9g">
-                            <connections>
-                                <action selector="filterAction:" destination="VCH-GK-jaH" id="m3s-pS-GdV"/>
-                            </connections>
-                        </barButtonItem>
-                        <barButtonItem style="plain" systemItem="flexibleSpace" id="JhF-fJ-DQL"/>
-                        <barButtonItem systemItem="compose" id="ovc-xl-vHA">
-                            <connections>
-                                <segue destination="rr1-jx-MLx" kind="push" id="vj1-M0-h6U"/>
-                            </connections>
-                        </barButtonItem>
-                    </toolbarItems>
+                    <tabBarItem key="tabBarItem" title="Discover" image="nearby_icon" id="Je4-Zm-Zbu"/>
+                    <toolbarItems/>
                     <navigationItem key="navigationItem" id="M2f-nV-K0C">
                         <barButtonItem key="rightBarButtonItem" title="Item" image="settings_icon" style="plain" id="Sd1-hN-fdS">
                             <connections>
@@ -125,7 +124,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iqI-7F-B8z">
-                                <rect key="frame" x="6" y="205" width="363" height="228"/>
+                                <rect key="frame" x="6" y="251.5" width="363" height="228"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="7kK-2B-ICG">
                                     <rect key="frame" x="0.0" y="0.0" width="363" height="228"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -248,30 +247,13 @@
                             <outlet property="delegate" destination="vqF-gx-pZG" id="xKF-Xt-zWe"/>
                         </connections>
                     </tableView>
-                    <tabBarItem key="tabBarItem" title="Item" id="vxB-Z9-1il"/>
-                    <navigationItem key="navigationItem" title="Notifications" id="hVh-CA-hQo"/>
+                    <tabBarItem key="tabBarItem" title="Chats" image="chats_icon" id="vxB-Z9-1il"/>
+                    <navigationItem key="navigationItem" title="Chats" id="hVh-CA-hQo"/>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="8ge-Xf-wBN" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="294" y="666"/>
         </scene>
-        <!--Item-->
-        <scene sceneID="uim-Nh-TgZ">
-            <objects>
-                <navigationController id="5uj-cs-Oeg" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Item" id="V9z-ea-0Yt"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="z7X-OF-hhE">
-                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="vqF-gx-pZG" kind="relationship" relationship="rootViewController" id="ufB-2X-yDu"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="klE-aM-KuP" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-202" y="666"/>
-        </scene>
         <!--New post-->
         <scene sceneID="bF2-U0-WHJ">
             <objects>
@@ -281,7 +263,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="510"/>
+                                <rect key="frame" x="4" y="60" width="367" height="603"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -349,14 +331,15 @@
         <scene sceneID="R7v-av-S80">
             <objects>
                 <tabBarController id="XnR-Hh-t65" sceneMemberID="viewController">
+                    <navigationItem key="navigationItem" id="Ub2-5o-fwx"/>
                     <tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Qqp-Yg-IzB">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </tabBar>
                     <connections>
-                        <segue destination="meX-Jy-oiG" kind="relationship" relationship="viewControllers" id="XZu-DW-wVU"/>
-                        <segue destination="5uj-cs-Oeg" kind="relationship" relationship="viewControllers" id="rhN-wq-V4r"/>
+                        <segue destination="VCH-GK-jaH" kind="relationship" relationship="viewControllers" id="tRL-5K-f5Z"/>
+                        <segue destination="vqF-gx-pZG" kind="relationship" relationship="viewControllers" id="HL4-7U-gP6"/>
                     </connections>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="AnM-ht-zf8" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -367,6 +350,7 @@
     <resources>
         <image name="Splash.png" width="96" height="96"/>
         <image name="chats_icon" width="20" height="22"/>
+        <image name="nearby_icon" width="20" height="20"/>
         <image name="settings_icon" width="20" height="20"/>
     </resources>
     <inferredMetricsTieBreakers>
diff --git a/Juick/Supporting Files/Juick-Info.plist b/Juick/Supporting Files/Juick-Info.plist
index f04104f..c50b6d6 100644
--- a/Juick/Supporting Files/Juick-Info.plist
+++ b/Juick/Supporting Files/Juick-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>46</string>
+	<string>47</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Juick/ViewControllers/ChatViewController.m b/Juick/ViewControllers/ChatViewController.m
index f88bfa5..e94bb40 100644
--- a/Juick/ViewControllers/ChatViewController.m
+++ b/Juick/ViewControllers/ChatViewController.m
@@ -18,7 +18,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+    [self.navigationController.visibleViewController setTitle:self.uname];
     [self.tableView registerNib:[UINib nibWithNibName:@"BubbleMessageCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"bubbleMessageCell"];
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeInteractive;
diff --git a/Juick/ViewControllers/DialogsViewController.m b/Juick/ViewControllers/DialogsViewController.m
index 878e912..4f89814 100644
--- a/Juick/ViewControllers/DialogsViewController.m
+++ b/Juick/ViewControllers/DialogsViewController.m
@@ -20,7 +20,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+    [self.navigationController.visibleViewController setTitle:@"Chats"];
     [self.view setBackgroundColor:[ColorScheme mainBackground]];
     [self.tableView registerNib:[UINib nibWithNibName:@"ConversationCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"notificationCell"];
     self.chats = [NSMutableArray array];
diff --git a/Juick/ViewControllers/DiscoverViewController.m b/Juick/ViewControllers/DiscoverViewController.m
index 1b1a0a1..c874c25 100644
--- a/Juick/ViewControllers/DiscoverViewController.m
+++ b/Juick/ViewControllers/DiscoverViewController.m
@@ -28,7 +28,7 @@ AppDelegate *appDelegate;
             if (success) {
                 if ([self.path length] == 0) {
                     self.path = [APIClient feedUrl];
-                    [self setTitle:@"My feed"];
+                    [self.navigationController.visibleViewController setTitle:@"My feed"];
                 }
                 [self refreshData:NO];
             } else {
@@ -39,7 +39,7 @@ AppDelegate *appDelegate;
     } else {
         if ([self.path length] == 0) {
             self.path = [APIClient messagesUrl];
-            [self setTitle:@"Discover"];
+            [self.navigationController.visibleViewController setTitle:@"Discover"];
         }
         [self refreshData:NO];
     }
@@ -77,7 +77,7 @@ AppDelegate *appDelegate;
     UIAlertController *filterAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
     [filterAlert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
     [filterAlert addAction:[UIAlertAction actionWithTitle:@"My feed" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        [self setTitle:@"My feed"];
+        [self.navigationController.visibleViewController setTitle:@"My feed"];
         self.path = [APIClient feedUrl];
         self.params = nil;
         [self.messages removeAllObjects];
@@ -85,7 +85,7 @@ AppDelegate *appDelegate;
         [self refreshData:NO];
     }]];
     [filterAlert addAction:[UIAlertAction actionWithTitle:@"Discover" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        [self setTitle:@"Discover"];
+        [self.navigationController.visibleViewController setTitle:@"Discover"];
         self.path = [APIClient messagesUrl];
         self.params = nil;
         [self.messages removeAllObjects];
@@ -93,7 +93,7 @@ AppDelegate *appDelegate;
         [self refreshData:NO];
     }]];
     [filterAlert addAction:[UIAlertAction actionWithTitle:@"Discussions" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        [self setTitle:@"Discussions"];
+        [self.navigationController.visibleViewController setTitle:@"Discussions"];
         self.path = [APIClient discussionsUrl];
         self.params = nil;
         [self.messages removeAllObjects];