public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iOS: fixed iPad theme issues

Browse source
This commit is contained in:
David Sinclair 2016-03-09 22:05:51 -08:00
parent 419b414272
commit 7340b8c07d
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clients/ios/Classes/DashboardViewController.m
View file

@ -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;
});
}];
}

6
clients/ios/Classes/FolderTitleView.m
View file

@ -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)];

4
clients/ios/Classes/NewsBlurViewController.m
View file

@ -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];