소스 검색

Fix multiple navigation bar appearance issues in the future

Felix Paul Kühne 12 년 전
부모
커밋
171d62dc65
3개의 변경된 파일26개의 추가작업 그리고 0개의 파일을 삭제
  1. 9 0
      AspenProject/VLCDownloadViewController.m
  2. 12 0
      AspenProject/VLCNetworkLoginViewController.m
  3. 5 0
      AspenProject/VLCOpenNetworkStreamViewController.m

+ 9 - 0
AspenProject/VLCDownloadViewController.m

@@ -52,6 +52,8 @@
 
 - (void)viewWillAppear:(BOOL)animated
 {
+    self.navigationController.navigationBar.translucent = NO;
+
     if ([[UIPasteboard generalPasteboard] containsPasteboardTypes:@[@"public.url", @"public.text"]]) {
         NSURL *pasteURL = [[UIPasteboard generalPasteboard] valueForPasteboardType:@"public.url"];
         if (!pasteURL || [[pasteURL absoluteString] isEqualToString:@""]) {
@@ -66,6 +68,13 @@
     [super viewWillAppear:animated];
 }
 
+- (void)viewWillDisappear:(BOOL)animated
+{
+    if (SYSTEM_RUNS_IN_THE_FUTURE)
+        self.navigationController.navigationBar.translucent = YES;
+    [super viewWillDisappear:animated];
+}
+
 #pragma mark - UI interaction
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
 {

+ 12 - 0
AspenProject/VLCNetworkLoginViewController.m

@@ -36,8 +36,17 @@
     self.passwordLabel.text = NSLocalizedString(@"PASSWORD_LABEL", @"");
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    self.navigationController.navigationBar.translucent = NO;
+    [super viewWillAppear:animated];
+}
+
 - (IBAction)dismissWithAnimation:(id)sender
 {
+    if (SYSTEM_RUNS_IN_THE_FUTURE)
+        self.navigationController.navigationBar.translucent = YES;
+
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
         [self.navigationController popViewControllerAnimated:YES];
     else
@@ -46,6 +55,9 @@
 
 - (IBAction)dismiss:(id)sender
 {
+    if (SYSTEM_RUNS_IN_THE_FUTURE)
+        self.navigationController.navigationBar.translucent = YES;
+
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
         [self.navigationController popViewControllerAnimated:NO];
     else

+ 5 - 0
AspenProject/VLCOpenNetworkStreamViewController.m

@@ -44,6 +44,8 @@
 
 - (void)viewWillAppear:(BOOL)animated
 {
+    self.navigationController.navigationBar.translucent = NO;
+
     if ([[UIPasteboard generalPasteboard] containsPasteboardTypes:@[@"public.url", @"public.text"]]) {
         NSURL *pasteURL = [[UIPasteboard generalPasteboard] valueForPasteboardType:@"public.url"];
         if (!pasteURL || [[pasteURL absoluteString] isEqualToString:@""]) {
@@ -64,6 +66,9 @@
 
 - (void)viewWillDisappear:(BOOL)animated
 {
+    if (SYSTEM_RUNS_IN_THE_FUTURE)
+        self.navigationController.navigationBar.translucent = YES;
+
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     [defaults setObject:[NSArray arrayWithArray:_recentURLs] forKey:kVLCRecentURLs];
     [defaults setBool:self.privateToggleSwitch.on forKey:kVLCPrivateWebStreaming];