Apply orange navbar to the other dialogs triggerable through the menu

AspenProject/VLCMenuViewController.h

@@ -17,6 +17,7 @@
 @property (strong, nonatomic) IASKAppSettingsViewController *settingsViewController;
 @property (strong, nonatomic) VLCSettingsController *settingsController;
 
+@property (strong, nonatomic) IBOutlet UIToolbar *dismissToolBar;
 @property (strong, nonatomic) IBOutlet UIButton *dismissButton;
 @property (strong, nonatomic) IBOutlet UIButton *aboutButton;
 @property (strong, nonatomic) IBOutlet UIButton *openNetworkStreamButton;

AspenProject/VLCMenuViewController.m

@@ -48,8 +48,10 @@
 {
     [super viewDidLoad];
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
         [self.dismissButton setTitle:NSLocalizedString(@"BUTTON_DONE", @"") forState:UIControlStateNormal];
+        [self.dismissToolBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault];
+    }
     [self.aboutButton setTitle:NSLocalizedString(@"ABOUT_APP", @"") forState:UIControlStateNormal];
     [self.openNetworkStreamButton setTitle:NSLocalizedString(@"OPEN_NETWORK", @"") forState:UIControlStateNormal];
     [self.downloadFromHTTPServerButton setTitle:NSLocalizedString(@"DOWNLOAD_FROM_HTTP", @"") forState:UIControlStateNormal];
@@ -105,6 +107,7 @@
 
     UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:aboutController];
     navController.navigationBar.barStyle = UIBarStyleBlack;
+    [navController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forBarMetrics:UIBarMetricsDefault];
 
     [self presentModalViewController:navController animated:YES];
 }
@@ -191,6 +194,7 @@
     UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:self.settingsViewController];
     navController.navigationBarHidden = NO;
     navController.navigationBar.barStyle = UIBarStyleBlack;
+    [navController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forBarMetrics:UIBarMetricsDefault];
     [self presentModalViewController:navController animated:YES];
 }
 
@@ -236,6 +240,7 @@
     UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:appDelegate.dropboxTableViewController];
     navController.navigationBarHidden = NO;
     navController.navigationBar.barStyle = UIBarStyleBlack;
+    [navController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forBarMetrics:UIBarMetricsDefault];
     [self presentModalViewController:navController animated:YES];
 }
 

Resources/VLCMenuViewController~iphone.xib

@@ -72,7 +72,7 @@
 							<int key="type">1</int>
 							<double key="pointSize">14</double>
 						</object>
-						<object class="NSFont" key="IBUIFont" id="622255057">
+						<object class="NSFont" key="IBUIFont" id="358184865">
 							<string key="NSName">Helvetica</string>
 							<double key="NSSize">14</double>
 							<int key="NSfFlags">16</int>
@@ -107,7 +107,7 @@
 							<int key="type">2</int>
 							<double key="pointSize">15</double>
 						</object>
-						<object class="NSFont" key="IBUIFont" id="365025985">
+						<object class="NSFont" key="IBUIFont" id="215751078">
 							<string key="NSName">Helvetica-Bold</string>
 							<double key="NSSize">15</double>
 							<int key="NSfFlags">16</int>
@@ -129,19 +129,19 @@
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
-			<object class="IBUIView" id="194409391">
+			<object class="IBUIView" id="376076566">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIScrollView" id="141804030">
-						<reference key="NSNextResponder" ref="194409391"/>
+					<object class="IBUIScrollView" id="512981630">
+						<reference key="NSNextResponder" ref="376076566"/>
 						<int key="NSvFlags">274</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIButton" id="233942944">
-								<reference key="NSNextResponder" ref="141804030"/>
+								<reference key="NSNextResponder" ref="512981630"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 60}</string>
-								<reference key="NSSuperview" ref="141804030"/>
+								<reference key="NSSuperview" ref="512981630"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="306241553"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -154,18 +154,18 @@
 								<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
 								<reference key="IBUINormalTitleColor" ref="937037271"/>
 								<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="127934840">
+								<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="710551150">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">menuBtnBck.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="365025985"/>
+								<reference key="IBUIFont" ref="215751078"/>
 							</object>
 							<object class="IBUIButton" id="306241553">
-								<reference key="NSNextResponder" ref="141804030"/>
+								<reference key="NSNextResponder" ref="512981630"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 68}, {320, 60}}</string>
-								<reference key="NSSuperview" ref="141804030"/>
+								<reference key="NSSuperview" ref="512981630"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="973946330"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -178,15 +178,15 @@
 								<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
 								<reference key="IBUINormalTitleColor" ref="937037271"/>
 								<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-								<reference key="IBUINormalBackgroundImage" ref="127934840"/>
+								<reference key="IBUINormalBackgroundImage" ref="710551150"/>
 								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="365025985"/>
