From fa28e6056619170f172c7dd4f52a1272787644df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20=C5=81yp?= Date: Mon, 12 Jan 2015 16:14:36 +0100 Subject: [PATCH] Get rid of ios6 stuff --- src/FSPanes/FSPanesSplitView/FSPanesSplitView.m | 2 +- .../FSPanesSplitView/FSPanesSplitViewController.h | 2 -- .../FSPanesSplitView/FSPanesSplitViewController.m | 10 ---------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/FSPanes/FSPanesSplitView/FSPanesSplitView.m b/src/FSPanes/FSPanesSplitView/FSPanesSplitView.m index aa5d78b..5b64557 100644 --- a/src/FSPanes/FSPanesSplitView/FSPanesSplitView.m +++ b/src/FSPanes/FSPanesSplitView/FSPanesSplitView.m @@ -48,7 +48,7 @@ - (void)_setupView // on the iPad in landscape width is 20 and height is 1024 :) CGFloat statusBarHeight = MIN(CGRectGetHeight(statusBarFrame), CGRectGetWidth(statusBarFrame)); - NSDictionary *metrics = @{@"spacing": [FSPanesSplitViewController isRunningIOS6] ? @0 : @(statusBarHeight)}; + NSDictionary *metrics = @{@"spacing": @(statusBarHeight)}; [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"|[content]|" options:0 metrics:metrics diff --git a/src/FSPanes/FSPanesSplitView/FSPanesSplitViewController.h b/src/FSPanes/FSPanesSplitView/FSPanesSplitViewController.h index 0d3bf59..4b93388 100644 --- a/src/FSPanes/FSPanesSplitView/FSPanesSplitViewController.h +++ b/src/FSPanes/FSPanesSplitView/FSPanesSplitViewController.h @@ -19,8 +19,6 @@ @interface FSPanesSplitViewController : UIViewController -+ (BOOL)isRunningIOS6; - /** View class used by controller. Defaults to `[FSPanesSplitView class]`. Subclasses may override this method to return their custom view classes. diff --git a/src/FSPanes/FSPanesSplitView/FSPanesSplitViewController.m b/src/FSPanes/FSPanesSplitView/FSPanesSplitViewController.m index a8954b6..b87dd8b 100644 --- a/src/FSPanes/FSPanesSplitView/FSPanesSplitViewController.m +++ b/src/FSPanes/FSPanesSplitView/FSPanesSplitViewController.m @@ -35,16 +35,6 @@ @implementation FSPanesSplitViewController @synthesize panesMenuViewController = _panesMenuViewController; @synthesize panesNavigationController = _panesNavigationController; -+ (BOOL)isRunningIOS6 -{ - static NSUInteger _deviceSystemMajorVersion = -1; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - _deviceSystemMajorVersion = [[[[[UIDevice currentDevice] systemVersion] componentsSeparatedByString:@"."] objectAtIndex:0] intValue]; - }); - return _deviceSystemMajorVersion < 7; -} - - (NSUInteger)selectedIndex { return [self.panesMenuViewController.menuDataSource indexOfViewController:self.panesNavigationController.rootViewController];