Add example with tabs on the bottom

Jose Alcalá Correa · Jose Alcalá Correa · commit b2856198baa8 · 2016-11-17T11:53:12.000+01:00
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -41,6 +41,7 @@
 		C0752A5D1C95EF9C000543E3 /* GSKTwitterExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C0752A5C1C95EF9C000543E3 /* GSKTwitterExampleViewController.m */; };
 		C086E0031C846309002A54C1 /* GSKExampleNavigationBarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C086E0021C846309002A54C1 /* GSKExampleNavigationBarViewController.m */; };
 		C086E00A1C846C5E002A54C1 /* GSKExampleBaseTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C086E0091C846C5E002A54C1 /* GSKExampleBaseTableViewController.m */; };
+		C08935C61DD5D96B00BA8078 /* TabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C08935C51DD5D96B00BA8078 /* TabBarViewController.swift */; };
 		C090247B1C901F2300264C0D /* GSKVisibleSectionHeadersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C090247A1C901F2300264C0D /* GSKVisibleSectionHeadersViewController.m */; };
 		C0F6F5B71CA9571F00026142 /* GSKTwitterStretchyHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0F6F5B61CA9571F00026142 /* GSKTwitterStretchyHeaderView.m */; };
 /* End PBXBuildFile section */
@@ -119,6 +120,7 @@
 		C086E0021C846309002A54C1 /* GSKExampleNavigationBarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GSKExampleNavigationBarViewController.m; sourceTree = "<group>"; };
 		C086E0081C846C5E002A54C1 /* GSKExampleBaseTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSKExampleBaseTableViewController.h; sourceTree = "<group>"; };
 		C086E0091C846C5E002A54C1 /* GSKExampleBaseTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GSKExampleBaseTableViewController.m; sourceTree = "<group>"; };
+		C08935C51DD5D96B00BA8078 /* TabBarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabBarViewController.swift; sourceTree = "<group>"; };
 		C09024791C901F2300264C0D /* GSKVisibleSectionHeadersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSKVisibleSectionHeadersViewController.h; sourceTree = "<group>"; };
 		C090247A1C901F2300264C0D /* GSKVisibleSectionHeadersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GSKVisibleSectionHeadersViewController.m; sourceTree = "<group>"; };
 		C0F6F5B51CA9571F00026142 /* GSKTwitterStretchyHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSKTwitterStretchyHeaderView.h; sourceTree = "<group>"; };
@@ -252,12 +254,6 @@
 				C086E0071C846C4F002A54C1 /* Base view controllers */,
 				C086E0001C8462D6002A54C1 /* Data source */,
 				C086DFFF1C8462C9002A54C1 /* Cells */,
-				C03FC4E51C81B2FE0015FAAA /* UINavigationController+Transparency.h */,
-				C03FC4E61C81B2FE0015FAAA /* UINavigationController+Transparency.m */,
-				C03FC4E81C81B3250015FAAA /* GSKExampleCollectionViewController.h */,
-				C03FC4E91C81B3250015FAAA /* GSKExampleCollectionViewController.m */,
-				C03FC4EA1C81B3250015FAAA /* GSKExampleTableViewController.h */,
-				C03FC4EB1C81B3250015FAAA /* GSKExampleTableViewController.m */,
 				C03FC4FA1C8348150015FAAA /* GSKExampleTabsViewController.h */,
 				C03FC4FB1C8348150015FAAA /* GSKExampleTabsViewController.m */,
 				C086E0011C846309002A54C1 /* GSKExampleNavigationBarViewController.h */,
@@ -269,6 +265,7 @@
 				C0752A5B1C95EF9C000543E3 /* GSKTwitterExampleViewController.h */,
 				C0752A5C1C95EF9C000543E3 /* GSKTwitterExampleViewController.m */,
 				82469C511CF3A0D600D3335A /* ScalableLabelViewController.swift */,
+				C08935C51DD5D96B00BA8078 /* TabBarViewController.swift */,
 			);
 			name = "View Controllers";
 			sourceTree = "<group>";
