diff --git a/clients/ios/Classes/NewsBlurViewController.m b/clients/ios/Classes/NewsBlurViewController.m index 8bade27f0..773295234 100644 --- a/clients/ios/Classes/NewsBlurViewController.m +++ b/clients/ios/Classes/NewsBlurViewController.m @@ -160,7 +160,7 @@ static UIFont *userLabelFont; self.notifier.topOffsetConstraint = [NSLayoutConstraint constraintWithItem:self.notifier attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.feedViewToolbar attribute:NSLayoutAttributeTop multiplier:1.0 constant:0]; [self.view addConstraint:self.notifier.topOffsetConstraint]; -// self.feedTitlesTable.backgroundColor = UIColorFromRGB(0xf4f4f4); + self.feedTitlesTable.backgroundColor = UIColorFromRGB(0xf4f4f4); self.feedTitlesTable.separatorColor = [UIColor clearColor]; userAvatarButton.customView.hidden = YES; @@ -979,7 +979,7 @@ static UIFont *userLabelFont; [self layoutHeaderCounts:0]; [self refreshHeaderCounts]; -// self.feedTitlesTable.backgroundColor = UIColorFromRGB(0xf4f4f4); + self.feedTitlesTable.backgroundColor = UIColorFromRGB(0xf4f4f4); [self.feedTitlesTable reloadData]; [self resetupGestures]; diff --git a/clients/ios/Classes/PremiumViewController.h b/clients/ios/Classes/PremiumViewController.h index 4f746b07b..642beb084 100644 --- a/clients/ios/Classes/PremiumViewController.h +++ b/clients/ios/Classes/PremiumViewController.h @@ -18,6 +18,7 @@ NSArray *reasons; SKProductsRequest *request; + } @property (nonatomic) IBOutlet NewsBlurAppDelegate *appDelegate; @@ -31,6 +32,8 @@ @property (nonatomic) IBOutlet UIView *premiumView; @property (nonatomic) IBOutlet SAConfettiView *confettiView; @property (nonatomic) IBOutlet NSLayoutConstraint *productsHeight; +@property (nonatomic) IBOutlet UILabel *labelTitle; +@property (nonatomic) IBOutlet UILabel *labelSubtitle; - (IBAction)closeDialog:(id)sender; diff --git a/clients/ios/Classes/PremiumViewController.m b/clients/ios/Classes/PremiumViewController.m index 67079ccfd..ecbf67e6c 100644 --- a/clients/ios/Classes/PremiumViewController.m +++ b/clients/ios/Classes/PremiumViewController.m @@ -29,6 +29,8 @@ @synthesize premiumView; @synthesize confettiView; @synthesize productsHeight; +@synthesize labelTitle; +@synthesize labelSubtitle; - (void)viewDidLoad { [super viewDidLoad]; @@ -65,16 +67,24 @@ [super viewWillAppear:animated]; self.navigationItem.title = appDelegate.isPremium ? @"Premium Account" : @"Upgrade to Premium"; [self loadProducts]; + [self updateTheme]; } - (void)closeDialog:(id)sender { [self dismissViewControllerAnimated:YES completion:nil]; } --(void)viewDidLayoutSubviews -{ -// productsHeight.constant = self.productsTable.contentSize.height; - [self.view layoutIfNeeded]; +- (void)updateTheme { + [super updateTheme]; + + self.productsTable.backgroundColor = UIColorFromRGB(0xf4f4f4); + self.reasonsTable.backgroundColor = UIColorFromRGB(0xf4f4f4); + self.view.backgroundColor = UIColorFromRGB(0xf4f4f4); + self.labelTitle.textColor = UIColorFromRGB(0x0c0c0c); + self.labelSubtitle.textColor = UIColorFromRGB(0x0c0c0c); + + [self.productsTable reloadData]; + [self.reasonsTable reloadData]; } #pragma mark - StoreKit @@ -258,10 +268,12 @@ if (!cell) { cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:ReasonsCellIndentifier]; } - + + cell.backgroundColor = UIColorFromRGB(0xf4f4f4); cell.selectionStyle = UITableViewCellSelectionStyleNone; cell.textLabel.text = reasons[indexPath.row][0]; cell.textLabel.font = [UIFont systemFontOfSize:14.f weight:UIFontWeightLight]; + cell.textLabel.textColor = UIColorFromRGB(0x0c0c0c); cell.textLabel.numberOfLines = 2; CGSize itemSize = CGSizeMake(18, 18); cell.imageView.image = [UIImage imageNamed:reasons[indexPath.row][1]]; @@ -282,8 +294,10 @@ SKProduct *product = products[indexPath.row]; cell.selectionStyle = UITableViewCellSelectionStyleBlue; + cell.backgroundColor = UIColorFromRGB(0xf4f4f4); cell.textLabel.numberOfLines = 2; - cell.textLabel.textColor = UIColorFromRGB(0x203090); + cell.textLabel.textColor = UIColorFromRGB(0x203070); + cell.detailTextLabel.textColor = UIColorFromRGB(0x0c0c0c); NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; [formatter setFormatterBehavior:NSNumberFormatterBehavior10_4]; [formatter setNumberStyle:NSNumberFormatterCurrencyStyle]; diff --git a/clients/ios/Classes/PremiumViewController.xib b/clients/ios/Classes/PremiumViewController.xib index 59f174d79..47d1f216e 100644 --- a/clients/ios/Classes/PremiumViewController.xib +++ b/clients/ios/Classes/PremiumViewController.xib @@ -18,6 +18,8 @@ + + @@ -120,7 +122,6 @@ -