Large titles

6 files changed, 26 insertions, 13 deletions

diff --git a/Juick/AppDelegate.m b/Juick/AppDelegate.m
index 26b10a8..e4056e6 100644
--- a/Juick/AppDelegate.m
+++ b/Juick/AppDelegate.m
@@ -26,8 +26,9 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     [[UINavigationBar appearance] setTintColor:[ColorScheme linkColor]];
-    [[UINavigationBar appearance] setBarTintColor:[ColorScheme headerBackground]];
+    //[[UINavigationBar appearance] setBarTintColor:[ColorScheme headerBackground]];
     [[UINavigationBar appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName: [ColorScheme linkColor]}];
+    [[UINavigationBar appearance] setLargeTitleTextAttributes:@{NSForegroundColorAttributeName: [ColorScheme linkColor]}];
     [[UIToolbar appearance] setTintColor:[ColorScheme linkColor]];
     
     [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDefault;
diff --git a/Juick/Main.storyboard b/Juick/Main.storyboard
index 71391a9..7936373 100644
--- a/Juick/Main.storyboard
+++ b/Juick/Main.storyboard
@@ -102,8 +102,8 @@
                             </connections>
                         </barButtonItem>
                     </toolbarItems>
-                    <navigationItem key="navigationItem" title="Discover" id="M2f-nV-K0C">
-                        <barButtonItem key="leftBarButtonItem" image="profile_icon" id="Sd1-hN-fdS">
+                    <navigationItem key="navigationItem" id="M2f-nV-K0C">
+                        <barButtonItem key="rightBarButtonItem" image="profile_icon" style="plain" id="Sd1-hN-fdS">
                             <connections>
                                 <segue destination="4g9-hM-bzq" kind="push" id="6ha-6h-L0E"/>
                             </connections>
diff --git a/Juick/Supporting Files/Juick-Info.plist b/Juick/Supporting Files/Juick-Info.plist
index b3cfda5..2eb1c21 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>1.0.32</string>
+	<string>1.0.33</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Juick/ViewControllers/DiscoverViewController.m b/Juick/ViewControllers/DiscoverViewController.m
index 4a36cfe..9d7c43b 100644
--- a/Juick/ViewControllers/DiscoverViewController.m
+++ b/Juick/ViewControllers/DiscoverViewController.m
@@ -22,6 +22,12 @@ AppDelegate *appDelegate;
 
 -(void) viewDidLoad {
     [super viewDidLoad];
+    [self.navigationController.navigationBar setPrefersLargeTitles:YES];
+    if ([self.path isEqualToString:[APIClient feedUrl]]) {
+        [self setTitle:@"My feed"];
+    } else {
+        [self setTitle:@"Discover"];
+    }
     appDelegate = (AppDelegate *) [UIApplication sharedApplication].delegate;
     if (appDelegate.pushedThread != nil) {
         [self performSegueWithIdentifier:@"threadViewSegue" sender:self];
diff --git a/Juick/ViewControllers/ThreadViewController.m b/Juick/ViewControllers/ThreadViewController.m
index 8cb2cb5..3b6854c 100644
--- a/Juick/ViewControllers/ThreadViewController.m
+++ b/Juick/ViewControllers/ThreadViewController.m
@@ -16,6 +16,12 @@
 
 @implementation ThreadViewController
 
+
+-(void) viewDidLoad {
+    [super viewDidLoad];
+    [self setTitle:@"Thread"];
+}
+
 -(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     NSString * cellIdentifier = @"messageCell";
     MessageCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier forIndexPath:indexPath];
diff --git a/Juick/Views/MessageCell.xib b/Juick/Views/MessageCell.xib
index 2216ef4..e54c8f9 100644
--- a/Juick/Views/MessageCell.xib
+++ b/Juick/Views/MessageCell.xib
@@ -20,10 +20,10 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="Azj-pa-GEC">
-                        <rect key="frame" x="6" y="6" width="562" height="425.5"/>
+                        <rect key="frame" x="6" y="6" width="574" height="425.5"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="7FT-kJ-84d">
-                                <rect key="frame" x="0.0" y="0.0" width="562" height="48"/>
+                                <rect key="frame" x="0.0" y="0.0" width="574" height="48"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CZk-Q8-JqS">
                                         <rect key="frame" x="0.0" y="0.0" width="48" height="48"/>
@@ -33,16 +33,16 @@
                                         </constraints>
                                     </imageView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="o3h-ci-LWF">
-                                        <rect key="frame" x="60" y="0.0" width="502" height="48"/>
+                                        <rect key="frame" x="60" y="0.0" width="574" height="48"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CHd-h0-hPk">
-                                                <rect key="frame" x="0.0" y="0.0" width="502" height="20"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="574" height="20"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AVu-qV-q84">
-                                                <rect key="frame" x="0.0" y="32" width="502" height="16"/>
+                                                <rect key="frame" x="0.0" y="32" width="574" height="16"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
@@ -52,7 +52,7 @@
                                 </subviews>
                             </stackView>
                             <view contentMode="scaleToFill" verticalCompressionResistancePriority="749" translatesAutoresizingMaskIntoConstraints="NO" id="N08-my-2Lr" customClass="TagListView">
-                                <rect key="frame" x="0.0" y="60" width="562" height="36.5"/>
+                                <rect key="frame" x="0.0" y="60" width="574" height="37"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
@@ -79,20 +79,20 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zZm-hh-bDO" customClass="TTTAttributedLabel">
-                                <rect key="frame" x="0.0" y="108.5" width="562" height="21"/>
+                                <rect key="frame" x="0.0" y="109" width="574" height="20.5"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Uha-ow-kFJ">
-                                <rect key="frame" x="0.0" y="141.5" width="562" height="256"/>
+                                <rect key="frame" x="0.0" y="141.5" width="574" height="256"/>
                                 <constraints>
                                     <constraint firstAttribute="height" priority="999" constant="256" identifier="attachHeight" id="Cuq-dQ-VYU"/>
                                     <constraint firstAttribute="width" priority="999" constant="256" id="oJg-1R-jp3"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aJE-mZ-MCS">
-                                <rect key="frame" x="0.0" y="409.5" width="562" height="16"/>
+                                <rect key="frame" x="0.0" y="409.5" width="574" height="16"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>