refactored search

deltachat-ios/Controller/PreviewController.swift

@@ -11,7 +11,6 @@ class PreviewController: QLPreviewController {
     }()
 
     private let bottomToolbarIdentifier = "QLCustomToolBarModalAccessibilityIdentifier"
-    private let shareIdentifier = "QLOverlayDefaultActionButtonAccessibilityIdentifier"
     private let listButtonIdentifier = "QLOverlayListButtonAccessibilityIdentifier"
 
     init(currentIndex: Int, urls: [URL]) {
@@ -38,10 +37,7 @@ class PreviewController: QLPreviewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         // native toolbar is accessable just on and after viewWillAppear
-        let bottomToolbar = traverseSearchToolbar(root: self.view)
-        if let bottomToolbar = bottomToolbar {
-            hideListItem(toolbar: bottomToolbar)
-        }
+        hideListButtonInBottomToolBarIfNeeded()
         hideListButtonInNavigationBarIfNeeded()
     }
 
@@ -64,41 +60,42 @@ extension PreviewController: QLPreviewControllerDataSource {
 
 // MARK: - customisation (to hide list button)
 private extension PreviewController {
-    // MARK: - bottom bar customisation
-    func traverseSearchToolbar(root: UIView) -> UIToolbar? {
 
-        if let toolbar = root as? UIToolbar {
-            if toolbar.accessibilityIdentifier == bottomToolbarIdentifier {
-                return toolbar
+    func hideListButtonInBottomToolBarIfNeeded() {
+        let bottomToolbar = getQLBottomToolbar(root: self.view)
+        if let toolbar = bottomToolbar {
+            for item in toolbar.items ?? [] {
+                if item.accessibilityIdentifier == listButtonIdentifier {
+                    item.tintColor = .clear
+                    item.action = nil
+                }
             }
         }
-        if root.subviews.isEmpty {
-            return nil
-        }
+    }
 
-        var subviews = root.subviews
-        var current = subviews.popLast()
-        while current != nil {
-            if let current = current, let toolbar = traverseSearchToolbar(root: current) {
-                return toolbar
-            }
-            current = subviews.popLast()
+    func hideListButtonInNavigationBarIfNeeded() {
+        guard let navBar = getQLNavigationBar(rootView: view) else {
+            return
+        }
+        if let items = navBar.items, let item = items.first {
+           let leftItems = item.leftBarButtonItems
+            let listButton = leftItems?.filter { $0.accessibilityIdentifier == listButtonIdentifier }.first
+            // listButton is impossible to remove so we make it invisible
+            listButton?.isEnabled = false
+            listButton?.tintColor = .clear
         }
-        return nil
     }
 
-    func hideListItem(toolbar: UIToolbar) {
-        // share item, flex item, list item
-        for item in toolbar.items ?? [] {
-            if item.accessibilityIdentifier == listButtonIdentifier {
-                item.tintColor = .clear
-                item.action = nil
-            }
+    func getQLBottomToolbar(root: UIView) -> UIToolbar? {
+
+        if let toolbar = root as? UIToolbar, toolbar.accessibilityIdentifier == bottomToolbarIdentifier {
+            return toolbar
         }
+        return root.subviews.compactMap {
+            getQLBottomToolbar(root: $0)
+        }.first
     }
 
-    // MARK: - navigation bar customization
-
     func getQLNavigationBar(rootView: UIView) -> UINavigationBar? {
         for subview in rootView.subviews {
             if subview is UINavigationBar {
@@ -111,18 +108,4 @@ private extension PreviewController {
         }
         return nil
     }
-
-    func hideListButtonInNavigationBarIfNeeded() {
-        guard let navBar = getQLNavigationBar(rootView: view) else {
-            return
-        }
-        if let items = navBar.items, let item = items.first {
-           let leftItems = item.leftBarButtonItems
-            let listButton = leftItems?.filter { $0.accessibilityIdentifier == listButtonIdentifier }.first
-            // listButton is impossible to remove so we make it invisible
-            listButton?.isEnabled = false
-            listButton?.tintColor = .clear
-        }
-    }
-
 }