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

[ios] Review fixes.

Browse source
This commit is contained in:
VladiMihaylenko 2016-02-09 17:52:06 +03:00 • committed by Sergey Yershov
parent fc54d06072
commit 90ae342deb
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.mm
View file

@ -34,12 +34,17 @@ namespace
- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
{
self.filtredKeys = [_cuisineKeys filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSString * value, NSDictionary<NSString *,id> *)
if (!searchText.length)
{
self.filtredKeys = nil;
return;
}
NSLocale * locale = [NSLocale currentLocale];
NSString * query = [searchText lowercaseStringWithLocale:locale];
self.filtredKeys = [self.cuisineKeys filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSString * value, NSDictionary<NSString *,id> *)
{
if (!searchText.length)
return YES;
NSString * cuisine = [NSString stringWithFormat:@"cuisine_%@", value];
return [[L(cuisine) capitalizedStringWithLocale:[NSLocale currentLocale]] containsString:searchText];
return [[L(cuisine) lowercaseStringWithLocale:locale] containsString:query];
}]];
}
@ -51,11 +56,8 @@ namespace
- (BOOL)searchBarShouldEndEditing:(UISearchBar *)searchBar
{
if (searchBar.text.length == 0)
{
if (!searchBar.text.length)
[self searchBar:searchBar setActiveState:NO];
self.filtredKeys = nil;
}
return YES;
}
@ -137,9 +139,9 @@ namespace
#pragma mark - Accessors
- (NSArray<NSString *> *)cuisineKeys
- (NSArray<NSString *> *)displayKeys
{
return self.filtredKeys != nil ? self.filtredKeys : _cuisineKeys;
return self.filtredKeys != nil ? self.filtredKeys : self.cuisineKeys;
}
- (void)setFiltredKeys:(NSArray<NSString *> *)filtredKeys
@ -180,7 +182,7 @@ namespace
- (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section
{
return self.cuisineKeys.count;
return self.displayKeys.count;
}
#pragma mark - UITableViewDelegate
@ -188,7 +190,7 @@ namespace
- (void)tableView:(UITableView * _Nonnull)tableView willDisplayCell:(MWMCuisineEditorTableViewCell * _Nonnull)cell forRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath
{
NSInteger const index = indexPath.row;
NSString * cuisine = self.cuisineKeys[index];
NSString * cuisine = self.displayKeys[index];
BOOL const selected = [self.selectedCuisines containsObject:cuisine];
[cell configWithDelegate:self key:cuisine selected:selected];
}

7
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -666,7 +666,12 @@ using namespace osm_auth_ios;
UISearchBar * searchBar = [UISearchBar appearance];
searchBar.barTintColor = [UIColor primary];
UITextField * textFieldInSearchBar = [UITextField appearanceWhenContainedIn:[UISearchBar class], nil];
UITextField * textFieldInSearchBar = nil;
if (isIOS7 || isIOS8)
textFieldInSearchBar = [UITextField appearanceWhenContainedIn:[UISearchBar class], nil];
else
textFieldInSearchBar = [UITextField appearanceWhenContainedInInstancesOfClasses:@[[UISearchBar class]]];
textField.backgroundColor = [UIColor white];
textFieldInSearchBar.defaultTextAttributes = @{NSForegroundColorAttributeName : [UIColor blackPrimaryText]};
}