Bladeren bron

fix navigationbar color

Marino Faggiana 7 jaren geleden
bovenliggende
commit
be2e15e88a

+ 2 - 9
iOSClient/Library/MWPhotoBrowser/MWPhotoBrowser.m

@@ -223,6 +223,8 @@ static void * MWVideoPlayerObservation = &MWVideoPlayerObservation;
     self.navigationController.navigationBar.barTintColor = [NCBrandColor sharedInstance].brand;
     self.navigationController.navigationBar.tintColor = [NCBrandColor sharedInstance].navigationBarText;
     [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName : [NCBrandColor sharedInstance].navigationBarText}];
+    self.navigationController.navigationBar.translucent = false;
+    [self setExtendedLayoutIncludesOpaqueBars:YES];
     
     // Toolbar items
     BOOL hasItems = NO;
@@ -569,17 +571,8 @@ static void * MWVideoPlayerObservation = &MWVideoPlayerObservation;
         [self performLayout];
         [self.view setNeedsLayout];
     }
-
-    //_toolbar.hidden = (_gridController ? true : false);
-    //_toolbar.alpha = (_gridController ? 0 : 1);
-
-    //TWS
-    //self.navigationController.navigationBar.hidden = (_gridController ? true : false);
-    //   self.navigationController.navigationBar.alpha = (_gridController ? 0 : 1);
-    
 }
 
-
 - (NSUInteger)numberOfPhotos {
     if (_photoCount == NSNotFound) {
         if ([_delegate respondsToSelector:@selector(numberOfPhotosInPhotoBrowser:)]) {

+ 1 - 0
iOSClient/Notification/CCNotification.swift

@@ -36,6 +36,7 @@ class CCNotification: UITableViewController, OCNetworkingDelegate {
         self.navigationController?.navigationBar.barTintColor = NCBrandColor.sharedInstance.brand
         self.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.navigationBarText
         self.navigationController?.navigationBar.titleTextAttributes = [NSAttributedStringKey.foregroundColor: NCBrandColor.sharedInstance.navigationBarText]
+        self.navigationController?.navigationBar.isTranslucent = false
 
         self.navigationItem.setRightBarButton(UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(viewClose)), animated: true)
         

+ 1 - 0
iOSClient/Settings/Acknowledgements.m

@@ -40,6 +40,7 @@
     [super viewDidLoad];
     
     [app aspectNavigationControllerBar:self.navigationController.navigationBar online:[app.reachability isReachable] hidden:NO];
+    self.navigationController.navigationBar.translucent = false;
     
     NSURL *rtfPath;
     

+ 2 - 1
iOSClient/Text/NCText.swift

@@ -48,7 +48,8 @@ class NCText: UIViewController, UITextViewDelegate {
         self.navigationController?.navigationBar.barTintColor = NCBrandColor.sharedInstance.brand
         self.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.navigationBarText
         self.navigationController?.navigationBar.titleTextAttributes = [NSAttributedStringKey.foregroundColor: NCBrandColor.sharedInstance.navigationBarText]
-        
+        self.navigationController?.navigationBar.isTranslucent = false
+
         self.navigationController?.toolbar.barTintColor = NCBrandColor.sharedInstance.navigationBarText
         self.navigationController?.toolbar.tintColor = NCBrandColor.sharedInstance.brand