nav bar fixes

Signed-off-by: Philippe Weidmann <philippe.weidmann@infomaniak.com>

iOSClient/Main/CCMain+Swift.swift

@@ -10,34 +10,21 @@ import Foundation
 
 extension CCMain {
 
-    @objc func updateNavBarShadow(_ scrollView: UIScrollView) {
-        if(self.searchController.isActive && scrollView.contentOffset.y > 44) {
-            let searchBar = self.searchController.searchBar
-            if(searchBar.layer.sublayers!.count < 2) {
-                let border = CALayer()
-
-                border.backgroundColor = UIColor.lightGray.withAlphaComponent(0.6).cgColor
-                border.frame = CGRect(x: 0, y: searchBar.frame.height - 1, width: searchBar.frame.size.width, height: 1)
-                searchBar.layer.addSublayer(border)
-            }
-        } else {
-            let searchBar = self.searchController.searchBar
-            if(searchBar.layer.sublayers!.count > 1) {
-                searchBar.layer.sublayers?.removeLast()
-            }
-        }
-
-        if (scrollView.contentOffset.y > self.viewRichWorkspace.topView.frame.size.height) {
+    @objc func updateNavBarShadow(_ scrollView: UIScrollView, force: Bool) {
+        print(scrollView.contentOffset.y)
+        if (scrollView.contentOffset.y > self.viewRichWorkspace.topView.frame.size.height || self.searchController.isActive || force) {
             if #available(iOS 13.0, *) {
                 let navBarAppearance = UINavigationBarAppearance()
                 navBarAppearance.configureWithOpaqueBackground()
                 navBarAppearance.backgroundColor = .systemBackground
                 self.navigationController?.navigationBar.standardAppearance = navBarAppearance
+                self.navigationController?.navigationBar.scrollEdgeAppearance = navBarAppearance
             } else {
                 self.navigationController?.navigationBar.barStyle = .default
                 self.navigationController?.navigationBar.barTintColor = NCBrandColor.sharedInstance.backgroundView
                 self.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.brand
                 self.navigationController?.navigationBar.shadowImage = nil
+                self.navigationController?.navigationBar.setValue(false, forKey: "hidesShadow")
             }
             self.navigationController?.navigationBar.setNeedsLayout()
 
@@ -49,11 +36,13 @@ extension CCMain {
                 navBarAppearance.shadowColor = .clear
                 navBarAppearance.shadowImage = UIImage()
                 self.navigationController?.navigationBar.standardAppearance = navBarAppearance
+                self.navigationController?.navigationBar.scrollEdgeAppearance = navBarAppearance
             } else {
                 self.navigationController?.navigationBar.barStyle = .default
                 self.navigationController?.navigationBar.barTintColor = NCBrandColor.sharedInstance.backgroundView
                 self.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.brand
                 self.navigationController?.navigationBar.shadowImage = UIImage()
+                self.navigationController?.navigationBar.setValue(true, forKey: "hidesShadow")
             }
             self.navigationController?.navigationBar.setNeedsLayout()
         }

iOSClient/Main/CCMain.m

@@ -140,9 +140,6 @@
     self.definesPresentationContext = YES;
     self.searchController.searchResultsUpdater = self;
     self.searchController.dimsBackgroundDuringPresentation = NO;
-    self.searchController.searchBar.translucent = NO;
-    self.searchController.searchBar.backgroundColor = NCBrandColor.sharedInstance.backgroundView;
-    self.searchController.searchBar.searchBarStyle = UISearchBarStyleMinimal;
     UIButton *searchButton = self.searchController.searchBar.subviews.firstObject.subviews.lastObject;
     if (searchButton && [searchButton isKindOfClass:[UIButton class]]) {
         [searchButton setTitleColor:NCBrandColor.sharedInstance.brand forState:UIControlStateNormal];
@@ -172,6 +169,10 @@
     heightRichWorkspace = UIScreen.mainScreen.bounds.size.height / 4 + heightSearchBar;
     [self.viewRichWorkspace setFrame:CGRectMake(0, 0, self.tableView.frame.size.width, heightRichWorkspace)];
     self.navigationItem.searchController = self.searchController;
+    self.searchController.hidesNavigationBarDuringPresentation = true;
+    self.navigationController.navigationBar.prefersLargeTitles = true;
+    self.navigationItem.hidesSearchBarWhenScrolling = false;
+    [self.navigationController.navigationBar sizeToFit];
 
     // Table Header View
     [self.tableView setTableHeaderView:self.viewRichWorkspace];
@@ -209,11 +210,15 @@
     [self.tableView scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
 }
 
+- (void)willPresentSearchController:(UISearchController *)searchController
+{
+    [self updateNavBarShadow:self.tableView force:true];
+}
+
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    [self updateNavBarShadow:self.tableView];
-
+    [self updateNavBarShadow:self.tableView force:false];
     // test
     if (appDelegate.activeAccount.length == 0)
         return;
@@ -241,7 +246,8 @@
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-    
+    self.navigationItem.hidesSearchBarWhenScrolling = true;
+
     // Active Main
     appDelegate.activeMain = self;
     
@@ -311,7 +317,7 @@
 }
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
-    [self updateNavBarShadow:scrollView];
+    [self updateNavBarShadow:self.tableView force:false];
 }
 
 - (void)changeTheming
@@ -327,7 +333,6 @@
 
     [self.sortButton setTitleColor:NCBrandColor.sharedInstance.brand forState:UIControlStateNormal];
     // color searchbar
-    self.searchController.searchBar.backgroundColor = NCBrandColor.sharedInstance.backgroundView;
     self.searchController.searchBar.tintColor = NCBrandColor.sharedInstance.brand;
     // color searchbbar button text (cancel)
     UIButton *searchButton = self.searchController.searchBar.subviews.firstObject.subviews.lastObject;
@@ -2880,7 +2885,7 @@
 {
     tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:appDelegate.activeAccount];
   
-    if (capabilities.versionMajor < k_nextcloud_version_18_0 || self.richWorkspaceText.length == 0 || self.searchController.isActive) {
+    if (capabilities.versionMajor < k_nextcloud_version_18_0 || self.richWorkspaceText.length == 0) {
                 
         [self.tableView.tableHeaderView setFrame:CGRectMake(self.tableView.tableHeaderView.frame.origin.x, self.tableView.tableHeaderView.frame.origin.y, self.tableView.frame.size.width, heightSearchBar)];
         
@@ -2889,9 +2894,12 @@
         [self.viewRichWorkspace setFrame:CGRectMake(self.tableView.tableHeaderView.frame.origin.x, self.tableView.tableHeaderView.frame.origin.y, self.tableView.frame.size.width, heightRichWorkspace)];
     }
     
-    [self.searchController.searchBar sizeToFit];
+    if (self.searchController.isActive == true) {
+        [self.tableView.tableHeaderView setFrame:CGRectMake(self.tableView.tableHeaderView.frame.origin.x, self.tableView.tableHeaderView.frame.origin.y, self.tableView.frame.size.width, 0)];
+    }
+    
+    [self.viewRichWorkspace setNeedsLayout];
     [self.viewRichWorkspace loadWithRichWorkspaceText:self.richWorkspaceText];
-    [self.tableView reloadData];
 }
 
 - (void)setTableViewFooter

iOSClient/RichWorkspace/NCRichWorkspace.xib

@@ -23,7 +23,7 @@
                                 <constraint firstAttribute="height" constant="32" id="zgp-GM-5ua"/>
                             </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                            <inset key="titleEdgeInsets" minX="16" minY="0.0" maxX="16" maxY="0.0"/>
+                            <inset key="titleEdgeInsets" minX="24" minY="0.0" maxX="16" maxY="0.0"/>
                             <state key="normal" title="Order by"/>
                         </button>
                         <view alpha="0.59999999999999998" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iLg-Pa-y0u">