Merge pull request #649 from GCWing/gcwing/dev

feat(desktop,web-ui,installer): Tokyo Night theme, tray, and settings/usage

Author: GCWing

BitFun-Installer/scripts/sync-theme-i18n.cjs

@@ -12,6 +12,7 @@ const THEME_IDS = [
   "bitfun-china-night",
   "bitfun-cyber",
   "bitfun-slate",
+  "bitfun-tokyo-night",
 ];
 
 function readJson(filePath) {

BitFun-Installer/src-tauri/src/installer/commands.rs

@@ -826,6 +826,7 @@ pub fn set_theme_preference(theme_preference: String) -> Result<(), String> {
         "bitfun-china-night",
         "bitfun-cyber",
         "bitfun-slate",
+        "bitfun-tokyo-night",
     ];
     if !allowed.contains(&theme_preference.as_str()) {
         return Err("Unsupported theme preference".to_string());

BitFun-Installer/src/i18n/locales/en.json

@@ -208,7 +208,8 @@
       "bitfun-china-style": "Ink Charm",
       "bitfun-china-night": "Ink Night",
       "bitfun-cyber": "Cyber",
-      "bitfun-slate": "Slate"
+      "bitfun-slate": "Slate",
+      "bitfun-tokyo-night": "Tokyo Night"
     }
   },
   "complete": {

BitFun-Installer/src/i18n/locales/zh-TW.json

@@ -208,7 +208,8 @@
       "bitfun-china-style": "墨韻",
       "bitfun-china-night": "墨夜",
       "bitfun-cyber": "賽博",
-      "bitfun-slate": "石板灰"
+      "bitfun-slate": "石板灰",
+      "bitfun-tokyo-night": "東京夜"
     }
   },
   "complete": {

BitFun-Installer/src/i18n/locales/zh.json

@@ -208,7 +208,8 @@
       "bitfun-china-style": "墨韵",
       "bitfun-china-night": "墨夜",
       "bitfun-cyber": "赛博",
-      "bitfun-slate": "石板灰"
+      "bitfun-slate": "石板灰",
+      "bitfun-tokyo-night": "东京夜"
     }
   },
   "complete": {

BitFun-Installer/src/theme/installerThemesData.ts

@@ -134,6 +134,20 @@ export const THEMES: InstallerTheme[] = [
       element: { subtle: 'rgba(0, 230, 255, 0.06)', soft: 'rgba(0, 230, 255, 0.09)', base: 'rgba(0, 230, 255, 0.13)', medium: 'rgba(0, 230, 255, 0.17)', strong: 'rgba(0, 230, 255, 0.22)', elevated: 'rgba(0, 230, 255, 0.27)' },
     },
   },
