Merge branch 'dynamicTheme' into Integration
# Conflicts: # VoidLink/ViewControllers/SettingsViewController.m
This commit is contained in:
@@ -574,6 +574,16 @@
|
||||
|
||||
}
|
||||
|
||||
- (void)updateTheme {
|
||||
self.view.backgroundColor = [ThemeManager appBackgroundColor];
|
||||
_stageLabel.textColor = [[ThemeManager textColor] colorWithAlphaComponent:0.9];
|
||||
_spinner.color = [ThemeManager textColor];
|
||||
}
|
||||
|
||||
- (void)dealloc {
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
||||
}
|
||||
|
||||
|
||||
- (void)viewDidLoad
|
||||
{
|
||||
@@ -585,6 +595,11 @@
|
||||
|
||||
[UIApplication sharedApplication].idleTimerDisabled = YES;
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(updateTheme)
|
||||
name:@"ThemeDidChangeNotification"
|
||||
object:nil];
|
||||
|
||||
_settings = [[[DataManager alloc] init] getSettings]; //StreamFrameViewController retrieve the settings here.
|
||||
|
||||
_stageLabel = [[UILabel alloc] init];
|
||||
@@ -715,9 +730,7 @@
|
||||
_stageLabel.textColor = [UIColor systemGrayColor];
|
||||
_spinner.color = [UIColor systemGrayColor];
|
||||
|
||||
self.view.backgroundColor = [ThemeManager appBackgroundColor];
|
||||
_stageLabel.textColor = [[ThemeManager textColor] colorWithAlphaComponent:0.9];
|
||||
_spinner.color = [ThemeManager textColor];
|
||||
[self updateTheme];
|
||||
|
||||
[self.view addSubview:_stageLabel];
|
||||
[self.view addSubview:_spinner];
|
||||
|
||||
Reference in New Issue
Block a user