feat: follow system theme by default

Author: oldj

src-tauri/src/storage/config.rs

@@ -70,7 +70,7 @@ impl Default for AppConfig {
             write_mode: "append".to_string(),
             history_limit: 50,
             locale: None,
-            theme: "light".to_string(),
+            theme: "system".to_string(),
             choice_mode: 2,
             show_title_on_tray: false,
             hide_at_launch: false,
@@ -95,6 +95,12 @@ impl Default for AppConfig {
 }
 
 impl AppConfig {
+    fn normalize(&mut self) {
+        if !matches!(self.theme.as_str(), "light" | "dark" | "system") {
+            self.theme = "system".to_string();
+        }
+    }
+
     /// Load `internal/config.json`.
     ///
     /// - Missing file → default config in memory, no write.
@@ -107,7 +113,10 @@ impl AppConfig {
         }
         match std::fs::read(path) {
             Ok(bytes) => match serde_json::from_slice::<AppConfig>(&bytes) {
-                Ok(cfg) => cfg,
+                Ok(mut cfg) => {
+                    cfg.normalize();
+                    cfg
+                }
                 Err(e) => {
                     log::warn!(
                         "config.json at {} failed to parse: {e}. Falling back to defaults in memory; the file will not be overwritten until the next explicit write.",
@@ -180,12 +189,13 @@ impl AppConfig {
             merged_obj.insert(k.clone(), v.clone());
         }
 
-        let next: AppConfig = serde_json::from_value(merged).map_err(|e| {
+        let mut next: AppConfig = serde_json::from_value(merged).map_err(|e| {
             StorageError::InvalidConfigValue {
                 key: "<patch>".into(),
                 reason: e.to_string(),
             }
         })?;
+        next.normalize();
         *self = next;
         Ok(())
     }
@@ -198,3 +208,34 @@ impl AppConfig {
     }
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn load_normalizes_invalid_theme_to_system() {
+        let path = std::env::temp_dir().join(format!(
+            "switchhosts-config-test-{}-{}.json",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap()
+                .as_nanos()
+        ));
+        std::fs::write(&path, r#"{ "theme": "sepia" }"#).unwrap();
+
+        let cfg = AppConfig::load(&path);
+        let _ = std::fs::remove_file(path);
+
+        assert_eq!(cfg.theme, "system");
+    }
+
+    #[test]
+    fn apply_partial_normalizes_invalid_theme_to_system() {
+        let mut cfg = AppConfig::default();
+
+        cfg.apply_partial(&json!({ "theme": "sepia" })).unwrap();
+
+        assert_eq!(cfg.theme, "system");
+    }
+}

src/common/default_configs.ts

@@ -18,7 +18,7 @@ const configs = {
   write_mode: 'append' as WriteModeType,
   history_limit: 50,
   locale: undefined as DefaultLocaleType,
-  theme: 'light' as ThemeType,
+  theme: 'system' as ThemeType,
   choice_mode: 2 as FolderModeType,
   show_title_on_tray: false,
   hide_at_launch: false,

src/common/i18n/languages/de.ts

@@ -166,6 +166,7 @@ const lang: LanguageDict = {
   theme: 'Thema',
   theme_dark: 'Dunkel',
   theme_light: 'Hell',
+  theme_system: 'System folgen',
   title: 'Titel',
   to_show_source: 'Durch Doppelklick wird der Quellcode angezeigt.',
   toggle_developer_tools: 'Entwicklerwerkzeuge umschalten',

src/common/i18n/languages/en.ts

@@ -167,6 +167,7 @@ export default {
   theme: 'Theme',
   theme_dark: 'Dark',
   theme_light: 'Light',
+  theme_system: 'Follow system',
   title: 'Title',
   to_show_source: 'Double-click to show the source code.',
   toggle_developer_tools: 'Toggle Developer Tools',

src/common/i18n/languages/fr.ts

@@ -168,6 +168,7 @@ const lang: LanguageDict = {
   theme: 'Thème',
   theme_dark: 'Sombre',
   theme_light: 'Clair',
+  theme_system: 'Suivre le système',
   title: 'Titre',
   to_show_source: 'Double-cliquez pour afficher le code source',
   toggle_developer_tools: 'Afficher/Masquer les outils de développement',

src/common/i18n/languages/ja.ts

@@ -163,6 +163,7 @@ const lang: LanguageDict = {
   theme: 'テーマ',
   theme_dark: 'ダーク',
   theme_light: 'ライト',
+  theme_system: 'システムに合わせる',
   title: 'タイトル',
   to_show_source: 'ダブルクリックでソースコードを表示する。',
   toggle_developer_tools: '開発者ツールの表示/非表示',

src/common/i18n/languages/ko.ts

@@ -165,6 +165,7 @@ export default {
   theme: '테마',
   theme_dark: '다크',
   theme_light: '라이트',
+  theme_system: '시스템 설정 따름',
   title: '제목',
   to_show_source: '더블 클릭하여 소스코드를 표시합니다.',
   toggle_developer_tools: '개발자 도구 전환',

src/common/i18n/languages/pl.ts

@@ -157,6 +157,7 @@ export default {
   theme: 'Motyw',
   theme_dark: 'Ciemny',
   theme_light: 'Jasny',
+  theme_system: 'Zgodnie z systemem',
   title: 'Tytuł',
   to_show_source: 'Kliknij dwukrotnie, aby wyświetlić kod źródłowy.',
   toggle_developer_tools: 'Przełącz narzędzia deweloperskie',

src/common/i18n/languages/tr.ts

@@ -157,8 +157,9 @@ export default {
   system_hosts_history_limit: 'Maksimum kayıt sayısı: ',
   test: 'Test',
   theme: 'Tema',
-  theme_dark: 'Karanlık',
-  theme_light: 'Aydınlık',
+  theme_dark: 'Koyu',
+  theme_light: 'Açık',
+  theme_system: 'Sistemi takip et',
   title: 'Başlık',
   to_show_source: 'Kaynak kodunu göstermek için çift tıklayın.',
   toggle_developer_tools: 'Geliştirici araçlarını aç/kapat',

src/common/i18n/languages/zh-hant.ts

@@ -156,7 +156,8 @@ const lang: LanguageDict = {
   test: '測試',
   theme: '主題',
   theme_dark: '深色',
-  theme_light: '亮色',
+  theme_light: '淺色',
+  theme_system: '跟隨系統',
   title: '標題',
   to_show_source: '雙擊顯示原始碼。',
   toggle_developer_tools: '切換開發者工具',