+  {
+    id: 'bitfun-tokyo-night',
+    name: 'Tokyo Night',
+    type: 'dark',
+    colors: {
+      background: { primary: '#1a1b26', secondary: '#16161e', tertiary: '#14141b', quaternary: '#1e202e', elevated: '#20222c', workbench: '#16161e', flowchat: '#1a1b26', tooltip: 'rgba(22, 22, 30, 0.94)' },
+      text: { primary: '#c0caf5', secondary: '#a9b1d6', muted: '#787c99', disabled: '#545c7e' },
+      accent: { '50': 'rgba(122, 162, 247, 0.05)', '100': 'rgba(122, 162, 247, 0.08)', '200': 'rgba(122, 162, 247, 0.15)', '300': 'rgba(122, 162, 247, 0.25)', '400': 'rgba(122, 162, 247, 0.4)', '500': '#7aa2f7', '600': '#6183bb', '700': 'rgba(97, 131, 187, 0.85)', '800': 'rgba(97, 131, 187, 0.95)' },
+      purple: { '50': 'rgba(187, 154, 247, 0.05)', '100': 'rgba(187, 154, 247, 0.08)', '200': 'rgba(187, 154, 247, 0.15)', '300': 'rgba(187, 154, 247, 0.25)', '400': 'rgba(187, 154, 247, 0.4)', '500': '#bb9af7', '600': '#9d7cd8', '700': 'rgba(157, 124, 216, 0.85)', '800': 'rgba(157, 124, 216, 0.95)' },
+      semantic: { success: '#9ece6a', warning: '#e0af68', error: '#f7768e', info: '#7dcfff', highlight: '#e0af68', highlightBg: 'rgba(224, 175, 104, 0.15)' },
+      border: { subtle: 'rgba(54, 59, 84, 0.45)', base: 'rgba(54, 59, 84, 0.6)', medium: 'rgba(54, 59, 84, 0.72)', strong: 'rgba(54, 59, 84, 0.85)', prominent: 'rgba(122, 162, 247, 0.45)' },
+      element: { subtle: 'rgba(122, 162, 247, 0.06)', soft: 'rgba(122, 162, 247, 0.08)', base: 'rgba(122, 162, 247, 0.11)', medium: 'rgba(122, 162, 247, 0.14)', strong: 'rgba(122, 162, 247, 0.18)', elevated: 'rgba(122, 162, 247, 0.22)' },
+    },
+  },
   {
     id: 'bitfun-slate',
     name: 'Slate',
@@ -158,6 +172,7 @@ export const THEME_DISPLAY_ORDER: ThemeId[] = [
   'bitfun-china-style',
   'bitfun-china-night',
   'bitfun-cyber',
+  'bitfun-tokyo-night',
 ];
 
 export function findInstallerThemeById(id: ThemeId): InstallerTheme {

BitFun-Installer/src/types/installer.ts

@@ -30,7 +30,8 @@ export type ThemeId =
   | 'bitfun-china-style'
   | 'bitfun-china-night'
   | 'bitfun-cyber'
-  | 'bitfun-slate';
+  | 'bitfun-slate'
+  | 'bitfun-tokyo-night';
 
 /** Matches main app `themes.current` when following OS appearance. */
 export const SYSTEM_THEME_ID = 'system' as const;

Cargo.toml

@@ -103,7 +103,7 @@ similar = "2.5"
 urlencoding = "2.1"
 
 # Tauri (desktop only)
- tauri = { version = "2", features = ["unstable", "macos-private-api"] }
+ tauri = { version = "2", features = ["unstable", "macos-private-api", "tray-icon"] }
 tauri-plugin-opener = "2"
 tauri-plugin-dialog = "2.6"
 tauri-plugin-fs = "2"

src/apps/desktop/src/api/i18n_api.rs

@@ -93,6 +93,15 @@ pub async fn i18n_set_language(
                     &_app, language, mode, edit_mode,
                 );
             }
+
+            // Rebuild the system tray menu in the new language.
+            {
+                let app_handle = _app.clone();
+                tauri::async_runtime::spawn(async move {
+                    crate::tray::rebuild_tray_menu_public(&app_handle).await;
+                });
+            }
+
             Ok(format!("Language switched to: {}", language))
         }
         Err(e) => {

src/apps/desktop/src/api/system_api.rs

@@ -5,7 +5,7 @@ use std::sync::{Arc, Mutex};
 use crate::api::app_state::AppState;
 use bitfun_core::service::system;
 use serde::{Deserialize, Serialize};
-use tauri::{AppHandle, Emitter, State};
+use tauri::{AppHandle, Emitter, Manager, State};
 use tauri_plugin_updater::UpdaterExt;
 
 /// Emitted during `install_update` download; matches `installUpdateWithProgress` / frontend listener.
@@ -309,6 +309,29 @@ pub struct SendNotificationRequest {
     pub body: Option<String>,
 }
 
+// ─── Window / Tray behavior commands ─────────────────────────────────────────
+
+/// Immediately exit the application (used by the "ask" dialog when the user
+/// chooses to quit rather than minimize to tray).
+#[tauri::command]
+pub async fn quit_app(app: tauri::AppHandle) -> Result<(), String> {
+    log::info!("Quit requested via quit_app command");
+    crate::perform_process_exit_cleanup();
+    app.exit(0);
+    Ok(())
+}
+
+/// Hide the main window so it lives only in the system tray (used by the "ask"
+/// dialog when the user chooses to minimize instead of quitting).
+#[tauri::command]
+pub async fn minimize_to_tray(app: tauri::AppHandle) -> Result<(), String> {
+    if let Some(window) = app.get_webview_window("main") {
+        window.hide().map_err(|e| e.to_string())?;
+        log::info!("Main window minimized to tray via command");
+    }
+    Ok(())
+}
+
 /// Send an OS-level desktop notification (Windows toast / macOS notification center).
 #[tauri::command]
 pub async fn send_system_notification(