Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-16622] iOS:Replace UISearchDisplayController with UISearchController #9066

Merged
merged 23 commits into from
Aug 8, 2017
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5d2ee66
[TIMOB-16622]: Replaced UISearchDisplayController with UISearchContro…
vijaysingh-axway May 17, 2017
65e8ec4
[TIMOB-16622]:Replace UISearchDisplayController with UISearchController
vijaysingh-axway May 17, 2017
8f0bda9
[TIMOB-16622]: check applied when search is active
vijaysingh-axway May 18, 2017
326854a
[TIMOB-16622]:default of dimsbackgroundcolor set
vijaysingh-axway May 18, 2017
cc5626d
Merge branch 'master' into TIMOB-16622
hansemannn May 18, 2017
92c5bd0
[TIMOB-16622]: In TiUITableView UISearchDisplayController replaced w…
vijaysingh-axway May 19, 2017
715fd6a
Merge branch 'TIMOB-16622' of https://github.com/vijaysingh-axway/tit…
vijaysingh-axway May 19, 2017
82777b6
code alignment
vijaysingh-axway May 19, 2017
da16438
[TIMOB-16622]:width of search bar fixed while rotation
vijaysingh-axway May 19, 2017
11151f1
Merge branch 'TIMOB-16622' of https://github.com/vijaysingh-axway/tit…
vijaysingh-axway May 19, 2017
9dcf45d
Merge branch 'master' into TIMOB-16622
hansemannn May 26, 2017
8276351
Merge branch 'master' into TIMOB-16622
hansemannn May 28, 2017
32ad6f8
[TIMOB-16622]:Doc updated
vijaysingh-axway May 29, 2017
7c492f6
[TIMOB-16622]:Doc updated with proper formatting
vijaysingh-axway May 29, 2017
0c21389
[TIMOB-16622]: UISearchController used in place of deprecated UISearc…
vijaysingh-axway Jun 19, 2017
019f1f5
[TIMOB-16622]:UISearhViewController used instead of UISearchDisplayCo…
vijaysingh-axway Jun 19, 2017
0870b11
[TIMOB-16622]: dimBackgroundForSearch property documented
vijaysingh-axway Jun 20, 2017
9089e31
Merge branch 'master' into TIMOB-16622
hansemannn Jul 4, 2017
7b84063
[TIMOB-16622] Fix minor outstanding review-issues
hansemannn Jul 4, 2017
ad81b10
[TIMOB-16622]: If search bar separately to listview
vijaysingh-axway Jul 19, 2017
333ac7d
Merge branch 'master' into TIMOB-16622
mukherjee2 Aug 2, 2017
d3eacd2
Merge branch 'master' into TIMOB-16622
ewieberappc Aug 8, 2017
4396c00
Merge branch 'master' into TIMOB-16622
ewieberappc Aug 8, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions apidoc/Titanium/UI/ListView.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand All @@ -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
Expand All @@ -1104,7 +1115,7 @@ properties:
since: 6.1.0
platforms: [iphone, ipad]
availability: creation

methods:
- name: scrollToItem
summary: Scrolls to a specific item.
Expand Down
11 changes: 11 additions & 0 deletions apidoc/Titanium/UI/TableView.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions iphone/Classes/TiUIListView.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down