浏览代码

Factorisate the display of a ViewController from the menu

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
Romain Goyet 12 年之前
父节点
当前提交
13bf28e965
共有 2 个文件被更改,包括 15 次插入9 次删除
  1. 14 8
      AspenProject/VLCMenuViewController.m
  2. 1 1
      AspenProject/VLCPlaylistViewController.m

+ 14 - 8
AspenProject/VLCMenuViewController.m

@@ -31,6 +31,7 @@
     VLCHTTPDownloadViewController *_downloadViewController;
     Reachability *_reachability;
 }
+- (void)_presentViewController:(UIViewController *)viewController;
 @end
 
 @implementation VLCMenuViewController
@@ -123,14 +124,7 @@
 - (IBAction)openAboutPanel:(id)sender
 {
     UIViewController *aboutController = [[VLCAboutViewController alloc] initWithNibName:nil bundle:nil];
-
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-        UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:aboutController];
-        [navController loadTheme];
-        [self presentModalViewController:navController animated:YES];
-    } else {
-        [self.navigationController pushViewController:aboutController animated:YES];
-    }
+    [self _presentViewController:aboutController];
 }
 
 - (IBAction)openNetworkStream:(id)sender
@@ -218,4 +212,16 @@
     [self presentModalViewController:navController animated:YES];
 }
 
+#pragma mark - Private methods
+
+- (void)_presentViewController:(UIViewController *)viewController
+{
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController];
+        [navController loadTheme];
+        [self presentModalViewController:navController animated:YES];
+    } else {
+        [self.navigationController pushViewController:viewController animated:YES];
+    }
+}
 @end

+ 1 - 1
AspenProject/VLCPlaylistViewController.m

@@ -298,7 +298,7 @@
     if (self.menuViewController == nil) {
         VLCMenuViewController *menuViewController = [[VLCMenuViewController alloc] initWithNibName:nil bundle:nil];
         UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:menuViewController];
-        [navigationController loadTheme],
+        [navigationController loadTheme];
         self.menuViewController = navigationController;
         if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
             navigationController.navigationBarHidden = YES;