diff --git a/RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchViewController.swift b/RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchViewController.swift index 0b74925e..a3621321 100644 --- a/RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchViewController.swift +++ b/RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchViewController.swift @@ -13,13 +13,20 @@ import RxCocoa #endif class WikipediaSearchViewController: ViewController { + @IBOutlet var searchBarContainer: UIView! + + private let searchController = UISearchController(searchResultsController: UITableViewController()) + + private var resultsViewController: UITableViewController { + return (self.searchController.searchResultsController as? UITableViewController)! + } private var resultsTableView: UITableView { - return self.searchDisplayController!.searchResultsTableView + return self.resultsViewController.tableView! } private var searchBar: UISearchBar { - return self.searchDisplayController!.searchBar + return self.searchController.searchBar } override func awakeFromNib() { @@ -31,6 +38,13 @@ class WikipediaSearchViewController: ViewController { override func viewDidLoad() { super.viewDidLoad() + let searchBar = self.searchBar + let searchBarContainer = self.searchBarContainer + + searchBarContainer.addSubview(searchBar) + searchBar.frame = searchBarContainer.bounds + searchBar.autoresizingMask = .FlexibleWidth + configureTableDataSource() configureKeyboardDismissesOnScroll() configureNavigateOnRowClick()