SnappingViewController is UITableViewController subclass…

- added autorotation support - cleaned up
bhr · May 15, 2014 · d99ca93 · d99ca93
1 parent 0fa8999
commit d99ca93
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 33 deletions.
diff --git a/BHRSnappingTableView/BHRSnappingTableViewController.h b/BHRSnappingTableView/BHRSnappingTableViewController.h
@@ -9,8 +9,6 @@
 #import <UIKit/UIKit.h>
 #import "BHRSnappingTableView.h"
 
-@interface BHRSnappingTableViewController : UIViewController
-
-@property (nonatomic, strong, readonly) BHRSnappingTableView *tableView;
+@interface BHRSnappingTableViewController : UITableViewController
 
 @end
diff --git a/BHRSnappingTableView/BHRSnappingTableViewController.m b/BHRSnappingTableView/BHRSnappingTableViewController.m
@@ -11,8 +11,7 @@
 
 @interface BHRSnappingTableViewController () <UIScrollViewDelegate, UITableViewDelegate>
 
-@property (nonatomic, strong) BHRSnappingTableView *tableView;
-
+@property (nonatomic, assign) BOOL resetContentOffset;
 @property (nonatomic, assign) CGPoint previousTargetContentOffset;
 
 @end
@@ -21,14 +20,45 @@ @implementation BHRSnappingTableViewController
 
 #pragma mark - UIViewController overrides
 
+- (void) loadView
+{
+	BHRSnappingTableView* snappingTableView = [[BHRSnappingTableView alloc]initWithFrame:CGRectZero
+																				   style:UITableViewStylePlain];
+
+	snappingTableView.delegate = self;
+
+	self.view = snappingTableView;
+	self.tableView = snappingTableView;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+	self.resetContentOffset = YES;
+}
+
 - (void)viewDidLayoutSubviews
 {
 	[super viewDidLayoutSubviews];
 
-	CGPoint defaultContentOffset = CGPointMake(0.0f,
-											   CGRectGetHeight(self.tableView.tableHeaderView.bounds));
-	self.previousTargetContentOffset = defaultContentOffset;
-	[self.tableView setContentOffset:defaultContentOffset];
+	CGFloat tableViewHeaderHeight = CGRectGetHeight(self.tableView.tableHeaderView.bounds);
+	if (self.resetContentOffset &&
+		self.tableView.contentOffset.y < tableViewHeaderHeight)
+	{
+		CGPoint defaultContentOffset = CGPointMake(0.0f,
+												   tableViewHeaderHeight);
+		self.previousTargetContentOffset = defaultContentOffset;
+		[self.tableView setContentOffset:defaultContentOffset];
+		self.resetContentOffset = NO;
+	}
+}
+
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+{
+	[super willRotateToInterfaceOrientation:toInterfaceOrientation
+								   duration:duration];
+
+	self.resetContentOffset = YES;
 }
 
 #pragma mark - UIScrollViewDelegate
@@ -80,27 +110,4 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView
 	*targetContentOffset = newOffset;
 }
 
-
-- (BHRSnappingTableView *)tableView
-{
-	if (!_tableView)
-	{
-		_tableView = [[BHRSnappingTableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
-		_tableView.translatesAutoresizingMaskIntoConstraints = NO;
-		_tableView.delegate = self;
-
-		[self.view addSubview:_tableView];
-		[self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_tableView]|"
-																		  options:0
-																		  metrics:nil
-																			views:NSDictionaryOfVariableBindings(_tableView)]];
-		[self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_tableView]|"
-																		  options:0
-																		  metrics:nil
-																			views:NSDictionaryOfVariableBindings(_tableView)]];
-	}
-
-	return _tableView;
-}
-
 @end
diff --git a/BHRSnappingTableView/BHRViewController.m b/BHRSnappingTableView/BHRViewController.m
@@ -25,6 +25,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
+	self.edgesForExtendedLayout = UIRectEdgeNone;
 	self.itemsCount = kLowNumberOfItems;
 
 	[self _setUpTable];
@@ -85,7 +86,7 @@ - (UIView *)headerView
 					  action:@selector(changeNumberOfItems:)
 			forControlEvents:UIControlEventTouchUpInside];
 
-				[_headerView addSubview:addButton];
+		[_headerView addSubview:addButton];
 		[_headerView addConstraint:[NSLayoutConstraint constraintWithItem:_headerView
 																attribute:NSLayoutAttributeCenterX
 																relatedBy:NSLayoutRelationEqual