修改搜索界面显示方式

Author: klaus01

ruby-china-ios/Controllers/RootTopicsViewController.swift

@@ -72,7 +72,12 @@ extension RootTopicsViewController {
 
     func searchAction() {
         let vc = SearchViewController()
-        navigationController?.pushViewController(vc, animated: true)
+        vc.onCancel = { sender in
+            sender.dismissViewControllerAnimated(true, completion: nil)
+        }
+        
+        let nc = UINavigationController(rootViewController: vc)
+        self.presentViewController(nc, animated: true, completion: nil)
     }
 
     func newTopicAction() {

ruby-china-ios/Controllers/SearchViewController.swift

@@ -27,24 +27,27 @@ class SearchViewController: WebViewController {
             if let clearButton = searchField.valueForKey("_clearButton") as? UIButton, clearImage = clearButton.imageForState(.Normal) {
                 view.setImage(clearImage.imageWithColor(searchField.textColor!), forSearchBarIcon: .Clear, state: .Normal)
             }
-            
         }
         return view
     }()
 
+    var onCancel: (SearchViewController -> ())?
+    
     override func viewDidLoad() {
         currentPath = searchPath
         super.viewDidLoad()
         navigationItem.titleView = searchBar
+        let cancelItem = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: #selector(cancelButtonAction))
+        navigationItem.rightBarButtonItem = cancelItem
     }
 
     override func visitableDidRender() {
         super.visitableDidRender()
         visitableView.webView?.hidden = currentPath == searchPath
     }
 
-    override func viewDidAppear(animated: Bool) {
-        super.viewDidAppear(animated)
+    override func viewWillAppear(animated: Bool) {
+        super.viewWillAppear(animated)
         if searchBar.text == nil || searchBar.text!.characters.count <= 0 {
             searchBar.becomeFirstResponder()
         }
@@ -59,6 +62,7 @@ class SearchViewController: WebViewController {
 // MARK: - UISearchBarDelegate
 
 extension SearchViewController: UISearchBarDelegate {
+    
     func searchBarSearchButtonClicked(searchBar: UISearchBar) {
         searchBar.resignFirstResponder()
         let text = searchBar.text ?? ""
@@ -68,4 +72,15 @@ extension SearchViewController: UISearchBarDelegate {
             reloadVisitable()
         }
     }
+    
+}
+
+// MARK: - action
+
+extension SearchViewController {
+    
+    func cancelButtonAction() {
+        onCancel?(self)
+    }
+    
 }