Commit aa300594 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Implement refined navbar background for the phone's landscape mode

parent 03dcac83
......@@ -49,6 +49,8 @@
self.navigationController = [[UINavigationController alloc] initWithRootViewController:_playlistViewController];
UINavigationBar *navBar = self.navigationController.navigationBar;
[navBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forBarMetrics:UIBarMetricsDefault];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
[navBar setBackgroundImage:[UIImage imageNamed:@"navBarBackgroundPhoneLandscape"] forBarMetrics:UIBarMetricsLandscapePhone];
navBar.barStyle = UIBarStyleBlack;
self.window.rootViewController = self.navigationController;
......
......@@ -59,6 +59,8 @@
self.dismissToolBar.items = @[[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil], dismissButton];
[self.dismissToolBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
[self.dismissToolBar setBackgroundImage:[UIImage imageNamed:@"navBarBackgroundPhoneLandscape"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsLandscapePhone];
self.scrollView.contentSize = self.view.frame.size;
}
......@@ -118,6 +120,8 @@
UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:aboutController];
navController.navigationBar.barStyle = UIBarStyleBlack;
[navController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forBarMetrics:UIBarMetricsDefault];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
[navController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackgroundPhoneLandscape"] forBarMetrics:UIBarMetricsLandscapePhone];
[self presentModalViewController:navController animated:YES];
}
......@@ -205,6 +209,8 @@
navController.navigationBarHidden = NO;
navController.navigationBar.barStyle = UIBarStyleBlack;
[navController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forBarMetrics:UIBarMetricsDefault];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
[navController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackgroundPhoneLandscape"] forBarMetrics:UIBarMetricsLandscapePhone];
[self presentModalViewController:navController animated:YES];
[self.settingsViewController.navigationItem.rightBarButtonItem setBackgroundImage:[UIImage imageNamed:@"doneButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
......@@ -255,6 +261,8 @@
navController.navigationBarHidden = NO;
navController.navigationBar.barStyle = UIBarStyleBlack;
[navController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forBarMetrics:UIBarMetricsDefault];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
[navController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackgroundPhoneLandscape"] forBarMetrics:UIBarMetricsLandscapePhone];
[self presentModalViewController:navController animated:YES];
}
......
......@@ -167,6 +167,8 @@
7D6BA1171748EFE100C0E203 /* VLCMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6BA1151748EFE100C0E203 /* VLCMenuViewController.m */; };
7D6BA1181748EFE100C0E203 /* VLCMenuViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA1161748EFE100C0E203 /* VLCMenuViewController~ipad.xib */; };
7D6BA11A174911C200C0E203 /* VLCMenuViewController~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA119174911C200C0E203 /* VLCMenuViewController~iphone.xib */; };
7D6BD17E176200B600AD311A /* navBarBackgroundPhoneLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BD17C176200B600AD311A /* navBarBackgroundPhoneLandscape@2x.png */; };
7D6BD17F176200B600AD311A /* navBarBackgroundPhoneLandscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BD17D176200B600AD311A /* navBarBackgroundPhoneLandscape.png */; };
7D94FCDF16DE7D1000F2623B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCDE16DE7D1000F2623B /* UIKit.framework */; };
7D94FCE116DE7D1000F2623B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCE016DE7D1000F2623B /* Foundation.framework */; };
7D94FCE316DE7D1000F2623B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCE216DE7D1000F2623B /* CoreGraphics.framework */; };
......@@ -474,6 +476,8 @@
7D6BA1151748EFE100C0E203 /* VLCMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCMenuViewController.m; sourceTree = "<group>"; };
7D6BA1161748EFE100C0E203 /* VLCMenuViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCMenuViewController~ipad.xib"; path = "../Resources/VLCMenuViewController~ipad.xib"; sourceTree = "<group>"; };
7D6BA119174911C200C0E203 /* VLCMenuViewController~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCMenuViewController~iphone.xib"; path = "Resources/VLCMenuViewController~iphone.xib"; sourceTree = SOURCE_ROOT; };
7D6BD17C176200B600AD311A /* navBarBackgroundPhoneLandscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "navBarBackgroundPhoneLandscape@2x.png"; sourceTree = "<group>"; };
7D6BD17D176200B600AD311A /* navBarBackgroundPhoneLandscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = navBarBackgroundPhoneLandscape.png; sourceTree = "<group>"; };
7D6D13591758D1A00007EA9A /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
7D94FCDB16DE7D1000F2623B /* VLC for iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VLC for iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
7D94FCDE16DE7D1000F2623B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
......@@ -775,6 +779,8 @@
7D07F70F175669D800CDE21C /* buttonHighlight@2x.png */,
7D07F706175665ED00CDE21C /* navBarBackground@2x.png */,
7D07F707175665ED00CDE21C /* navBarBackground.png */,
7D6BD17C176200B600AD311A /* navBarBackgroundPhoneLandscape@2x.png */,
7D6BD17D176200B600AD311A /* navBarBackgroundPhoneLandscape.png */,
7D6B08C8174A927700A05173 /* mediaUnread.png */,
7D6B08C6174A910500A05173 /* mediaUnread@2x.png */,
A7FF9F3D17428C1900999819 /* DeleteButton.png */,
......@@ -1436,6 +1442,8 @@
7D47D7281760D77C00E86BAD /* pauseIcon@2x.png in Resources */,
7D47D72B1760E3A000E86BAD /* sliderminimumTrack.png in Resources */,
7D47D72C1760E3A000E86BAD /* sliderminimumTrack@2x.png in Resources */,
7D6BD17E176200B600AD311A /* navBarBackgroundPhoneLandscape@2x.png in Resources */,
7D6BD17F176200B600AD311A /* navBarBackgroundPhoneLandscape.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment