iOS: tweaked #825 (dark mode)

Fixes for more of @nriley’s reported issues.
This commit is contained in:
David Sinclair 2015-12-13 21:46:07 -08:00
parent 746a2f76ea
commit 592bc7559a
6 changed files with 25 additions and 4 deletions

View file

@ -2085,7 +2085,8 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
- (void)updateTheme {
[super updateTheme];
self.navigationController.navigationBar.tintColor = UIColorFromRGB(NEWSBLUR_BLACK_COLOR);
self.navigationController.navigationBar.tintColor = UIColorFromRGB(0x8F918B);
self.navigationController.navigationBar.backItem.backBarButtonItem.tintColor = UIColorFromRGB(0x8F918B);
self.navigationController.navigationBar.barTintColor = UIColorFromRGB(0xE3E6E0);
self.navigationController.toolbar.barTintColor = UIColorFromRGB(0xE3E6E0);

View file

@ -43,6 +43,7 @@
self.textLabel.highlightedTextColor = UIColorFromRGB(0x303030);
self.textLabel.shadowColor = UIColorFromRGB(0xF0F0F0);
self.textLabel.shadowOffset = CGSizeMake(0, 1);
self.backgroundColor = UIColorFromRGB(0xFFFFFF);
self.backgroundView.backgroundColor = UIColorFromRGB(0xFFFFFF);
self.selectedBackgroundView.backgroundColor = UIColorFromRGB(0xECEEEA);
}

View file

@ -285,11 +285,19 @@
return NB_DEFAULT_MASTER_WIDTH;
}
- (UIStatusBarStyle)preferredStatusBarStyle {
if ([ThemeManager themeManager].isDarkTheme) {
return UIStatusBarStyleLightContent;
} else {
return UIStatusBarStyleDefault;
}
}
- (void)updateTheme {
self.masterNavigationController.navigationBar.tintColor = UIColorFromRGB(0x0);
self.masterNavigationController.navigationBar.tintColor = UIColorFromRGB(0x8F918B);
self.masterNavigationController.navigationBar.barTintColor = UIColorFromRGB(0xE3E6E0);
self.storyNavigationController.navigationBar.tintColor = UIColorFromRGB(0x0);
self.storyNavigationController.navigationBar.tintColor = UIColorFromRGB(0x8F918B);
self.storyNavigationController.navigationBar.barTintColor = UIColorFromRGB(0xE3E6E0);
}
@ -314,6 +322,7 @@
UIPopoverPresentationController *popoverPresentationController = viewController.popoverPresentationController;
popoverPresentationController.delegate = self;
popoverPresentationController.backgroundColor = UIColorFromRGB(NEWSBLUR_WHITE_COLOR);
popoverPresentationController.permittedArrowDirections = UIPopoverArrowDirectionAny;
if (barButtonItem) {

View file

@ -616,6 +616,7 @@
// iOS 8+
UIPopoverPresentationController *popPC = activityViewController.popoverPresentationController;
popPC.permittedArrowDirections = UIPopoverArrowDirectionAny;
popPC.backgroundColor = UIColorFromRGB(NEWSBLUR_WHITE_COLOR);
if ([sender isKindOfClass:[UIBarButtonItem class]]) {
popPC.barButtonItem = sender;
@ -2085,6 +2086,7 @@
UIPopoverPresentationController *popoverPresentationController = self.markReadMenuViewController.popoverPresentationController;
popoverPresentationController.delegate = self;
popoverPresentationController.permittedArrowDirections = UIPopoverArrowDirectionAny;
popoverPresentationController.backgroundColor = UIColorFromRGB(NEWSBLUR_WHITE_COLOR);
if (barButtonItem) {
popoverPresentationController.barButtonItem = barButtonItem;

View file

@ -998,7 +998,14 @@ static UIFont *userLabelFont;
- (void)updateTheme {
[super updateTheme];
self.navigationController.navigationBar.tintColor = UIColorFromRGB(0x0);
if (![self.presentedViewController isKindOfClass:[UINavigationController class]] || ((UINavigationController *)self.presentedViewController).topViewController != (UIViewController *)self.appDelegate.fontSettingsViewController) {
[self.presentedViewController dismissViewControllerAnimated:YES completion:nil];
}
[self.popoverController dismissPopoverAnimated:YES];
self.popoverController = nil;
self.navigationController.navigationBar.tintColor = UIColorFromRGB(0x8F918B);
self.navigationController.navigationBar.barTintColor = UIColorFromRGB(0xE3E6E0);
self.navigationController.toolbar.barTintColor = UIColorFromRGB(0xE3E6E0);
self.feedViewToolbar.barTintColor = UIColorFromRGB(0xE3E6E0);

View file

@ -1149,6 +1149,7 @@
self.appDelegate.fontSettingsNavigationController.modalPresentationStyle = UIModalPresentationPopover;
UIPopoverPresentationController *popPC = self.appDelegate.fontSettingsNavigationController.popoverPresentationController;
popPC.permittedArrowDirections = UIPopoverArrowDirectionAny;
popPC.backgroundColor = UIColorFromRGB(NEWSBLUR_WHITE_COLOR);
popPC.delegate = self;
popPC.barButtonItem = self.fontSettingsButton;
// popPC.sourceView = self.view;