Fix tab bar controller after changes in content view controller

Author: danielctull

DCTTabBarController/DCTTabBarController.m

@@ -38,8 +38,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #import "UIView+DCTSubviewExtensions.h"
 #import "UIResponder+DCTNextResponderExtensions.h"
 
-NSUInteger const DCTTabBarUnselectedIndex = -1;
-
 @interface DCTTabBarController ()
 - (void)dctInternal_setUpTabBarItems;
 - (void)dctInternal_sendDelegateMessageDidSelectViewController:(UIViewController *)viewController;
@@ -74,7 +72,9 @@ - (id)init {
 	if (!(self = [super init])) return nil;
 
 	self.position = DCTContentBarPositionBottom;
-	selectedIndex = DCTTabBarUnselectedIndex;
+	self.barHidden = NO;
+	self.landscapeBarSize = CGSizeMake(480.0f, 49.0f);
+	self.portraitBarSize = CGSizeMake(320.0f, 49.0f);
 
 	return self;
 }
@@ -90,11 +90,11 @@ - (void)viewDidUnload {
 - (void)viewDidLoad {
 	[self dctInternal_setUpTabBarItems];
 	self.barView = self.tabBar;
-	if (self.selectedIndex == DCTTabBarUnselectedIndex) self.selectedIndex = 0;
+	self.selectedIndex = self.selectedIndex;
 	self.tabBar.selectedItem = [self.tabBar.items objectAtIndex:self.selectedIndex];
 	self.tabBar.delegate = self;
 	[super viewDidLoad];
-	[self loadContentView];
+	
 	viewIsLoaded = YES;
 }
 
@@ -140,26 +140,25 @@ - (void)setTabBarHidden:(BOOL)hidden animated:(BOOL)animated {
 }
 
 - (void)loadContentView {
-	
-	BOOL firstLoad = [self.contentView dct_hasSubviews];
-	
-	//[self.contentView dct_removeAllSubviews]; 
-	
-	if (firstLoad) [self dctInternal_refreshNavigationControllerItems];
+	if ([self isContentViewLoaded]) [self dctInternal_refreshNavigationControllerItems];
 }
 
 #pragma mark -
 #pragma mark Accessors
 
 - (void)setSelectedIndex:(NSUInteger)integer {
 
-	if (integer == selectedIndex) return;
+	BOOL firstLoad = [self isContentViewLoaded];
+	
+	if (!firstLoad && integer == selectedIndex) return;
 
 	UIViewController *oldVC = nil;
-	if (selectedIndex != DCTTabBarUnselectedIndex) oldVC = self.selectedViewController;
+	if (!firstLoad) oldVC = self.selectedViewController;
 
 	selectedIndex = integer;
+	
 	UIViewController *newVC = self.selectedViewController;
+	
 	newVC.view.frame = self.contentView.bounds;
 
 	[oldVC viewWillDisappear:NO];
@@ -173,7 +172,6 @@ - (void)setSelectedIndex:(NSUInteger)integer {
 }
 
 - (UIViewController *)selectedViewController {
-	if (self.selectedIndex == DCTTabBarUnselectedIndex) self.selectedIndex = 0;
 	return [viewControllers objectAtIndex:self.selectedIndex];
 }
 
@@ -189,7 +187,11 @@ - (void)setTabBar:(DCTTabBar *)aTabBar {
 }
 
 - (DCTTabBar *)tabBar {
-	if (!tabBar) self.tabBar = [[DCTTabBar alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 320.0f, 44.0f)];
+	if (!tabBar) {
+		DCTTabBar *tb = [[DCTTabBar alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 320.0f, 49.0f)];
+		self.tabBar = tb;
+		[tb release];
+	}
 	return tabBar;
 }
 

View Controllers/DCTContentViewController.h

@@ -89,6 +89,8 @@ typedef enum {
 - (void)loadBarView;
 - (void)loadContentView;
 
+- (BOOL)isContentViewLoaded;
+
 // Publically Use:
 - (id)initWithViewController:(UIViewController *)aViewController;
 

View Controllers/DCTContentViewController.m

@@ -84,7 +84,6 @@ - (void)viewDidLoad {
 
 	[self.view addSubview:self.barView];
 	self.contentView.frame = [self dctInternal_contentFrameForInterfaceOrientation:self.interfaceOrientation barHidden:self.barHidden];
-	
 	UIViewAutoresizing resizing = (UIViewAutoresizingFlexibleHeight |
 								   UIViewAutoresizingFlexibleWidth);
 
@@ -204,6 +203,10 @@ - (UIView *)contentView {
 	return contentView;
 }
 
+- (BOOL)isContentViewLoaded {
+	return (contentView == nil);
+}
+
 - (UIView *)barView {
 	if (!barView) [self loadBarView];
 	if (!barView) barView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, self.view.bounds.size.width, 44.0f)];