Fix vout layout issue introduced by the sidebar reveal controller

Additionally, simplify transitional code for the future

AspenProject/VLCAppDelegate.m

@@ -66,6 +66,7 @@
     [navCon loadTheme];
 
     _revealController = [[GHRevealViewController alloc] initWithNibName:nil bundle:nil];
+    _revealController.wantsFullScreenLayout = YES;
     _menuViewController = [[VLCMenuTableViewController alloc] initWithNibName:nil bundle:nil];
     _revealController.sidebarViewController = _menuViewController;
     _revealController.contentViewController = navCon;

AspenProject/VLCMenuTableViewController.m

@@ -66,11 +66,8 @@
     _menuItemsSectionTwo = @[@"LOCAL_NETWORK", @"OPEN_NETWORK", @"DOWNLOAD_FROM_HTTP", @"WiFi Upload", @"Dropbox"];
     _menuItemsSectionThree = @[@"Settings", @"ABOUT_APP"];
 
-    if (SYSTEM_RUNS_IN_THE_FUTURE)
-        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0.0f, 44.0f + 20.0f, kGHRevealSidebarWidth, CGRectGetHeight(self.view.bounds) - (44.0f + 20.0f)) style:UITableViewStylePlain];
-    else
-        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0.0f, 44.0f, kGHRevealSidebarWidth, CGRectGetHeight(self.view.bounds) - 44.0f) style:UITableViewStylePlain];
-	_tableView.delegate = self;
+    _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0.0f, 44.0f + 20.0f, kGHRevealSidebarWidth, CGRectGetHeight(self.view.bounds) - (44.0f + 20.0f)) style:UITableViewStylePlain];
+    _tableView.delegate = self;
 	_tableView.dataSource = self;
 	_tableView.autoresizingMask = UIViewAutoresizingFlexibleHeight;
 	_tableView.backgroundColor = [UIColor colorWithRed:(43.0f/255.0f) green:(43.0f/255.0f) blue:(43.0f/255.0f) alpha:1.0f];
@@ -86,16 +83,13 @@
         [self.view addSubview:brandingBackgroundView];
     } else {
         UIImageView *brandingBackgroundImageView;
-        brandingBackgroundImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, 44.0f)];
+        brandingBackgroundImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 20.0f, kGHRevealSidebarWidth, 44.0f)];
         brandingBackgroundImageView.contentMode = UIViewContentModeScaleToFill;
         brandingBackgroundImageView.image = [UIImage imageNamed:@"headerSidebar"];
         [self.view addSubview:brandingBackgroundImageView];
     }
     UIImageView *brandingImageView;
-    if (SYSTEM_RUNS_IN_THE_FUTURE)
-        brandingImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, 44.0f + 40.0f)];
-    else
-        brandingImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, 44.0f)];
+    brandingImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, 44.0f + 40.0f)];
     brandingImageView.contentMode = UIViewContentModeCenter;
     brandingImageView.image = [UIImage imageNamed:@"title"];
     [self.view addSubview:brandingImageView];

AspenProject/VLCMovieViewController.m

@@ -199,19 +199,12 @@
         self.toolbar.tintColor = [UIColor whiteColor];
         self.toolbar.barTintColor = [UIColor colorWithWhite:0.f alpha:1.f];
 
-        CGRect rect = self.toolbar.frame;
-        rect.origin.y = 0.0f;
-        rect.size.height = rect.size.height + 20.0f;
-        self.toolbar.frame = rect;
-        rect = self.positionSlider.frame;
+        CGRect rect = self.positionSlider.frame;
         rect.origin.y = rect.origin.y - 5.;
         self.positionSlider.frame = rect;
         rect = self.resetVideoFilterButton.frame;
         rect.origin.y = rect.origin.y + 5.;
         self.resetVideoFilterButton.frame = rect;
-        rect = self.scrubIndicatorView.frame;
-        rect.origin.y = rect.origin.y + 20.;
-        self.scrubIndicatorView.frame = rect;
     } else {
         [self.toolbar setBackgroundImage:[UIImage imageNamed:@"seekbarBg"] forBarMetrics:UIBarMetricsDefault];
         [self.backButton setBackgroundImage:[UIImage imageNamed:@"playbackDoneButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];

Resources/VLCMovieViewController~ipad.xib

@@ -70,6 +70,7 @@
 						<string key="NSFrame">{{642, 5}, {50, 29}}</string>
 						<reference key="NSSuperview" ref="534205662"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -187,6 +188,7 @@
 						<string key="NSFrame">{{255, 465}, {257, 28}}</string>
 						<reference key="NSSuperview" ref="647120888"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="567155588"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -255,7 +257,7 @@
 					<object class="IBUINavigationBar" id="908925826">
 						<reference key="NSNextResponder" ref="647120888"/>
 						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{0, -2}, {768, 44}}</string>
+						<string key="NSFrame">{{0, 18}, {768, 44}}</string>
 						<reference key="NSSuperview" ref="647120888"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="322093773"/>
@@ -330,7 +332,7 @@
 								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
 						</array>
-						<string key="NSFrame">{{0, 43}, {768, 46}}</string>
+						<string key="NSFrame">{{0, 63}, {768, 46}}</string>
 						<reference key="NSSuperview" ref="647120888"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="589625766"/>
@@ -403,7 +405,7 @@
 								<string key="NSFrame">{{51, 303}, {298, 53}}</string>
 								<reference key="NSSuperview" ref="753155309"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="567155588"/>
+								<reference key="NSNextKeyView" ref="776283891"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="8046438"/>
 								<bool key="IBUIOpaque">NO</bool>
@@ -647,6 +649,7 @@
 								<string key="NSFrame">{{14, 57}, {342, 22}}</string>
 								<reference key="NSSuperview" ref="831021170"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 							</object>

Resources/VLCMovieViewController~iphone.xib

@@ -247,7 +247,7 @@
 						<string key="NSFrameSize">{320, 568}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="618190411"/>
+						<reference key="NSNextKeyView" ref="581429859"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
 							<boolean value="YES" key="IBUIIsAccessibilityElement"/>
@@ -258,10 +258,10 @@
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">290</int>
 						<array class="NSMutableArray" key="NSSubviews"/>
-						<string key="NSFrame">{{0, -2}, {320, 44}}</string>
+						<string key="NSFrame">{{0, 18}, {320, 44}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="991208409"/>
+						<reference key="NSNextKeyView" ref="618190411"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIBarStyle">2</int>
@@ -333,7 +333,7 @@
 								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
 						</array>
-						<string key="NSFrame">{{0, 43}, {320, 46}}</string>
+						<string key="NSFrame">{{0, 63}, {320, 46}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="891554084"/>
@@ -1047,7 +1047,7 @@
 				<string key="NSFrameSize">{320, 568}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="581429859"/>
+				<reference key="NSNextKeyView" ref="991208409"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MAA</bytes>