diff --git a/clients/ios/Classes/DashboardViewController.m b/clients/ios/Classes/DashboardViewController.m index bcb3c4867..2f6062e6f 100644 --- a/clients/ios/Classes/DashboardViewController.m +++ b/clients/ios/Classes/DashboardViewController.m @@ -106,7 +106,7 @@ } - (void)updateTheme { - self.topToolbar.barTintColor = UIColorFromLightSepiaMediumDarkRGB(0xE3E6E0, 0xE3E6E0, 0xE3E6E0, 0xE3E6E0); + self.topToolbar.barTintColor = UIColorFromRGB(0xE3E6E0); self.toolbar.barTintColor = UIColorFromRGB(0xE3E6E0); self.segmentedButton.tintColor = UIColorFromRGB(0x8F918B); @@ -164,6 +164,7 @@ [appDelegate.cachedStoryImages removeAllObjects:^(TMCache *cache) { dispatch_async(dispatch_get_main_queue(), ^{ [appDelegate loadRiverFeedDetailView:self.storiesModule withFolder:@"everything"]; + appDelegate.inFeedDetail = NO; }); }]; } diff --git a/clients/ios/Classes/FolderTitleView.m b/clients/ios/Classes/FolderTitleView.m index 6960c8d72..d6b35c247 100644 --- a/clients/ios/Classes/FolderTitleView.m +++ b/clients/ios/Classes/FolderTitleView.m @@ -184,11 +184,11 @@ [disclosureButton addTarget:appDelegate.feedsViewController action:@selector(didCollapseFolder:) forControlEvents:UIControlEventTouchUpInside]; UIImage *disclosureBorder = [UIImage imageNamed:@"disclosure_border"]; - if ([[ThemeManager themeManager] theme] == ThemeStyleSepia) { + if ([[[ThemeManager themeManager] theme] isEqualToString:ThemeStyleSepia]) { disclosureBorder = [UIImage imageNamed:@"disclosure_border_sepia"]; - } else if ([[ThemeManager themeManager] theme] == ThemeStyleMedium) { + } else if ([[[ThemeManager themeManager] theme] isEqualToString:ThemeStyleMedium]) { disclosureBorder = [UIImage imageNamed:@"disclosure_border_medium"]; - } else if ([[ThemeManager themeManager] theme] == ThemeStyleDark) { + } else if ([[[ThemeManager themeManager] theme] isEqualToString:ThemeStyleDark]) { disclosureBorder = [UIImage imageNamed:@"disclosure_border_dark"]; } [disclosureBorder drawInRect:CGRectMake(customView.frame.size.width - 32, 3, 29, 29)]; diff --git a/clients/ios/Classes/NewsBlurViewController.m b/clients/ios/Classes/NewsBlurViewController.m index 6aa618ce3..6a49981ff 100644 --- a/clients/ios/Classes/NewsBlurViewController.m +++ b/clients/ios/Classes/NewsBlurViewController.m @@ -978,10 +978,10 @@ static UIFont *userLabelFont; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { NBBarButtonItem *barButton = self.addBarButton.customView; - barButton.imageView.image = [[ThemeManager themeManager] themedImage:[UIImage imageNamed:@"nav_icn_add.png"]]; + [barButton setImage:[[ThemeManager themeManager] themedImage:[UIImage imageNamed:@"nav_icn_add.png"]] forState:UIControlStateNormal]; barButton = self.settingsBarButton.customView; - barButton.imageView.image = [[ThemeManager themeManager] themedImage:[UIImage imageNamed:@"nav_icn_settings.png"]]; + [barButton setImage:[[ThemeManager themeManager] themedImage:[UIImage imageNamed:@"nav_icn_settings.png"]] forState:UIControlStateNormal]; } [self layoutHeaderCounts:nil];