From 83479719a4aacc39860f4b3665103a6059dc4a2a Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 30 Aug 2019 17:16:56 -0700 Subject: [PATCH] Fix styles on settings slideout on iOS 13 --- .../ViewControllers/SettingsViewController.h | 2 ++ .../ViewControllers/SettingsViewController.m | 5 +++++ iPad.storyboard | 15 +++++++++++---- iPhone.storyboard | 15 +++++++++++---- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/Limelight/ViewControllers/SettingsViewController.h b/Limelight/ViewControllers/SettingsViewController.h index 2cbd8fa..fc571b6 100644 --- a/Limelight/ViewControllers/SettingsViewController.h +++ b/Limelight/ViewControllers/SettingsViewController.h @@ -21,6 +21,8 @@ @property (strong, nonatomic) IBOutlet UISegmentedControl *hevcSelector; @property (strong, nonatomic) IBOutlet UIScrollView *scrollView; +@property(nonatomic) UIUserInterfaceStyle overrideUserInterfaceStyle; + - (void) saveSettings; @end diff --git a/Limelight/ViewControllers/SettingsViewController.m b/Limelight/ViewControllers/SettingsViewController.m index 9d346dd..6211e1e 100644 --- a/Limelight/ViewControllers/SettingsViewController.m +++ b/Limelight/ViewControllers/SettingsViewController.m @@ -106,6 +106,11 @@ static const int bitrateTable[] = { - (void)viewDidLoad { [super viewDidLoad]; + + // Always run settings in dark mode because we want the light fonts + if (@available(iOS 12.0, tvOS 12.0, *)) { + self.overrideUserInterfaceStyle = UIUserInterfaceStyleDark; + } DataManager* dataMan = [[DataManager alloc] init]; TemporarySettings* currentSettings = [dataMan getSettings]; diff --git a/iPad.storyboard b/iPad.storyboard index 8f1c0c3..f0aeb1b 100644 --- a/iPad.storyboard +++ b/iPad.storyboard @@ -96,6 +96,7 @@ +