Add automatic theme toggle feature

Blink/SpaceController.swift

@@ -258,6 +258,12 @@ class SpaceController: UIViewController, LayoutInsetsProvider {
 
   @objc private func _setupAppearance() {
     self.view.tintColor = .cyan
+
+    guard !BLKDefaults.isAutoThemeToggleEnabled() else {
+      overrideUserInterfaceStyle = .unspecified
+      return
+    }
+
     switch BLKDefaults.keyboardStyle() {
     case .light:
       overrideUserInterfaceStyle = .light

Blink/TermController.swift

@@ -167,7 +167,7 @@ class TermController: UIViewController {
 
     params.fontSize = BLKDefaults.selectedFontSize()?.intValue ?? 16
     params.fontName = BLKDefaults.selectedFontName()
-    params.themeName = BLKDefaults.selectedThemeName()
+    params.themeName = BLKDefaults.currentThemeNameForAppearance()
     params.enableBold = BLKDefaults.enableBold()
     params.boldAsBright = BLKDefaults.isBoldAsBright()
     params.viewSize = .zero
@@ -293,6 +293,17 @@ class TermController: UIViewController {
       selector: #selector(_relayout),
       name: NSNotification.Name(rawValue: LayoutManagerBottomInsetDidUpdate), object: nil)
 
+    NotificationCenter.default.addObserver(
+      self,
+      selector: #selector(_themeChanged(_:)),
+      name: NSNotification.Name(rawValue: BKAppearanceChanged), object: nil)
+
+  }
+
+  @objc private func _themeChanged(_ notification: Notification) {
+    let themeName = notification.object as? String ?? BLKDefaults.currentThemeNameForAppearance()
+    _termView.applyTheme(themeName)
+    _sessionParams.themeName = themeName
   }
 
   @objc func _relayout() {
@@ -333,6 +344,16 @@ class TermController: UIViewController {
     _sessionParams.viewSize = view.bounds.size
   }
 
+  public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+    super.traitCollectionDidChange(previousTraitCollection)
+    if traitCollection.userInterfaceStyle != previousTraitCollection?.userInterfaceStyle,
+       BLKDefaults.isAutoThemeToggleEnabled() {
+      let themeName = BLKDefaults.currentThemeNameForAppearance()
+      _termView.applyTheme(themeName)
+      _sessionParams.themeName = themeName
+    }
+  }
+
   @objc public func terminate() {
     NotificationCenter.default.post(name: .deviceTerminated, object: nil, userInfo: ["device": _termDevice])
     _proxyView.destroyControlledView()

Blink/TermView.m

@@ -928,7 +928,7 @@ - (WKUserScript *)_termInitScriptWith:(MCPParams *)params;
 }
 
 - (void)applyTheme:(NSString *)themeName {
-  NSString *themeContent = [[BKTheme withName: themeName ?: [BLKDefaults selectedThemeName]] content];
+  NSString *themeContent = [[BKTheme withName:themeName ?: [BLKDefaults selectedThemeName]] content];
   if (themeContent) {
     NSString *script = [NSString stringWithFormat:@"(function(){%@})();", themeContent];
     [_webView evaluateJavaScript:script completionHandler:nil];

BlinkTests/AutoThemeToggleTests.swift

@@ -0,0 +1,53 @@
+import XCTest
+@testable import Blink
+
+class AutoThemeToggleTests: XCTestCase {
+
+  override func setUp() {
+    super.setUp()
+    BLKDefaults.loadDefaults()
+  }
+
+  override func tearDown() {
+    BLKDefaults.setAutoThemeToggleEnabled(false)
+    BLKDefaults.setLightThemeName("Default")
+    BLKDefaults.setDarkThemeName("Default")
+    BLKDefaults.saveDefaults()
+    super.tearDown()
+  }
+
+  func testAutoThemeToggleDefaults() {
+    XCTAssertFalse(BLKDefaults.isAutoThemeToggleEnabled())
+    XCTAssertEqual(BLKDefaults.selectedLightThemeName(), "Default")
+    XCTAssertEqual(BLKDefaults.selectedDarkThemeName(), "Default")
+  }
+
+  func testEnablingAutoThemeToggle() {
+    BLKDefaults.setAutoThemeToggleEnabled(true)
+    XCTAssertTrue(BLKDefaults.isAutoThemeToggleEnabled())
+  }
+
+  func testSettingLightAndDarkThemes() {
+    BLKDefaults.setLightThemeName("Light")
+    BLKDefaults.setDarkThemeName("Dark")
+
+    XCTAssertEqual(BLKDefaults.selectedLightThemeName(), "Light")
+    XCTAssertEqual(BLKDefaults.selectedDarkThemeName(), "Dark")
+  }
+
+  func testCurrentThemeNameForAppearanceWithAutoToggleDisabled() {
+    BLKDefaults.setAutoThemeToggleEnabled(false)
+    BLKDefaults.setThemeName("Custom")
+
+    let currentTheme = BLKDefaults.currentThemeNameForAppearance()
+    XCTAssertEqual(currentTheme, "Custom")
+  }
+
+  func testThemeApplicationPostsNotification() {
+    let expectation = self.expectation(forNotification: NSNotification.Name(rawValue: BKAppearanceChanged), object: nil, handler: nil)
+
+    BLKDefaults.applyCurrentTheme()
+
+    waitForExpectations(timeout: 1.0, handler: nil)
+  }
+}

Settings/Model/BLKDefaults.h

@@ -90,6 +90,10 @@ typedef NS_ENUM(NSInteger, BKSnippetDefaultLocation) {
 @property (nonatomic) BKSnippetDefaultLocation snippetsDefaultLocation;
 @property (nonatomic, strong) NSString *scratchLanguageMode;
 
+@property (nonatomic) BOOL autoThemeToggleEnabled;
+@property (nonatomic, strong) NSString *lightThemeName;
+@property (nonatomic, strong) NSString *darkThemeName;
+
 + (void)loadDefaults;
 + (BOOL)saveDefaults;
 + (void)setCursorBlink:(BOOL)state;
@@ -144,6 +148,14 @@ typedef NS_ENUM(NSInteger, BKSnippetDefaultLocation) {
 + (void)setScratchLanguageMode:(NSString *)mode;
 + (NSString *)scratchLanguageMode;
 
++ (void)setAutoThemeToggleEnabled:(BOOL)enabled;
++ (BOOL)isAutoThemeToggleEnabled;
++ (void)setLightThemeName:(NSString *)themeName;
++ (NSString *)selectedLightThemeName;
++ (void)setDarkThemeName:(NSString *)themeName;
++ (NSString *)selectedDarkThemeName;
++ (NSString *)currentThemeNameForAppearance;
++ (void)applyCurrentTheme;
 
 + (void)applyExternalScreenCompensation:(BKOverscanCompensation)value;
 @end

Settings/Model/BLKDefaults.m

@@ -101,6 +101,9 @@ - (id)initWithCoder:(NSCoder *)coder
   _dontUseBlinkSnippetsIndex = [coder decodeBoolForKey:@"dontUseBlinkSnippetsIndex"];
   _snippetsDefaultLocation = [coder decodeIntegerForKey:@"snippetsDefaultLocation"];
   _scratchLanguageMode = [coder decodeObjectOfClass:[NSString class] forKey:@"scratchLanguageMode"];
+  _autoThemeToggleEnabled = [coder decodeBoolForKey:@"autoThemeToggleEnabled"];
+  _lightThemeName = [coder decodeObjectOfClasses:strings forKey:@"lightThemeName"];
+  _darkThemeName = [coder decodeObjectOfClasses:strings forKey:@"darkThemeName"];
 
   return self;
 }
@@ -133,6 +136,9 @@ - (void)encodeWithCoder:(NSCoder *)encoder
   [encoder encodeBool:_dontUseBlinkSnippetsIndex forKey:@"dontUseBlinkSnippetsIndex"];
   [encoder encodeInteger:_snippetsDefaultLocation forKey:@"snippetsDefaultLocation"];
   [encoder encodeObject:_scratchLanguageMode forKey:@"scratchLanguageMode"];
+  [encoder encodeBool:_autoThemeToggleEnabled forKey:@"autoThemeToggleEnabled"];
+  [encoder encodeObject:_lightThemeName forKey:@"lightThemeName"];
+  [encoder encodeObject:_darkThemeName forKey:@"darkThemeName"];
 
 }
 
@@ -218,7 +224,13 @@ + (void)loadDefaults {
   if (!defaults.themeName) {
     [defaults setThemeName:@"Default"];
   }
-
+  if (!defaults.lightThemeName) {
+    [defaults setLightThemeName:@"Default"];
+  }
+  if (!defaults.darkThemeName) {
+    [defaults setDarkThemeName:@"Default"];
+  }
+
   if (!defaults.fontSize) {
     #if TARGET_OS_MACCATALYST
       [defaults setFontSize:[NSNumber numberWithInt:22]];
@@ -497,4 +509,43 @@ + (void)applyExternalScreenCompensation:(BKOverscanCompensation)value {
 
 }
 
++ (void)setAutoThemeToggleEnabled:(BOOL)enabled {
+  defaults.autoThemeToggleEnabled = enabled;
+}
+
++ (BOOL)isAutoThemeToggleEnabled {
+  return defaults.autoThemeToggleEnabled;
+}
+
++ (void)setLightThemeName:(NSString *)themeName {
+  defaults.lightThemeName = themeName;
+}
+
++ (NSString *)selectedLightThemeName {
+  return defaults.lightThemeName;
+}
+
++ (void)setDarkThemeName:(NSString *)themeName {
+  defaults.darkThemeName = themeName;
+}
+
++ (NSString *)selectedDarkThemeName {
+  return defaults.darkThemeName;
+}
+
++ (NSString *)currentThemeNameForAppearance {
+  if (!defaults.autoThemeToggleEnabled) {
+    return defaults.themeName;
+  }
+  UIUserInterfaceStyle style = UITraitCollection.currentTraitCollection.userInterfaceStyle;
+  return (style == UIUserInterfaceStyleDark)
+    ? (defaults.darkThemeName ?: defaults.themeName)
+    : (defaults.lightThemeName ?: defaults.themeName);
+}
+
++ (void)applyCurrentTheme {
+  NSString *themeName = [self currentThemeNameForAppearance];
+  [[NSNotificationCenter defaultCenter] postNotificationName:BKAppearanceChanged object:themeName];
+}
+
 @end