Toggling between light and dark mode changes request and response formatted windows. Save separate preferences for regular theme and dark theme

Author: mmattozzi

CRCconstants.h

@@ -19,6 +19,7 @@ FOUNDATION_EXPORT NSString * const RAW_REQUEST_BODY;
 FOUNDATION_EXPORT NSString * const RESPONSE_TIMEOUT;
 FOUNDATION_EXPORT NSString * const SAVED_DRAWER_SIZE;
 FOUNDATION_EXPORT NSString * const THEME;
+FOUNDATION_EXPORT NSString * const DARK_THEME;
 FOUNDATION_EXPORT NSUInteger const DEFAULT_FONT_SIZE;
 FOUNDATION_EXPORT NSString * const SHOW_LINE_NUMBERS;
 FOUNDATION_EXPORT NSString * const DISABLE_ANIMATIONS;

CRCconstants.m

@@ -17,6 +17,7 @@ @implementation CRCConstants
 NSString * const RESPONSE_TIMEOUT = @"responseTimeout";
 NSString * const SAVED_DRAWER_SIZE = @"savedDrawerSize";
 NSString * const THEME = @"theme";
+NSString * const DARK_THEME = @"darkTheme";
 NSUInteger const DEFAULT_FONT_SIZE = 12;
 NSString * const SHOW_LINE_NUMBERS = @"showLineNumbers";
 NSString * const DISABLE_ANIMATIONS = @"UIDisableAnimations";

core/CocoaRestClientAppDelegate.m

@@ -659,7 +659,12 @@ - (IBAction) themeMenuItemSelected:(id)sender {
         [((MainWindowController *)mainWindowController).requestView setTheme:[sender tag]];
     }
 
-    [[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithInteger:[sender tag]] forKey:THEME];
+    NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
+    if ([osxMode isEqualToString:@"Dark"]) {
+        [[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithInteger:[sender tag]] forKey:DARK_THEME];
+    } else {
+        [[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithInteger:[sender tag]] forKey:THEME];
+    }
 
     // Unselect all theme MenuItems
     NSMenuItem *themeMenu = [((NSMenuItem *) sender) parentItem];

core/MainWindowController.m

@@ -204,7 +204,19 @@ - (NSTouchBarItem *)touchBar:(NSTouchBar *)touchBar makeItemForIdentifier:(NSTou
 }
 
 -(void) initHighlightedViews {
-    ACETheme aceTheme = [[NSUserDefaults standardUserDefaults] integerForKey:THEME];
+    NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
+    ACETheme aceTheme;
+    if ([osxMode isEqualToString:@"Dark"]) {
+        aceTheme = [[NSUserDefaults standardUserDefaults] integerForKey:DARK_THEME];
+        if (! aceTheme) {
+            aceTheme = ACEThemeTomorrowNightEighties;
+        }
+    } else {
+        aceTheme = [[NSUserDefaults standardUserDefaults] integerForKey:THEME];
+        if (! aceTheme) {
+            aceTheme = ACEThemeChrome;
+        }
+    }
     [[[self.appDelegate.themeMenuItem submenu] itemWithTag:aceTheme] setState:NSOnState];
 
     self.appDelegate.aceViewFontSize = 12;
@@ -991,15 +1003,26 @@ - (void)syntaxHighlightingPreferenceChanged {
 
 - (void)darkModeChanged:(id)sender {
     NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
+    ACETheme aceTheme;
     if ([osxMode isEqualToString:@"Dark"]) {
         self.submitButton.appearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
         self.urlBox.appearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
         self.methodButton.appearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
+        aceTheme = [[NSUserDefaults standardUserDefaults] integerForKey:DARK_THEME];
+        if (! aceTheme) {
+            aceTheme = ACEThemeTomorrowNightEighties;
+        }
     } else {
         self.submitButton.appearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
         self.urlBox.appearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
         self.methodButton.appearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
+        aceTheme = [[NSUserDefaults standardUserDefaults] integerForKey:THEME];
+        if (! aceTheme) {
+            aceTheme = ACEThemeChrome;
+        }
     }
+    [self.responseView setTheme:aceTheme];
+    [self.requestView setTheme:aceTheme];
 }
 
 #pragma mark -