From 189f8c7a0de9ae06bce883bcd7e98c9d873e7c2f Mon Sep 17 00:00:00 2001 From: David Sinclair Date: Sun, 28 Mar 2021 16:03:59 -0700 Subject: [PATCH] #1421 (incomplete theme changing) --- clients/ios/Classes/DetailViewController.swift | 3 ++- clients/ios/Classes/FeedDetailObjCViewController.m | 1 + clients/ios/Classes/FeedsObjCViewController.m | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/clients/ios/Classes/DetailViewController.swift b/clients/ios/Classes/DetailViewController.swift index ed0e3e615..6d24388d3 100644 --- a/clients/ios/Classes/DetailViewController.swift +++ b/clients/ios/Classes/DetailViewController.swift @@ -178,7 +178,8 @@ class DetailViewController: BaseViewController { manager.updateBackground(of: view) dividerImageView.image = manager.themedImage(UIImage(named: "drag_icon.png")) - view.backgroundColor = navigationController?.navigationBar.barTintColor; + view.backgroundColor = navigationController?.navigationBar.barTintColor + navigationController?.navigationBar.barStyle = manager.isDarkTheme ? .black : .default } /// Adjusts the container when autoscrolling. Only applies to iPhone. diff --git a/clients/ios/Classes/FeedDetailObjCViewController.m b/clients/ios/Classes/FeedDetailObjCViewController.m index c148fc3f1..f54c5f392 100644 --- a/clients/ios/Classes/FeedDetailObjCViewController.m +++ b/clients/ios/Classes/FeedDetailObjCViewController.m @@ -2755,6 +2755,7 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state self.navigationController.navigationBar.tintColor = [UINavigationBar appearance].tintColor; // self.navigationController.navigationBar.backItem.backBarButtonItem.tintColor = UIColorFromRGB(0x8F918B); self.navigationController.navigationBar.barTintColor = [UINavigationBar appearance].barTintColor; + self.navigationController.navigationBar.barStyle = ThemeManager.shared.isDarkTheme ? UIBarStyleBlack : UIBarStyleDefault; self.navigationController.toolbar.barTintColor = [UINavigationBar appearance].barTintColor; self.refreshControl.tintColor = UIColorFromLightDarkRGB(0x0, 0xffffff); diff --git a/clients/ios/Classes/FeedsObjCViewController.m b/clients/ios/Classes/FeedsObjCViewController.m index 35e829790..3d6039065 100644 --- a/clients/ios/Classes/FeedsObjCViewController.m +++ b/clients/ios/Classes/FeedsObjCViewController.m @@ -1059,6 +1059,7 @@ static NSArray *NewsBlurTopSectionNames; self.navigationController.navigationBar.tintColor = [UINavigationBar appearance].tintColor; self.navigationController.navigationBar.barTintColor = [UINavigationBar appearance].barTintColor; + self.navigationController.navigationBar.barStyle = ThemeManager.shared.isDarkTheme ? UIBarStyleBlack : UIBarStyleDefault; self.navigationController.toolbar.tintColor = [UIToolbar appearance].tintColor; self.navigationController.toolbar.barTintColor = [UIToolbar appearance].barTintColor; self.feedViewToolbar.tintColor = [UINavigationBar appearance].tintColor;