+								<reference key="IBUIFont" ref="215751078"/>
 							</object>
 							<object class="IBUIButton" id="1021636329">
-								<reference key="NSNextResponder" ref="141804030"/>
+								<reference key="NSNextResponder" ref="512981630"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 343}, {320, 60}}</string>
-								<reference key="NSSuperview" ref="141804030"/>
+								<reference key="NSSuperview" ref="512981630"/>
 								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -198,15 +198,15 @@
 								<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
 								<reference key="IBUINormalTitleColor" ref="937037271"/>
 								<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-								<reference key="IBUINormalBackgroundImage" ref="127934840"/>
+								<reference key="IBUINormalBackgroundImage" ref="710551150"/>
 								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="365025985"/>
+								<reference key="IBUIFont" ref="215751078"/>
 							</object>
 							<object class="IBUIButton" id="205209326">
-								<reference key="NSNextResponder" ref="141804030"/>
+								<reference key="NSNextResponder" ref="512981630"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 275}, {320, 60}}</string>
-								<reference key="NSSuperview" ref="141804030"/>
+								<reference key="NSSuperview" ref="512981630"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1021636329"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -219,15 +219,15 @@
 								<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
 								<reference key="IBUINormalTitleColor" ref="937037271"/>
 								<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-								<reference key="IBUINormalBackgroundImage" ref="127934840"/>
+								<reference key="IBUINormalBackgroundImage" ref="710551150"/>
 								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="365025985"/>
+								<reference key="IBUIFont" ref="215751078"/>
 							</object>
 							<object class="IBUIButton" id="475346595">
-								<reference key="NSNextResponder" ref="141804030"/>
+								<reference key="NSNextResponder" ref="512981630"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 207}, {320, 60}}</string>
-								<reference key="NSSuperview" ref="141804030"/>
+								<reference key="NSSuperview" ref="512981630"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="205209326"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -246,15 +246,15 @@
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">dropboxLabel.png</string>
 								</object>
-								<reference key="IBUINormalBackgroundImage" ref="127934840"/>
+								<reference key="IBUINormalBackgroundImage" ref="710551150"/>
 								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="365025985"/>
+								<reference key="IBUIFont" ref="215751078"/>
 							</object>
 							<object class="IBUIView" id="485650876">
-								<reference key="NSNextResponder" ref="141804030"/>
+								<reference key="NSNextResponder" ref="512981630"/>
 								<int key="NSvFlags">290</int>
 								<array class="NSMutableArray" key="NSSubviews">
-									<object class="IBUIImageView" id="334475584">
+									<object class="IBUIImageView" id="759717412">
 										<reference key="NSNextResponder" ref="485650876"/>
 										<int key="NSvFlags">274</int>
 										<string key="NSFrameSize">{320, 63}</string>
@@ -264,7 +264,7 @@
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-										<reference key="IBUIImage" ref="127934840"/>
+										<reference key="IBUIImage" ref="710551150"/>
 									</object>
 									<object class="IBUISwitch" id="434153343">
 										<reference key="NSNextResponder" ref="485650876"/>
@@ -298,7 +298,7 @@
 										<int key="IBUIBaselineAdjustment">0</int>
 										<int key="IBUITextAlignment">1</int>
 										<reference key="IBUIFontDescription" ref="886215057"/>
-										<reference key="IBUIFont" ref="365025985"/>
+										<reference key="IBUIFont" ref="215751078"/>
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 									</object>
 									<object class="IBUILabel" id="892025683">
@@ -320,26 +320,26 @@
 										<int key="IBUIBaselineAdjustment">0</int>
 										<int key="IBUITextAlignment">1</int>
 										<reference key="IBUIFontDescription" ref="142511261"/>
-										<reference key="IBUIFont" ref="622255057"/>
+										<reference key="IBUIFont" ref="358184865"/>
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 									</object>
 								</array>
 								<string key="NSFrame">{{0, 136}, {320, 63}}</string>
-								<reference key="NSSuperview" ref="141804030"/>
+								<reference key="NSSuperview" ref="512981630"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="334475584"/>
+								<reference key="NSNextKeyView" ref="759717412"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor" id="918947057">
+								<object class="NSColor" key="IBUIBackgroundColor" id="34356837">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MAA</bytes>
 								</object>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							</object>
 							<object class="IBUIView" id="973946330">
-								<reference key="NSNextResponder" ref="141804030"/>
+								<reference key="NSNextResponder" ref="512981630"/>
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{9, 78}, {40, 40}}</string>
-								<reference key="NSSuperview" ref="141804030"/>
+								<reference key="NSSuperview" ref="512981630"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="485650876"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -350,12 +350,12 @@
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							</object>
 						</array>
-						<string key="NSFrame">{{0, 44}, {320, 403}}</string>
-						<reference key="NSSuperview" ref="194409391"/>
+						<string key="NSFrame">{{0, 56}, {320, 403}}</string>
+						<reference key="NSSuperview" ref="376076566"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="233942944"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="918947057"/>
+						<reference key="IBUIBackgroundColor" ref="34356837"/>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<bool key="IBUIMultipleTouchEnabled">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -365,12 +365,12 @@
 						<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
 					</object>
 					<object class="IBUIToolbar" id="765845946">
-						<reference key="NSNextResponder" ref="194409391"/>
+						<reference key="NSNextResponder" ref="376076566"/>
 						<int key="NSvFlags">294</int>
 						<string key="NSFrameSize">{320, 44}</string>
-						<reference key="NSSuperview" ref="194409391"/>
+						<reference key="NSSuperview" ref="376076566"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="141804030"/>
+						<reference key="NSNextKeyView" ref="512981630"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -392,12 +392,12 @@
 						</array>
 					</object>
 				</array>
-				<string key="NSFrameSize">{320, 447}</string>
+				<string key="NSFrameSize">{320, 459}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="765845946"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<reference key="IBUIBackgroundColor" ref="918947057"/>
+				<reference key="IBUIBackgroundColor" ref="34356837"/>
 				<reference key="IBUISimulatedDestinationMetrics" ref="92702892"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
@@ -504,11 +504,19 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">view</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="194409391"/>
+						<reference key="destination" ref="376076566"/>
 					</object>
 					<int key="connectionID">85</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">dismissToolBar</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="765845946"/>
+					</object>
+					<int key="connectionID">87</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">openNetworkStream:</string>
 						<reference key="source" ref="233942944"/>
@@ -620,16 +628,16 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">83</int>
-						<reference key="object" ref="194409391"/>
+						<reference key="object" ref="376076566"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="141804030"/>
+							<reference ref="512981630"/>
 							<reference ref="765845946"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">84</int>
-						<reference key="object" ref="141804030"/>
+						<reference key="object" ref="512981630"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="233942944"/>
 							<reference ref="306241553"/>
@@ -639,7 +647,7 @@
 							<reference ref="485650876"/>
 							<reference ref="973946330"/>
 						</array>
-						<reference key="parent" ref="194409391"/>
+						<reference key="parent" ref="376076566"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">46</int>
@@ -648,7 +656,7 @@
 							<reference ref="567217541"/>
 							<reference ref="22033339"/>
 						</array>
-						<reference key="parent" ref="194409391"/>
+						<reference key="parent" ref="376076566"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">47</int>
@@ -663,27 +671,27 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">26</int>
 						<reference key="object" ref="233942944"/>
-						<reference key="parent" ref="141804030"/>
+						<reference key="parent" ref="512981630"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">34</int>
 						<reference key="object" ref="306241553"/>
-						<reference key="parent" ref="141804030"/>
+						<reference key="parent" ref="512981630"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">35</int>
 						<reference key="object" ref="1021636329"/>
-						<reference key="parent" ref="141804030"/>
+						<reference key="parent" ref="512981630"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">50</int>
 						<reference key="object" ref="205209326"/>
-						<reference key="parent" ref="141804030"/>
+						<reference key="parent" ref="512981630"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">76</int>
 						<reference key="object" ref="475346595"/>
-						<reference key="parent" ref="141804030"/>
+						<reference key="parent" ref="512981630"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">51</int>
@@ -692,9 +700,9 @@
 							<reference ref="434153343"/>
 							<reference ref="238446432"/>
 							<reference ref="892025683"/>
-							<reference ref="334475584"/>
+							<reference ref="759717412"/>
 						</array>
-						<reference key="parent" ref="141804030"/>
+						<reference key="parent" ref="512981630"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">54</int>
@@ -714,11 +722,11 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">73</int>
 						<reference key="object" ref="973946330"/>
-						<reference key="parent" ref="141804030"/>
+						<reference key="parent" ref="512981630"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">86</int>
-						<reference key="object" ref="334475584"/>
+						<reference key="object" ref="759717412"/>
 						<reference key="parent" ref="485650876"/>
 					</object>
 				</array>
@@ -753,7 +761,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">86</int>
+			<int key="maxID">87</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -810,6 +818,7 @@
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="aboutButton">UIButton</string>
 						<string key="dismissButton">UIButton</string>
+						<string key="dismissToolBar">UIToolbar</string>
 						<string key="downloadFromHTTPServerButton">UIButton</string>
 						<string key="dropboxButton">UIButton</string>
 						<string key="httpDownloadProgressIndicator">VLCCircularProgressIndicator</string>
@@ -831,6 +840,10 @@
 							<string key="name">dismissButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="dismissToolBar">
+							<string key="name">dismissToolBar</string>
+							<string key="candidateClassName">UIToolbar</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="downloadFromHTTPServerButton">
 							<string key="name">downloadFromHTTPServerButton</string>
 							<string key="candidateClassName">UIButton</string>