IOS-170 unread filter can be applied to folder view
authorXavier Algarra <xavier@pep-project.org>
Thu, 22 Jun 2017 12:44:05 +0200
changeset 2325cf0e71c1ef72
parent 2324 7de8630d7725
child 2326 cab40e65c6ef
IOS-170 unread filter can be applied to folder view
pEpForiOS/UI/EmailDisplay/EmailListViewController.swift
pEpForiOS/UI/Folder/FolderTableViewController.swift
     1.1 --- a/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Thu Jun 22 12:28:47 2017 +0200
     1.2 +++ b/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Thu Jun 22 12:44:05 2017 +0200
     1.3 @@ -51,7 +51,7 @@
     1.4  
     1.5      override func viewWillAppear(_ animated: Bool) {
     1.6          super.viewWillAppear(animated)
     1.7 -
     1.8 +        self.navigationController?.setToolbarHidden(false, animated: true)
     1.9          if MiscUtil.isUnitTest() {
    1.10              return
    1.11          }
    1.12 @@ -68,6 +68,8 @@
    1.13          }
    1.14  
    1.15          MessageModelConfig.messageFolderDelegate = self
    1.16 +
    1.17 +        
    1.18      }
    1.19  
    1.20  
    1.21 @@ -391,6 +393,7 @@
    1.22                  destiny.filterDelegate = self
    1.23                  destiny.inFolder = false
    1.24                  destiny.filterEnabled = self.config?.folder?.filter as! Filter?
    1.25 +                destiny.hidesBottomBarWhenPushed = true
    1.26              }
    1.27              break
    1.28          case .segueAddNewAccount:
     2.1 --- a/pEpForiOS/UI/Folder/FolderTableViewController.swift	Thu Jun 22 12:28:47 2017 +0200
     2.2 +++ b/pEpForiOS/UI/Folder/FolderTableViewController.swift	Thu Jun 22 12:44:05 2017 +0200
     2.3 @@ -17,14 +17,13 @@
     2.4          super.viewDidLoad()
     2.5          initialConfig()
     2.6      }
     2.7 -
     2.8 +    
     2.9      func initialConfig() {
    2.10          self.title = NSLocalizedString("Folders", comment: "FolderView")
    2.11          tableView.estimatedRowHeight = 44.0
    2.12          tableView.rowHeight = UITableViewAutomaticDimension
    2.13          tableView.estimatedSectionHeaderHeight = 80.0
    2.14          tableView.sectionHeaderHeight = UITableViewAutomaticDimension
    2.15 -        self.navigationController?.hidesBottomBarWhenPushed = true
    2.16          let item = UIBarButtonItem(title: "Settings", style: .plain, target: self,
    2.17                                     action: #selector(settingsTapped))
    2.18          navigationItem.rightBarButtonItem = item
    2.19 @@ -35,11 +34,11 @@
    2.20      }
    2.21  
    2.22      override func viewWillDisappear(_ animated: Bool) {
    2.23 -        self.navigationController?.hidesBottomBarWhenPushed = false
    2.24      }
    2.25  
    2.26      override func viewWillAppear(_ animated: Bool) {
    2.27          super.viewWillAppear(animated)
    2.28 +        self.navigationController?.setToolbarHidden(true, animated: true)
    2.29  
    2.30      }
    2.31  
    2.32 @@ -97,6 +96,7 @@
    2.33                                           folder: folderVM[indexPath.section][indexPath.row]
    2.34                                              .getFolder())
    2.35              vc.config = config
    2.36 +            vc.hidesBottomBarWhenPushed = false
    2.37              self.navigationController?.pushViewController(vc, animated: true)
    2.38          }
    2.39      }