From 984434cca4b4e43a79fcc0aba3e7b2124374469b Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Sat, 27 Sep 2014 14:53:30 -0400
Subject: [PATCH] Remove header hack to inset password cells, use collection
 layout instead.

---
 MasterPassword/ObjC/iOS/MPPasswordsViewController.m | 12 ------------
 MasterPassword/ObjC/iOS/Storyboard.storyboard       | 10 +++-------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/MasterPassword/ObjC/iOS/MPPasswordsViewController.m b/MasterPassword/ObjC/iOS/MPPasswordsViewController.m
index b0dc155f..a5bd2e3c 100644
--- a/MasterPassword/ObjC/iOS/MPPasswordsViewController.m
+++ b/MasterPassword/ObjC/iOS/MPPasswordsViewController.m
@@ -105,12 +105,6 @@
 
 #pragma mark - UICollectionViewDelegateFlowLayout
 
-- (CGSize)       collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout
-referenceSizeForHeaderInSection:(NSInteger)section {
-
-    return CGSizeMake( collectionView.bounds.size.width, CGRectGetBottom( self.passwordsSearchBar.frame ).y );
-}
-
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout
   sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
 
@@ -147,12 +141,6 @@ referenceSizeForHeaderInSection:(NSInteger)section {
     return cell;
 }
 
-- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind
-                                 atIndexPath:(NSIndexPath *)indexPath {
-
-    return [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:@"MPPasswordHeader" forIndexPath:indexPath];
-}
-
 #pragma mark - UIScrollDelegate
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
diff --git a/MasterPassword/ObjC/iOS/Storyboard.storyboard b/MasterPassword/ObjC/iOS/Storyboard.storyboard
index 99038c25..12755ae4 100644
--- a/MasterPassword/ObjC/iOS/Storyboard.storyboard
+++ b/MasterPassword/ObjC/iOS/Storyboard.storyboard
@@ -1060,7 +1060,7 @@
         <!--Passwords View Controller-->
         <scene sceneID="I40-Es-1gK">
             <objects>
-                <viewController automaticallyAdjustsScrollViewInsets="NO" id="nkY-z6-8jd" customClass="MPPasswordsViewController" sceneMemberID="viewController">
+                <viewController id="nkY-z6-8jd" customClass="MPPasswordsViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="S9X-2T-e1e"/>
                         <viewControllerLayoutGuide type="bottom" id="c12-XI-Rv9"/>
@@ -1081,9 +1081,9 @@
                                                 <inset key="scrollIndicatorInsets" minX="0.0" minY="108" maxX="0.0" maxY="0.0"/>
                                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Mv1-29-TWx">
                                                     <size key="itemSize" width="300" height="100"/>
-                                                    <size key="headerReferenceSize" width="50" height="108"/>
+                                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
                                                     <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                                    <inset key="sectionInset" minX="10" minY="10" maxX="10" maxY="10"/>
+                                                    <inset key="sectionInset" minX="10" minY="118" maxX="10" maxY="10"/>
                                                 </collectionViewFlowLayout>
                                                 <cells>
                                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MPPasswordCell" id="W2g-yv-V3V" customClass="MPPasswordCell">
@@ -1475,10 +1475,6 @@
                                                         </connections>
                                                     </collectionViewCell>
                                                 </cells>
-                                                <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MPPasswordHeader" id="yzh-hh-YjZ">
-                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="108"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                </collectionReusableView>
                                                 <connections>
                                                     <outlet property="dataSource" destination="nkY-z6-8jd" id="5DW-tc-rAp"/>
                                                     <outlet property="delegate" destination="nkY-z6-8jd" id="xhr-Qn-SBe"/>