Support change theme in preference panel (#549)

* support change theme in preference panel * fix theme preference options * format code * make theme popup button and text field baseline aligned
git-up · Aug 8, 2019 · e1d6572 · e1d6572
1 parent 6e9c587
commit e1d6572
Show file tree

Hide file tree

Showing 5 changed files with 126 additions and 37 deletions.
diff --git a/GitUp/Application/AppDelegate.h b/GitUp/Application/AppDelegate.h
@@ -20,6 +20,7 @@
 @property(nonatomic, weak) IBOutlet NSToolbar* preferencesToolbar;
 @property(nonatomic, weak) IBOutlet NSTabView* preferencesTabView;
 @property(nonatomic, weak) IBOutlet NSPopUpButton* channelPopUpButton;
+@property(nonatomic, weak) IBOutlet NSPopUpButton* themePopUpButton;
 
 @property(nonatomic, strong) IBOutlet NSWindow* cloneWindow;
 @property(nonatomic, weak) IBOutlet NSTextField* cloneURLTextField;

diff --git a/GitUp/Application/AppDelegate.m b/GitUp/Application/AppDelegate.m
@@ -93,6 +93,7 @@ + (void)initialize {
     kUserDefaultsKey_FirstLaunch : @(YES),
     kUserDefaultsKey_DiffWhitespaceMode : @(kGCLiveRepositoryDiffWhitespaceMode_Normal),
     kUserDefaultsKey_ShowWelcomeWindow : @(YES),
+    kUserDefaultsKey_Theme : kTheme_SystemPreference,
   };
   [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
 }
@@ -265,6 +266,15 @@ - (void)awakeFromNib {
   }
 
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_willShowRecentPopUpMenu:) name:NSPopUpButtonWillPopUpNotification object:_recentPopUpButton];
+
+  NSString* theme = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_Theme];
+  [self _applyTheme:theme];
+  [_themePopUpButton.menu removeAllItems];
+  for (NSString* string in [self _themePreferences]) {
+    NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(string, nil) action:NULL keyEquivalent:@""];
+    item.representedObject = string;
+    [_themePopUpButton.menu addItem:item];
+  }
 }
 
 - (void)_updatePreferencePanel {
@@ -277,6 +287,16 @@ - (void)_updatePreferencePanel {
   }
 }
 
+- (void)_updateThemePopUpButton {
+  NSString* theme = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_Theme];
+  for (NSMenuItem* item in _themePopUpButton.menu.itemArray) {
+    if ([item.representedObject isEqualToString:theme]) {
+      [_themePopUpButton selectItem:item];
+      break;
+    }
+  }
+}
+
 - (void)_showNotificationWithTitle:(NSString*)title action:(SEL)action message:(NSString*)format, ... NS_FORMAT_FUNCTION(3, 4) {
   NSUserNotification* notification = [[NSUserNotification alloc] init];
   if (action) {
@@ -397,6 +417,10 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification {
     XLOG_DEBUG_UNREACHABLE();
   }
 
+  // Load theme preference
+  NSString* theme = [[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsKey_Theme];
+  [self _applyTheme:theme];
+
 #if __ENABLE_SUDDEN_TERMINATION__
   // Enable sudden termination
   [[NSProcessInfo processInfo] enableSuddenTermination];
@@ -515,6 +539,33 @@ - (IBAction)changeReleaseChannel:(id)sender {
   }
 }
 
+- (NSArray*)_themePreferences {
+  return @[ kTheme_SystemPreference, kTheme_Dark, kTheme_Light ];
+}
+
+- (void)_applyTheme:(NSString*)theme {
+  if (@available(macOS 10.14, *)) {
+    NSInteger index = [[self _themePreferences] indexOfObject:theme];
+    switch (index) {
+      case 0:
+        NSApp.appearance = nil;
+        break;
+      case 1:
+        NSApp.appearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
+        break;
+      case 2:
+        NSApp.appearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
+        break;
+    }
+  }
+  [[NSUserDefaults standardUserDefaults] setObject:theme forKey:kUserDefaultsKey_Theme];
+}
+
+- (IBAction)changeTheme:(id)sender {
+  NSString* theme = _themePopUpButton.selectedItem.representedObject;
+  [self _applyTheme:theme];
+}
+
 - (IBAction)viewWiki:(id)sender {
   [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:kURL_Wiki]];
 }
@@ -543,6 +594,7 @@ - (IBAction)showAboutPanel:(id)sender {
 
 - (IBAction)showPreferences:(id)sender {
   [self _updatePreferencePanel];
+  [self _updateThemePopUpButton];
   [_preferencesWindow makeKeyAndOrderFront:nil];
 }