Fix QA issues in theme.

pull/1/head
Matthew Chen 7 years ago
parent e628962fda
commit 22dda476bb

@ -143,7 +143,6 @@
cell.textLabel.text = NSLocalizedString(@"NETWORK_STATUS_HEADER", @""); cell.textLabel.text = NSLocalizedString(@"NETWORK_STATUS_HEADER", @"");
cell.selectionStyle = UITableViewCellSelectionStyleNone; cell.selectionStyle = UITableViewCellSelectionStyleNone;
UILabel *accessoryLabel = [UILabel new]; UILabel *accessoryLabel = [UILabel new];
accessoryLabel.font = [UIFont ows_regularFontWithSize:18.f];
if (TSAccountManager.sharedInstance.isDeregistered) { if (TSAccountManager.sharedInstance.isDeregistered) {
accessoryLabel.text = NSLocalizedString(@"NETWORK_STATUS_DEREGISTERED", accessoryLabel.text = NSLocalizedString(@"NETWORK_STATUS_DEREGISTERED",
@"Error indicating that this device is no longer registered."); @"Error indicating that this device is no longer registered.");

@ -157,10 +157,14 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
UITextField *groupNameTextField = [UITextField new]; UITextField *groupNameTextField = [UITextField new];
_groupNameTextField = groupNameTextField; _groupNameTextField = groupNameTextField;
groupNameTextField.textColor = [Theme primaryColor]; groupNameTextField.textColor = Theme.primaryColor;
groupNameTextField.font = [UIFont ows_dynamicTypeTitle2Font]; groupNameTextField.font = [UIFont ows_dynamicTypeTitle2Font];
groupNameTextField.placeholder groupNameTextField.attributedPlaceholder =
= NSLocalizedString(@"NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT", @"Placeholder text for group name field"); [[NSAttributedString alloc] initWithString:NSLocalizedString(@"NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT",
@"Placeholder text for group name field")
attributes:@{
NSForegroundColorAttributeName : Theme.secondaryColor,
}];
groupNameTextField.delegate = self; groupNameTextField.delegate = self;
[groupNameTextField addTarget:self [groupNameTextField addTarget:self
action:@selector(groupNameDidChange:) action:@selector(groupNameDidChange:)

@ -50,7 +50,10 @@
searchBar.searchBarStyle = UISearchBarStyleMinimal; searchBar.searchBarStyle = UISearchBarStyleMinimal;
searchBar.delegate = self; searchBar.delegate = self;
searchBar.placeholder = NSLocalizedString(@"SEARCH_BYNAMEORNUMBER_PLACEHOLDER_TEXT", @""); searchBar.placeholder = NSLocalizedString(@"SEARCH_BYNAMEORNUMBER_PLACEHOLDER_TEXT", @"");
searchBar.backgroundColor = [UIColor whiteColor]; searchBar.backgroundColor = Theme.searchBarBackgroundColor;
searchBar.barStyle = Theme.barStyle;
searchBar.searchBarStyle = Theme.searchBarStyle;
searchBar.barTintColor = Theme.backgroundColor;
[searchBar sizeToFit]; [searchBar sizeToFit];
self.tableView.tableHeaderView = searchBar; self.tableView.tableHeaderView = searchBar;
@ -76,14 +79,13 @@
[section addItem:[OWSTableItem [section addItem:[OWSTableItem
itemWithCustomCellBlock:^{ itemWithCustomCellBlock:^{
UITableViewCell *cell = [OWSTableItem newCell]; UITableViewCell *cell = [OWSTableItem newCell];
[OWSTableItem configureCell:cell];
cell.textLabel.text = [PhoneNumberUtil countryNameFromCountryCode:countryCode]; cell.textLabel.text = [PhoneNumberUtil countryNameFromCountryCode:countryCode];
cell.textLabel.font = [UIFont ows_regularFontWithSize:18.f];
cell.textLabel.textColor = [UIColor blackColor];
UILabel *countryCodeLabel = [UILabel new]; UILabel *countryCodeLabel = [UILabel new];
countryCodeLabel.text = [PhoneNumberUtil callingCodeFromCountryCode:countryCode]; countryCodeLabel.text = [PhoneNumberUtil callingCodeFromCountryCode:countryCode];
countryCodeLabel.font = [UIFont ows_regularFontWithSize:16.f]; countryCodeLabel.font = [UIFont ows_regularFontWithSize:16.f];
countryCodeLabel.textColor = [UIColor ows_darkGrayColor]; countryCodeLabel.textColor = Theme.secondaryColor;
[countryCodeLabel sizeToFit]; [countryCodeLabel sizeToFit];
cell.accessoryView = countryCodeLabel; cell.accessoryView = countryCodeLabel;

Loading…
Cancel
Save