diff --git a/iphone/Maps/Bookmarks/AddSetVC.mm b/iphone/Maps/Bookmarks/AddSetVC.mm index 4eaf2121cd..34acd79183 100644 --- a/iphone/Maps/Bookmarks/AddSetVC.mm +++ b/iphone/Maps/Bookmarks/AddSetVC.mm @@ -2,7 +2,6 @@ #import "AddSetVC.h" #import "UIViewController+Navigation.h" #import "AddSetTableViewCell.h" -#import "UIColor+MapsMeColor.h" #include "Framework.h" @@ -61,7 +60,6 @@ static NSString * const kAddSetCellTableViewCell = @"AddSetTableViewCell"; { self.cell = (AddSetTableViewCell *)[tableView dequeueReusableCellWithIdentifier:kAddSetCellTableViewCell]; self.cell.delegate = self; - self.cell.backgroundColor = [UIColor white]; return self.cell; } diff --git a/iphone/Maps/Bookmarks/SelectSetVC.mm b/iphone/Maps/Bookmarks/SelectSetVC.mm index 65064d9e4f..7f8e6627cb 100644 --- a/iphone/Maps/Bookmarks/SelectSetVC.mm +++ b/iphone/Maps/Bookmarks/SelectSetVC.mm @@ -3,7 +3,6 @@ #import "MWMPlacePageEntity.h" #import "MWMPlacePageViewManager.h" #import "SelectSetVC.h" -#import "UIColor+MapsMeColor.h" #import "UIViewController+Navigation.h" #include "Framework.h" @@ -94,8 +93,6 @@ else cell.accessoryType = UITableViewCellAccessoryNone; } - cell.backgroundColor = [UIColor white]; - cell.textLabel.textColor = [UIColor blackPrimaryText]; return cell; } diff --git a/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm b/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm index bc883aa144..80b219a73c 100644 --- a/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm +++ b/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm @@ -115,8 +115,6 @@ namespace - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:[UITableViewCell className]]; - cell.textLabel.textColor = [UIColor blackPrimaryText]; - cell.backgroundColor = [UIColor white]; cell.textLabel.text = @([self dataSourceForSection:indexPath.section][indexPath.row].m_name.c_str()); if ([indexPath isEqual:self.selectedIndexPath]) cell.accessoryType = UITableViewCellAccessoryCheckmark; diff --git a/iphone/Maps/Classes/MWMPlacePageButtonCell.xib b/iphone/Maps/Classes/MWMPlacePageButtonCell.xib index 862e82614c..eb5fdbf27d 100644 --- a/iphone/Maps/Classes/MWMPlacePageButtonCell.xib +++ b/iphone/Maps/Classes/MWMPlacePageButtonCell.xib @@ -45,6 +45,7 @@ + diff --git a/iphone/Maps/Classes/MWMTableViewCell.mm b/iphone/Maps/Classes/MWMTableViewCell.mm index bbe319071f..9345677ab9 100644 --- a/iphone/Maps/Classes/MWMTableViewCell.mm +++ b/iphone/Maps/Classes/MWMTableViewCell.mm @@ -21,6 +21,8 @@ - (void)configure { + self.backgroundColor = [UIColor white]; + self.textLabel.textColor = [UIColor blackPrimaryText]; self.selectedBackgroundView = [[UIView alloc] init]; self.selectedBackgroundView.backgroundColor = [UIColor pressBackground]; } diff --git a/iphone/Maps/CommunityVC.mm b/iphone/Maps/CommunityVC.mm index f5532c05a7..5b578e6feb 100644 --- a/iphone/Maps/CommunityVC.mm +++ b/iphone/Maps/CommunityVC.mm @@ -1,7 +1,6 @@ #import "CommunityVC.h" #import #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" #import "UIViewController+Navigation.h" @@ -61,8 +60,6 @@ extern NSString * const kAlohalyticsTapEventKey; cell.textLabel.text = item[@"Title"]; cell.imageView.image = [UIImage imageNamed:item[@"Icon"]]; cell.imageView.mwm_coloring = MWMImageColoringBlack; - cell.backgroundColor = [UIColor white]; - cell.textLabel.textColor = [UIColor blackPrimaryText]; return cell; } diff --git a/iphone/Maps/SettingsAndMoreVC.mm b/iphone/Maps/SettingsAndMoreVC.mm index d78549f0c6..7ffa637242 100644 --- a/iphone/Maps/SettingsAndMoreVC.mm +++ b/iphone/Maps/SettingsAndMoreVC.mm @@ -10,7 +10,6 @@ #import #import -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" #import "3party/Alohalytics/src/alohalytics_objc.h" @@ -128,14 +127,10 @@ extern NSDictionary * const deviceNames = @{@"x86_64" : @"Simulator", if (!cell) // iOS 5 cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:[UITableViewCell className]]; - cell.backgroundColor = [UIColor white]; NSString * osmUserName = osm_auth_ios::OSMUserName(); cell.textLabel.text = [item[@"Id"] isEqualToString:@"Authorization"] && osmUserName ? osmUserName : item[@"Title"]; cell.imageView.image = [UIImage imageNamed:item[@"Icon"]]; cell.imageView.mwm_coloring = MWMImageColoringBlack; - cell.textLabel.textColor = [UIColor blackPrimaryText]; - cell.textLabel.backgroundColor = [UIColor clearColor]; - return cell; }