Merge in updates

Author: Joey Lorich

EasyReader/Application/Controllers/Menu/EZRMenuViewController.m

@@ -40,6 +40,9 @@ @interface EZRMenuViewController ()
 /// The current feeds provider
 @property (nonatomic, strong) EZRCurrentFeedsProvider *currentFeedsProvider;
 
+/// Height Menu to modify
+@property (nonatomic, weak) IBOutlet NSLayoutConstraint *menuHeight;
+
 @end
 
 
@@ -94,28 +97,19 @@ - (void)feedsDidChange:(EZRCurrentFeedsProvider *)currentFeedProvider feeds:(NSA
 - (void)searchStateChanged:(NSNotification *)notification {
     EZRSearchState event = [[[notification userInfo] objectForKey:@"searchState"] intValue];
 
-    CGRect oldFrame = self.menuContainerViewController.leftMenuViewController.view.frame;
-    UIViewController *newLeftController = self.menuContainerViewController.leftMenuViewController;
-    
     switch (event) {
         case kEZRSearchStateStartedSearching:
         {
             self.tableView_menu.dataSource = self.searchFeedDataSource;
-            
-            newLeftController.view.frame = CGRectMake(oldFrame.origin.x, oldFrame.origin.y, oldFrame.size.width, 361.0);
-            self.menuContainerViewController.leftMenuViewController = newLeftController;
-            [self.searchBar becomeFirstResponder];
-            
+            self.menuHeight.constant = self.menuHeight.constant*.6;
             break;
         }
         case kEZRSearchStateStoppedSearching:
+        {
             self.tableView_menu.dataSource = self.userFeedDataSource;
-            
-            newLeftController.view.frame = CGRectMake(oldFrame.origin.x, oldFrame.origin.y, oldFrame.size.width, 568.0);
-            self.menuContainerViewController.leftMenuViewController = newLeftController;
-            
+            self.menuHeight.constant = self.menuHeight.constant/.6;
             break;
-            
+        }
         case kEZRSearchStateResultsAvailable:
             // Do nothing, just need to realod
             break;

EasyReader/Application/Views/Main_iPhone.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13C64" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="Hgn-0q-Z1W">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="Hgn-0q-Z1W">
     <dependencies>
         <deployment defaultVersion="1792" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
@@ -217,6 +217,9 @@
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="568" id="Q3P-BD-mqw"/>
+                                </constraints>
                                 <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <view key="tableHeaderView" contentMode="scaleToFill" id="Nnv-Cw-nbp">
                                     <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
@@ -316,13 +319,13 @@
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="14d-Nx-0xr" secondAttribute="trailing" id="2ek-R2-wR0"/>
                             <constraint firstItem="14d-Nx-0xr" firstAttribute="top" secondItem="C4i-F3-dmc" secondAttribute="bottom" id="6yU-gL-jQ1"/>
-                            <constraint firstItem="s5I-Ee-yuh" firstAttribute="top" secondItem="14d-Nx-0xr" secondAttribute="bottom" id="OvM-WD-RTl"/>
                             <constraint firstItem="14d-Nx-0xr" firstAttribute="leading" secondItem="6fH-J0-YTO" secondAttribute="leading" id="RBu-zY-A5b"/>
                         </constraints>
                     </view>
                     <nil key="simulatedStatusBarMetrics"/>
                     <nil key="simulatedTopBarMetrics"/>
                     <connections>
+                        <outlet property="menuHeight" destination="Q3P-BD-mqw" id="CUd-ac-fpj"/>
                         <outlet property="searchBar" destination="6U4-aC-Dql" id="5As-xt-K3v"/>
                         <outlet property="searchFeedDataSource" destination="Kyf-fs-6tv" id="UKM-0P-nBF"/>
                         <outlet property="tableView_menu" destination="14d-Nx-0xr" id="V1g-Kc-z5U"/>