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
Changes from 1 commit
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
12 changes: 8 additions & 4 deletions iphone/Classes/TiUIListView.m
Original file line number Diff line number Diff line change
Expand Up @@ -578,10 +578,10 @@ - (void)updateSearchResults:(id)unused
{
if (searchActive) {
[self buildResultsForSearchText];
[resultViewController.tableView reloadData];
}
else {
[_tableView reloadData];
[_tableView reloadData];
if ([searchController isActive]) {
[resultViewController.tableView reloadData];
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation. Also, when would searchActive be NO but [searchController isActive] be YES?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are 2 ways we can use search in list view -

  1. add searcbar on window, and show search result in same table view (see last test case in ticket)
  2. make search bar part of list view (see test case in ticket except last)
    In second way, when we click on searchbar [searchController isActive] will be yes.
    But for searchActive being to Yes, there should be atleast one character in search bar.
    So when second way of search used, user clicked on search bar and not typed any character, [searchController isActive] will be YES and searchActive will be NO.
    If you see the old implementation, it is in same way.

Are you sure there is problem in indentation, I don't think so.

}
}

Expand Down Expand Up @@ -898,7 +898,11 @@ -(void)setCaseInsensitiveSearch_:(id)args
caseInsensitiveSearch = [TiUtils boolValue:args def:YES];
if (searchActive) {
[self buildResultsForSearchText];
[_tableView reloadData];
if ([searchController isActive]) {
[[resultViewController tableView] reloadData];
} else {
[_tableView reloadData];
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same question as above.

}
}

Expand Down