Merge pull request #9066 from vijaysingh-axway/TIMOB-16622

[TIMOB-16622] iOS:Replace UISearchDisplayController with UISearchController
tidev · Aug 8, 2017 · ce8b417 · ce8b417
2 parents 33be3a8 + 4396c00
commit ce8b417
Show file tree

Hide file tree

Showing 13 changed files with 411 additions and 175 deletions.
diff --git a/apidoc/Titanium/UI/ListView.yml b/apidoc/Titanium/UI/ListView.yml
@@ -1056,7 +1056,18 @@ properties:
     type: Dictionary
     since: "5.2.0"
     osver: {ios: {min: "7.0"}}
+    platforms: [iphone, ipad] 
+
+  - name: dimBackgroundForSearch
+    summary: A Boolean indicating whether the underlying content is dimmed during a search.
+    description: |
+          If you do not want to show the dimmed background when clicking on the search bar, 
+          set this property `false` during creation. 
+    type: Boolean
+    default: true 
+    since: 6.2.0
     platforms: [iphone, ipad]
+    availability: creation
 
   - name: resultsBackgroundColor
     summary: The background color of the search results (iOS-only).
@@ -1083,7 +1094,7 @@ properties:
     since: 6.1.0
     platforms: [iphone, ipad]
     availability: creation
-
+    
   - name: resultsSeparatorStyle
     summary: The separator style of the search results (iOS-only).
     type: Number
@@ -1104,7 +1115,7 @@ properties:
     since: 6.1.0
     platforms: [iphone, ipad]
     availability: creation
-    
+
 methods:
   - name: scrollToItem
     summary: Scrolls to a specific item.

diff --git a/apidoc/Titanium/UI/TableView.yml b/apidoc/Titanium/UI/TableView.yml
@@ -1503,6 +1503,17 @@ properties:
 
     type: [Titanium.UI.SearchBar, Titanium.UI.Android.SearchView]
     platforms: [android, iphone, ipad]
+
+  - name: dimBackgroundForSearch
+    summary: A Boolean indicating whether the underlying content is dimmed during a search.
+    description: |
+          If you do not want to show the dimmed background when clicking on the search bar, 
+          set this property `false` during creation. 
+    type: Boolean
+    default: true 
+    since: 6.2.0
+    platforms: [iphone, ipad]
+    availability: creation
 
   - name: searchAsChild
     summary: Determines whether the [SearchBar](Titanium.UI.SearchBar) or [SearchView](Titanium.UI.Android.SearchView) appears as part of the TableView.

diff --git a/iphone/Classes/TiUIListView.h b/iphone/Classes/TiUIListView.h
@@ -11,9 +11,9 @@
 
 #if IS_XCODE_8
 // Add support for iOS 10 table-view prefetching
-@interface TiUIListView : TiUIView <UITableViewDelegate, UITableViewDataSource, UITableViewDataSourcePrefetching, UIScrollViewDelegate, UIGestureRecognizerDelegate, UISearchBarDelegate, UISearchDisplayDelegate, TiScrolling, TiProxyObserver, TiUIListViewDelegateView>
+@interface TiUIListView : TiUIView <UITableViewDelegate, UITableViewDataSource, UITableViewDataSourcePrefetching, UIScrollViewDelegate, UIGestureRecognizerDelegate, UISearchBarDelegate,UISearchResultsUpdating, UISearchControllerDelegate, TiScrolling, TiProxyObserver, TiUIListViewDelegateView>
 #else
-@interface TiUIListView : TiUIView <UITableViewDelegate, UITableViewDataSource, UIScrollViewDelegate, UIGestureRecognizerDelegate, UISearchBarDelegate, UISearchDisplayDelegate, TiScrolling, TiProxyObserver, TiUIListViewDelegateView>
+@interface TiUIListView : TiUIView <UITableViewDelegate, UITableViewDataSource, UIScrollViewDelegate, UIGestureRecognizerDelegate, UISearchBarDelegate, UISearchResultsUpdating, UISearchControllerDelegate, TiScrolling, TiProxyObserver, TiUIListViewDelegateView>
 #endif
 
 #pragma mark - Private APIs