瀏覽代碼

Skin back button correctly everywhere

Felix Paul Kühne 12 年之前
父節點
當前提交
59becbf772

+ 8 - 2
AspenProject/VLCAboutViewController.m

@@ -23,9 +23,10 @@
     [contributeButton setBackgroundImage:[UIImage imageNamed:@"button"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
     [contributeButton setBackgroundImage:[UIImage imageNamed:@"buttonHighlight"] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
         self.navigationItem.rightBarButtonItem = contributeButton;
-    else
+        self.navigationItem.leftBarButtonItem = [UIBarButtonItem themedBackButtonWithTarget:self andSelector:@selector(goBack:)];
+    } else
         self.navigationItem.leftBarButtonItem = contributeButton;
 
     NSMutableString *htmlContent = [NSMutableString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"About Contents" ofType:@"html"] encoding:NSUTF8StringEncoding error:nil];
@@ -36,6 +37,11 @@
     self.webView.delegate = self;
 }
 
+- (IBAction)goBack:(id)sender
+{
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
 - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType
 {
     NSURL *requestURL = request.URL;

+ 8 - 0
AspenProject/VLCHTTPDownloadViewController.m

@@ -10,6 +10,7 @@
 
 #import "VLCHTTPDownloadViewController.h"
 #import "VLCHTTPFileDownloader.h"
+#import "UIBarButtonItem+Theme.h"
 
 @interface VLCHTTPDownloadViewController ()
 {
@@ -24,6 +25,8 @@
 {
     [self.downloadButton setTitle:NSLocalizedString(@"BUTTON_DOWNLOAD",@"") forState:UIControlStateNormal];
     _currentDownloads = [[NSMutableArray alloc] init];
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+        self.navigationItem.leftBarButtonItem = [UIBarButtonItem themedBackButtonWithTarget:self andSelector:@selector(goBack:)];
     [super viewDidLoad];
 }
 
@@ -44,6 +47,11 @@
 }
 
 #pragma mark - UI interaction
+- (IBAction)goBack:(id)sender
+{
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
 - (IBAction)downloadAction:(id)sender
 {
     if ([self.urlField.text length] > 0) {

+ 2 - 0
AspenProject/VLCMenuViewController.m

@@ -136,6 +136,8 @@
     if (!self.settingsViewController) {
         self.settingsViewController = [[IASKAppSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
         self.settingsController.viewController = self.settingsViewController;
+        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+            self.settingsViewController.navigationItem.leftBarButtonItem = [UIBarButtonItem themedBackButtonWithTarget:self.settingsViewController andSelector:@selector(dismiss:)];
     }
 
     self.settingsViewController.modalPresentationStyle = UIModalPresentationFormSheet;

+ 9 - 0
AspenProject/VLCOpenNetworkStreamViewController.m

@@ -11,6 +11,7 @@
 #import "VLCOpenNetworkStreamViewController.h"
 #import "VLCAppDelegate.h"
 #import "VLCPlaylistViewController.h"
+#import "UIBarButtonItem+Theme.h"
 
 @interface VLCOpenNetworkStreamViewController ()
 {
@@ -34,6 +35,9 @@
     [super viewDidLoad];
     [self.openButton setTitle:NSLocalizedString(@"BUTTON_OPEN", @"") forState:UIControlStateNormal];
     [self.privateModeLabel setText:NSLocalizedString(@"PRIVATE_PLAYBACK_TOGGLE", @"")];
+
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+        self.navigationItem.leftBarButtonItem = [UIBarButtonItem themedBackButtonWithTarget:self andSelector:@selector(goBack:)];
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -71,6 +75,11 @@
 }
 
 #pragma mark - UI interaction
+- (IBAction)goBack:(id)sender
+{
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
 - (IBAction)openButtonAction:(id)sender
 {
     if ([self.urlField.text length] > 0) {

+ 4 - 1
AspenProject/VLCSettingsController.m

@@ -45,7 +45,10 @@
 
 - (void)settingsViewControllerDidEnd:(IASKAppSettingsViewController*)sender
 {
-    [self.viewController.navigationController dismissModalViewControllerAnimated:YES];
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+        [self.viewController.navigationController popViewControllerAnimated:YES];
+    else
+        [self.viewController.navigationController dismissModalViewControllerAnimated:YES];
 }
 
 - (void)settingsViewController:(IASKAppSettingsViewController*)sender buttonTappedForSpecifier:(IASKSpecifier*)specifier {