Updated travis.yml and updated search example for iOS11

hackiftekhar · Mar 14, 2018 · 7c71fc6 · 7c71fc6
1 parent 520afdd
commit 7c71fc6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
           only:
               - master
       os: osx
-      osx_image: xcode9
+      osx_image: xcode9.2
       xcode_workspace: Demo.xcworkspace
       xcode_project: Demo.xcodeproj
       xcode_scheme: DemoObjC
@@ -22,7 +22,7 @@ matrix:
           only:
               - master
       os: osx
-      osx_image: xcode9
+      osx_image: xcode9.2
       xcode_workspace: Demo.xcworkspace
       xcode_project: Demo.xcodeproj
       xcode_scheme: DemoSwift

diff --git a/Demo/Objective_C_Demo/ViewController/SearchViewController.m b/Demo/Objective_C_Demo/ViewController/SearchViewController.m
@@ -41,8 +41,11 @@ - (void)viewDidLoad {
     self.searchController.searchBar.delegate = self;
     [self.searchController.searchBar sizeToFit];
 
-    self.tableView.tableHeaderView = self.searchController.searchBar;
-    self.definesPresentationContext = YES;
+    if ([[NSProcessInfo processInfo] operatingSystemVersion].majorVersion >= 11) {
+        self.navigationItem.searchController = searchController
+    } else {
+        self.tableView.tableHeaderView = self.searchController.searchBar
+    }
 }
 
 - (void)searchForText:(NSString *)searchText scope:(NSInteger)scopeOption

diff --git a/Demo/Swift_Demo/ViewController/SearchViewController.swift b/Demo/Swift_Demo/ViewController/SearchViewController.swift
@@ -23,18 +23,22 @@ class SearchViewController: UITableViewController, UISearchResultsUpdating, UISe
 
     var filteredList = [[String:String]]()
 
-    let searchController = UISearchController()
-    
+    var searchController : UISearchController!
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        self.searchController = UISearchController(searchResultsController: nil)
         self.searchController.searchResultsUpdater = self
         self.searchController.dimsBackgroundDuringPresentation = false
         self.searchController.searchBar.scopeButtonTitles = ["All", "Name", "Email"]
         self.searchController.searchBar.delegate = self
         self.searchController.searchBar.sizeToFit()
-        self.tableView.tableHeaderView = self.searchController.searchBar
-        self.definesPresentationContext = true
+        if #available(iOS 11.0, *) {
+            navigationItem.searchController = searchController
+        } else {
+            self.tableView.tableHeaderView = self.searchController.searchBar
+        }
     }
 
     override func viewDidAppear(_ animated: Bool) {