Explorar o código

Fix for large titles

Signed-off-by: Philippe Weidmann <philippe.weidmann@infomaniak.com>
Philippe Weidmann %!s(int64=4) %!d(string=hai) anos
pai
achega
35e7b814b2
Modificáronse 2 ficheiros con 4 adicións e 7 borrados
  1. 3 6
      iOSClient/Main/CCMain.m
  2. 1 1
      iOSClient/Main/Main.storyboard

+ 3 - 6
iOSClient/Main/CCMain.m

@@ -168,6 +168,7 @@
     self.searchController.hidesNavigationBarDuringPresentation = true;
     self.navigationController.navigationBar.prefersLargeTitles = true;
     self.navigationItem.hidesSearchBarWhenScrolling = true;
+    self.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeAlways;
     [self.navigationController.navigationBar sizeToFit];
 
     // Table Header View
@@ -216,7 +217,7 @@
 {
     [super viewWillAppear:animated];
     [self updateNavBarShadow:self.tableView force:false];
-    if(_isViewDidLoad) {
+    if(_isViewDidLoad && _isRoot) {
         self.navigationItem.hidesSearchBarWhenScrolling = false;
     }
     // test
@@ -246,7 +247,7 @@
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-    if(_isViewDidLoad) {
+    if(_isViewDidLoad && _isRoot) {
         self.navigationItem.hidesSearchBarWhenScrolling = true;
     }
     // Active Main
@@ -727,10 +728,6 @@
         self.navigationItem.title = [NSString stringWithFormat:@"%@ : %lu / %lu", NSLocalizedString(@"_selected_", nil), (unsigned long)selezionati, (unsigned long)totali];
 
     } else {
-       
-        self.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeAlways;
-        self.navigationController.navigationBar.prefersLargeTitles = true;
-        
         if (_isRoot) {
             self.navigationItem.title = NCBrandOptions.sharedInstance.brand;
         } else {

+ 1 - 1
iOSClient/Main/Main.storyboard

@@ -461,7 +461,7 @@
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="Sqy-z1-MI5"/>
                     </view>
-                    <navigationItem key="navigationItem" id="2BC-Vb-dXh"/>
+                    <navigationItem key="navigationItem" largeTitleDisplayMode="always" id="2BC-Vb-dXh"/>
                     <connections>
                         <outlet property="tableView" destination="dC6-NQ-0Td" id="hew-Gn-bWh"/>
                         <segue destination="mtc-lf-PRo" kind="showDetail" identifier="segueDetail" id="2Qm-A6-CfB"/>