Perfect Tab Bar

leichunfeng · leichunfeng · commit 48356b748f97 · 2015-12-05T21:31:57.000+08:00
diff --git a/MVVMReactiveCocoa/MRCAppDelegate.m b/MVVMReactiveCocoa/MRCAppDelegate.m
@@ -36,7 +36,6 @@ @implementation MRCAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     [self configureFMDB];
-    [self configureAppearance];
     [self configureKeyboardManager];
     [self configureReachability];
     [self configureUMengSocial];
@@ -52,6 +51,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     [self.services resetRootViewModel:[self createInitialViewModel]];
     [self.window makeKeyAndVisible];
+
+    [self configureAppearance];
     
     // Save the application version info.
     [[NSUserDefaults standardUserDefaults] setValue:MRC_APP_VERSION forKey:MRCApplicationVersionKey];
@@ -108,7 +109,7 @@ - (void)configureFMDB {
 }
 
 - (void)configureAppearance {
-    self.window.backgroundColor = UIColor.whiteColor;
+    self.window.backgroundColor = [UIColor whiteColor];
     
     // 0x2F434F
     [UINavigationBar appearance].barTintColor = [UIColor colorWithRed:(48 - 40) / 215.0 green:(67 - 40) / 215.0 blue:(78 - 40) / 215.0 alpha:1];
diff --git a/MVVMReactiveCocoa/View/BaseClass/MRCTabBarController.h b/MVVMReactiveCocoa/View/BaseClass/MRCTabBarController.h
@@ -7,10 +7,9 @@
 //
 
 #import "MRCViewController.h"
-#import "WXTabBarController.h"
 
 @interface MRCTabBarController : MRCViewController <UITabBarControllerDelegate>
 
-@property (nonatomic, strong, readonly) WXTabBarController *tabBarController;
+@property (nonatomic, strong, readonly) UITabBarController *tabBarController;
 
 @end
diff --git a/MVVMReactiveCocoa/View/BaseClass/MRCTabBarController.m b/MVVMReactiveCocoa/View/BaseClass/MRCTabBarController.m
@@ -7,10 +7,11 @@
 //
 
 #import "MRCTabBarController.h"
+#import "WXTabBarController.h"
 
 @interface MRCTabBarController ()
 
-@property (nonatomic, strong, readwrite) WXTabBarController *tabBarController;
+@property (nonatomic, strong, readwrite) UITabBarController *tabBarController;
 
 @end
 
@@ -38,12 +39,6 @@ - (UIStatusBarStyle)preferredStatusBarStyle {
     return self.tabBarController.preferredStatusBarStyle;
 }
 
-#pragma mark - UITabBarControllerDelegate
-
-- (UIInterfaceOrientationMask)tabBarControllerSupportedInterfaceOrientations:(UITabBarController *)tabBarController {
-    return tabBarController.selectedViewController.supportedInterfaceOrientations;
-}
-
 @end
 
 @interface UITabBarController (MRCStatusBarAddtions)
diff --git a/MVVMReactiveCocoa/View/MRCHomepageViewController.m b/MVVMReactiveCocoa/View/MRCHomepageViewController.m
@@ -121,8 +121,6 @@ - (void)viewDidLoad {
     });
 
     self.tabBarController.viewControllers = @[ newsNavigationController, reposNavigationController, searchNavigationController, profileNavigationController ];
-    
-    self.tabBarController.delegate = self;
 }
 
 @end
diff --git a/MVVMReactiveCocoa/View/TableHeaderFooterView/MRCAvatarHeaderView.m b/MVVMReactiveCocoa/View/TableHeaderFooterView/MRCAvatarHeaderView.m
@@ -118,17 +118,19 @@ - (void)bindViewModel:(MRCAvatarHeaderViewModel *)viewModel {
                                                         }];
         }];
     
-    [[self.avatarButton rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(UIButton *avatarButton) {
-        @strongify(self)
-        MRCSharedAppDelegate.window.backgroundColor = [UIColor blackColor];
-        
-        TGRImageViewController *viewController = [[TGRImageViewController alloc] initWithImage:[avatarButton imageForState:UIControlStateNormal]];
-        
-        viewController.view.frame = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
-        viewController.transitioningDelegate = self;
-        
-        [MRCSharedAppDelegate.window.rootViewController presentViewController:viewController animated:YES completion:NULL];
-    }];
+    [[self.avatarButton
+        rac_signalForControlEvents:UIControlEventTouchUpInside]
+        subscribeNext:^(UIButton *avatarButton) {
+            @strongify(self)
+            MRCSharedAppDelegate.window.backgroundColor = [UIColor blackColor];
+            
+            TGRImageViewController *viewController = [[TGRImageViewController alloc] initWithImage:[avatarButton imageForState:UIControlStateNormal]];
+            
+            viewController.view.frame = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+            viewController.transitioningDelegate = self;
+            
+            [MRCSharedAppDelegate.window.rootViewController presentViewController:viewController animated:YES completion:NULL];
+        }];
 
     RAC(self.nameLabel, text) = RACObserve(viewModel.user, login);
 
diff --git a/WXTabBarController b/WXTabBarController
@@ -1 +1 @@
-Subproject commit 7c9d6a6b179f514580f523e00f05605eb3a2ba9c
+Subproject commit d45912869a70c7fe4d1b6749da540706417f072b

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,6 @@ - (void)viewDidLoad {`
`121`	`121`	`});`
`122`	`122`
`123`	`123`	`self.tabBarController.viewControllers = @[ newsNavigationController, reposNavigationController, searchNavigationController, profileNavigationController ];`
`124`		`-`
`125`		`- self.tabBarController.delegate = self;`
`126`	`124`	`}`
`127`	`125`
`128`	`126`	`@end`