@@ -330,6 +327,12 @@
 			children = (
 				C086E0081C846C5E002A54C1 /* GSKExampleBaseTableViewController.h */,
 				C086E0091C846C5E002A54C1 /* GSKExampleBaseTableViewController.m */,
+				C03FC4E51C81B2FE0015FAAA /* UINavigationController+Transparency.h */,
+				C03FC4E61C81B2FE0015FAAA /* UINavigationController+Transparency.m */,
+				C03FC4E81C81B3250015FAAA /* GSKExampleCollectionViewController.h */,
+				C03FC4E91C81B3250015FAAA /* GSKExampleCollectionViewController.m */,
+				C03FC4EA1C81B3250015FAAA /* GSKExampleTableViewController.h */,
+				C03FC4EB1C81B3250015FAAA /* GSKExampleTableViewController.m */,
 			);
 			name = "Base view controllers";
 			sourceTree = "<group>";
@@ -365,7 +368,7 @@
 			attributes = {
 				CLASSPREFIX = GSK;
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0810;
 				ORGANIZATIONNAME = "Jose Alcalá Correa";
 				TargetAttributes = {
 					6003F589195388D20070C39A = {
@@ -464,6 +467,7 @@
 				C03FC4F41C820C9C0015FAAA /* GSKNibStretchyHeaderView.m in Sources */,
 				C066207A1C87311000F1AEF5 /* GSKAirbnbExampleViewController.m in Sources */,
 				C03FC5031C8348150015FAAA /* GSKExampleTabsViewController.m in Sources */,
+				C08935C61DD5D96B00BA8078 /* TabBarViewController.swift in Sources */,
 				C0752A5D1C95EF9C000543E3 /* GSKTwitterExampleViewController.m in Sources */,
 				C090247B1C901F2300264C0D /* GSKVisibleSectionHeadersViewController.m in Sources */,
 				6003F59E195388D20070C39A /* GSKAppDelegate.m in Sources */,
@@ -517,14 +521,19 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
diff --git a/Example/GSKStretchyHeaderView/Example-Bridging-Header.h b/Example/GSKStretchyHeaderView/Example-Bridging-Header.h
@@ -7,3 +7,10 @@
 #import "GSKExampleBaseTableViewController.h"
 #import "UINavigationController+Transparency.h"
 #import "UIView+GSKLayoutHelper.h"
+
+
+#import "GSKExampleData.h"
+#import "GSKExampleTableViewController.h"
+#import "GSKExampleCollectionViewController.h"
+#import "GSKVisibleSectionHeadersViewController.h"
+#import "GSKAirbnbExampleViewController.h"
diff --git a/Example/GSKStretchyHeaderView/GSKExampleBaseTableViewController.m b/Example/GSKStretchyHeaderView/GSKExampleBaseTableViewController.m
@@ -9,10 +9,26 @@ @interface GSKExampleBaseTableViewController ()
 
 @implementation GSKExampleBaseTableViewController
 
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.title = [self defaultTitle];
+    }
+    return self;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
-
+    
     self.automaticallyAdjustsScrollViewInsets = NO;
+    UIEdgeInsets contentInset = self.tableView.contentInset;
+    if (self.navigationController) {
+        contentInset.top = 64;
+    }
+    if (self.tabBarController) {
+        contentInset.bottom = 44;
+    }
+    self.tableView.contentInset = contentInset;
 
     _stretchyHeaderView = [self loadStretchyHeaderView];
     [self.tableView addSubview:self.stretchyHeaderView];
@@ -21,6 +37,14 @@ - (void)viewDidLoad {
     [self.dataSource registerForTableView:self.tableView];
 }
 
+- (NSString *)defaultTitle {
+    NSString *className = NSStringFromClass(self.class);
+    NSString *lastComponent = [className componentsSeparatedByString:@"."].lastObject;
+    NSString *title = [lastComponent stringByReplacingOccurrencesOfString:@"ViewController" withString:@""];
+    title = [title stringByReplacingOccurrencesOfString:@"Example" withString:@""];
+    title = [title stringByReplacingOccurrencesOfString:@"GSK" withString:@""];
+    return title;
+}
 
 - (GSKStretchyHeaderView *)loadStretchyHeaderView {
     NSAssert(NO, @"please override %@", NSStringFromSelector(_cmd));
diff --git a/Example/GSKStretchyHeaderView/GSKExampleCollectionViewController.h b/Example/GSKStretchyHeaderView/GSKExampleCollectionViewController.h
@@ -1,8 +1,12 @@
 @import UIKit;
 #import "GSKExampleData.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface GSKExampleCollectionViewController : UICollectionViewController
 
 - (instancetype)initWithData:(GSKExampleData *)data;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Example/GSKStretchyHeaderView/GSKExampleCollectionViewController.m b/Example/GSKStretchyHeaderView/GSKExampleCollectionViewController.m
@@ -3,6 +3,8 @@
 #import "UINavigationController+Transparency.h"
 #import "GSKExampleDataSource.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 static const NSUInteger kNumberOfRows = 100;
 
 @interface GSKExampleCollectionViewController () <UICollectionViewDelegateFlowLayout>
@@ -63,3 +65,5 @@ - (CGSize)collectionView:(UICollectionView *)collectionView
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Example/GSKStretchyHeaderView/GSKExampleData.h b/Example/GSKStretchyHeaderView/GSKExampleData.h
@@ -5,9 +5,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface GSKExampleData : NSObject
 
 @property (nonatomic, readonly) NSString *title;
-@property (nonatomic, readonly) Class viewControllerClass;
-@property (nonatomic, readonly) Class headerViewClass;
-@property (nonatomic, readonly) NSString *nibName;
+@property (nullable, nonatomic, readonly) Class viewControllerClass;
+@property (nullable, nonatomic, readonly) Class headerViewClass;
+@property (nullable, nonatomic, readonly) NSString *nibName;
 @property (nonatomic) BOOL navigationBarVisible; // default NO
 @property (nonatomic) CGFloat headerViewInitialHeight; // default 240
 
diff --git a/Example/GSKStretchyHeaderView/GSKExampleData.m b/Example/GSKStretchyHeaderView/GSKExampleData.m
@@ -3,9 +3,9 @@
 @interface GSKExampleData ()
 
 @property (nonatomic) NSString *title;
-@property (nonatomic) Class viewControllerClass;
-@property (nonatomic) Class headerViewClass;
-@property (nonatomic) NSString *nibName;
+@property (nullable, nonatomic) Class viewControllerClass;
+@property (nullable, nonatomic) Class headerViewClass;
+@property (nullable, nonatomic) NSString *nibName;
 
 @end
 
diff --git a/Example/GSKStretchyHeaderView/GSKExampleListViewController.m b/Example/GSKStretchyHeaderView/GSKExampleListViewController.m
@@ -47,16 +47,19 @@ - (void)viewDidLoad {
     GSKExampleData *nib = [GSKExampleData dataWithTitle:@"From a XIB file (+ expansion modes)"
                                       headerViewNibName:@"GSKNibStretchyHeaderView"];
 
-    GSKExampleData *tabs = [GSKExampleData dataWithTitle:@"With tabs"
+    GSKExampleData *tabs = [GSKExampleData dataWithTitle:@"With tabs on top"
                                      viewControllerClass:[GSKExampleTabsViewController class]];
-
+    
     GSKExampleData *navBar = [GSKExampleData dataWithTitle:@"Below the navigation bar"
                                        viewControllerClass:[GSKExampleNavigationBarViewController class]];
+    
+    GSKExampleData *tabBarViewController = [GSKExampleData dataWithTitle:@"Tab bar view controller"
+                                                     viewControllerClass:[TabBarViewController class]];
 
     GSKExampleData *visibleHeaders = [GSKExampleData dataWithTitle:@"Visible section headers"
                                                viewControllerClass:[GSKVisibleSectionHeadersViewController class]];
 
-    self.exampleDatas = @[airbnb, twitter, spoty, scalableLabel, firstExample, nib, tabs, navBar, visibleHeaders];
+    self.exampleDatas = @[airbnb, twitter, spoty, scalableLabel, firstExample, nib, tabs, navBar, tabBarViewController, visibleHeaders];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
diff --git a/Example/GSKStretchyHeaderView/GSKExampleTableViewController.h b/Example/GSKStretchyHeaderView/GSKExampleTableViewController.h
@@ -1,10 +1,14 @@
 #import "GSKExampleBaseTableViewController.h"
 #import "GSKExampleData.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface GSKExampleTableViewController : GSKExampleBaseTableViewController
 
 @property (nonatomic, readonly) GSKExampleData *data;
 
 - (instancetype)initWithData:(GSKExampleData *)data;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Example/GSKStretchyHeaderView/GSKExampleTableViewController.m b/Example/GSKStretchyHeaderView/GSKExampleTableViewController.m
@@ -1,6 +1,8 @@
 #import "GSKExampleTableViewController.h"
 #import "UINavigationController+Transparency.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation GSKExampleTableViewController
 
 - (instancetype)initWithData:(GSKExampleData *)data {
@@ -25,14 +27,19 @@ - (GSKStretchyHeaderView *)loadStretchyHeaderView {
 
     if (self.data.headerViewClass) {
         headerView = [[self.data.headerViewClass alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, self.data.headerViewInitialHeight)];
-    } else {
+    } else if (self.data.nibName) {
         NSArray* nibViews = [[NSBundle mainBundle] loadNibNamed:self.data.nibName
                                                           owner:self
                                                         options:nil];
         headerView = nibViews.firstObject;
+    } else {
+        [NSException raise:@"Can't initialise header view"
+                    format:@"You must provide a header view in GSKExampleData instances"];
     }
 
     return headerView;
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Example/GSKStretchyHeaderView/GSKVisibleSectionHeadersViewController.m b/Example/GSKStretchyHeaderView/GSKVisibleSectionHeadersViewController.m
@@ -13,7 +13,10 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     
     // by setting contentInset.top, we set where the section headers will be fixed
-    self.tableView.contentInset = UIEdgeInsetsMake(self.stretchyHeaderView.minimumContentHeight, 0, 0, 0);
+    UIEdgeInsets contentInset = self.tableView.contentInset;
+    contentInset.top = self.stretchyHeaderView.minimumContentHeight;
+    self.tableView.contentInset = contentInset;
+    
     // we add an empty header view at the top of the table view to increase the initial offset before the first section header
     // otherwise the header view would cover the first cells
     self.tableView.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0,
diff --git a/Example/GSKStretchyHeaderView/TabBarViewController.swift b/Example/GSKStretchyHeaderView/TabBarViewController.swift
@@ -0,0 +1,21 @@
+//
+//  TabBarViewController.swift
+//  Example
+//
+//  Created by Jose Alcala on 11/11/16.
+//  Copyright © 2016 Jose Alcalá Correa. All rights reserved.
+//
+
+import UIKit
+
+class TabBarViewController: UITabBarController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.automaticallyAdjustsScrollViewInsets = false
+        self.viewControllers = [GSKAirbnbExampleViewController(),
+                                ScalableLabelViewController(),
+                                GSKVisibleSectionHeadersViewController()]
+    }
+    
+}
diff --git a/GSKStretchyHeaderView.xcworkspace/xcshareddata/xcschemes/Example.xcscheme b/GSKStretchyHeaderView.xcworkspace/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0810"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,7 +28,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6A6A3E8BEA5AAE37F75D8190C3C13240"
+               BlueprintIdentifier = "D4B2CB9D0510660F61E76886D25D9CAC"
                BuildableName = "GSKStretchyHeaderView.framework"
                BlueprintName = "GSKStretchyHeaderView"
                ReferencedContainer = "container:Example/Pods/Pods.xcodeproj">
diff --git a/GSKStretchyHeaderView/GSKStretchyHeaderView.xcodeproj/xcshareddata/xcschemes/GSKStretchyHeaderView.xcscheme b/GSKStretchyHeaderView/GSKStretchyHeaderView.xcodeproj/xcshareddata/xcschemes/GSKStretchyHeaderView.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0810"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
