From c53bdb68e5ce8cb22342a453bc1b8d9457857eda Mon Sep 17 00:00:00 2001 From: reya Date: Sat, 18 Nov 2023 21:17:37 +0700 Subject: [PATCH] add change theme function --- src-tauri/Cargo.lock | 26 ++++++++++++++++++ src-tauri/Cargo.toml | 1 + src-tauri/src/main.rs | 5 +++- src/app/settings/general.tsx | 51 +++++++++++++++++++++++++++++------- 4 files changed, 73 insertions(+), 10 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index ca452531..ed827dec 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2633,6 +2633,7 @@ dependencies = [ "tauri-plugin-single-instance", "tauri-plugin-sql", "tauri-plugin-store", + "tauri-plugin-theme", "tauri-plugin-updater", "tauri-plugin-upload", "tauri-plugin-window-state", @@ -5172,6 +5173,21 @@ dependencies = [ "thiserror", ] +[[package]] +name = "tauri-plugin-theme" +version = "0.2.0" +source = "git+https://github.com/reyamir/tauri-plugin-theme?branch=tauri-v2#73e8fc84cb4fb8363fee4edcbbab82c98c1874cc" +dependencies = [ + "cocoa 0.25.0", + "futures-lite", + "gtk", + "once_cell", + "serde", + "tauri", + "tintanum", + "tokio", +] + [[package]] name = "tauri-plugin-updater" version = "2.0.0-alpha.4" @@ -5417,6 +5433,16 @@ dependencies = [ "time-core", ] +[[package]] +name = "tintanum" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abbcf9173afc80733c20b7e27a30bc9284d6535bdbde2a70904032de63e16e8" +dependencies = [ + "futures-lite", + "zbus", +] + [[package]] name = "tinyvec" version = "1.6.0" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 15bced4e..bef4bbe7 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -33,6 +33,7 @@ tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspac tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-theme = { git = "https://github.com/reyamir/tauri-plugin-theme", branch = "tauri-v2" } tauri-plugin-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v2", features = [ "sqlite", ] } diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 8de740b8..520a15f1 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -7,6 +7,7 @@ use keyring::Entry; use std::time::Duration; use tauri_plugin_autostart::MacosLauncher; use tauri_plugin_sql::{Migration, MigrationKind}; +use tauri_plugin_theme::ThemePlugin; use webpage::{Webpage, WebpageOptions}; #[derive(Clone, serde::Serialize)] @@ -105,6 +106,7 @@ fn secure_remove(key: String) -> Result<(), ()> { } fn main() { + let mut ctx = tauri::generate_context!(); tauri::Builder::default() .setup(|app| { #[cfg(desktop)] @@ -113,6 +115,7 @@ fn main() { .plugin(tauri_plugin_updater::Builder::new().build())?; Ok(()) }) + .plugin(ThemePlugin::init(ctx.config_mut())) .plugin( tauri_plugin_sql::Builder::default() .add_migrations( @@ -154,6 +157,6 @@ fn main() { secure_load, secure_remove ]) - .run(tauri::generate_context!()) + .run(ctx) .expect("error while running tauri application"); } diff --git a/src/app/settings/general.tsx b/src/app/settings/general.tsx index 0decafaf..1b823c84 100644 --- a/src/app/settings/general.tsx +++ b/src/app/settings/general.tsx @@ -1,5 +1,8 @@ import * as Switch from '@radix-ui/react-switch'; +import { invoke } from '@tauri-apps/api/primitives'; +import { getCurrent } from '@tauri-apps/api/window'; import { useEffect, useState } from 'react'; +import { twMerge } from 'tailwind-merge'; import { useStorage } from '@libs/storage/provider'; @@ -16,8 +19,20 @@ export function GeneralSettingScreen() { appearance: 'system', }); + const changeTheme = async (theme: 'light' | 'dark' | 'auto') => { + await invoke('plugin:theme|set_theme', { + theme, + }); + await db.createSetting('appearance', theme); + // update state + setSettings((prev) => ({ ...prev, appearance: theme })); + }; + useEffect(() => { async function loadSettings() { + const theme = await getCurrent().theme(); + setSettings((prev) => ({ ...prev, appearance: theme })); + const data = await db.getAllSettings(); if (!data) return; @@ -51,12 +66,6 @@ export function GeneralSettingScreen() { ...prev, notification: item.value === '1' ? true : false, })); - - if (item.key === 'appearance') - setSettings((prev) => ({ - ...prev, - appearance: item.value, - })); }); } @@ -133,9 +142,17 @@ export function GeneralSettingScreen() {