pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] remove search progress spinner from bookmarks list

Browse source 
due to usage of undocumented API
This commit is contained in:
Aleksey Belouosv 2019-09-30 13:48:05 +03:00 • committed by Aleksey Belousov
parent 7b09b2d50f
commit f924828686
1 changed files with 4 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
iphone/Maps/Bookmarks/BookmarksVC.mm
View file

@ -50,7 +50,6 @@ using namespace std;
@property(nonatomic) MWMSearchNoResults *noResultsView;
@property(nonatomic) UIActivityIndicatorView *spinner;
@property(nonatomic) UIImageView *searchIcon;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *hideSearchBar;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *showSearchBar;
@ -246,8 +245,9 @@ using namespace std;
self.myCategoryToolbar.barTintColor = [UIColor white];
self.downloadedCategoryToolbar.barTintColor = [UIColor white];
[self showSpinner:NO];
[self.searchBar setImage:[UIImage imageNamed:@"ic_search"]
forSearchBarIcon:UISearchBarIconSearch
state:UIControlStateNormal];
[self refreshDefaultSections];
}
@ -500,8 +500,6 @@ using namespace std;
GetFramework().CancelSearch(search::Mode::Bookmarks);
[self showNoResultsView:NO];
[self showSpinner:NO];
self.searchSections = nil;
[self refreshDefaultSections];
[self.tableView reloadData];
@ -545,28 +543,6 @@ using namespace std;
return _spinner;
}
- (UIImageView *)searchIcon {
if (!_searchIcon) {
_searchIcon = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ic_search"]];
_searchIcon.mwm_coloring = MWMImageColoringBlack;
}
return _searchIcon;
}
- (void)showSpinner:(BOOL)show {
if (@available(iOS 13, *)) {
UITextField *textField = self.searchBar.searchTextField;
if (!show) {
textField.leftView = self.searchIcon;
[self.spinner stopAnimating];
} else {
self.spinner.bounds = textField.leftView.bounds;
textField.leftView = self.spinner;
[self.spinner startAnimating];
}
}
}
- (NSString *)categoryFileName {
return @(GetFramework().GetBookmarkManager().GetCategoryFileName(self.categoryId).c_str());
}
@ -677,11 +653,8 @@ using namespace std;
bm.FilterInvalidBookmarks(filteredResults);
[self setSearchSection:filteredResults];
if (status == search::BookmarksSearchParams::Status::Cancelled) {
[self showSpinner:NO];
} else if (status == search::BookmarksSearchParams::Status::Completed) {
if (status == search::BookmarksSearchParams::Status::Completed) {
[self showNoResultsView:results.empty()];
[self showSpinner:NO];
}
[self.tableView reloadData];
@ -689,8 +662,6 @@ using namespace std;
[Statistics logEvent:kStatBookmarksSearch withParameters:@{kStatFrom : kStatBookmarksList}];
};
[self showSpinner:YES];
GetFramework().SearchInBookmarks(searchParams);
}