chore(deps): upgrade to dark-light v2

This commit is contained in:
Rudxain 2025-01-09 20:23:50 -04:00
commit fb5a3f9d09
No known key found for this signature in database
GPG key ID: 0DAC837DDEF8E96C
4 changed files with 254 additions and 436 deletions

722
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -18,8 +18,7 @@ self-update = ["flate2", "tar"]
no-self-update = []
[dependencies]
# https://github.com/frewsxcv/rust-dark-light/issues/39
dark-light = "=1.0.0"
dark-light = "2"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0"
static_init = "^1.0"

View file

@ -12,7 +12,8 @@ at the cost of requiring a restart to update the palette.
(this is just a patch, not a fix)
*/
#[dynamic(lazy)]
pub static OS_COLOR_SCHEME: dark_light::Mode = dark_light::detect();
pub static OS_COLOR_SCHEME: dark_light::Mode =
dark_light::detect().unwrap_or(dark_light::Mode::Unspecified);
#[derive(Default, Debug, PartialEq, Eq, Copy, Clone)]
/// Color scheme
@ -129,7 +130,7 @@ impl Theme {
Self::Lupin => LUPIN,
Self::Auto => match *OS_COLOR_SCHEME {
dark_light::Mode::Light => LIGHT,
dark_light::Mode::Dark | dark_light::Mode::Default => DARK,
dark_light::Mode::Dark | dark_light::Mode::Unspecified => DARK,
},
}
}

View file

@ -381,8 +381,8 @@ impl Application for UadGui {
impl UadGui {
pub fn start() -> iced::Result {
let logo: &[u8] = match *OS_COLOR_SCHEME {
// remember to keep `Default` in sync with `src/core/theme`
dark_light::Mode::Dark | dark_light::Mode::Default => {
// remember to keep `Unspecified` in sync with `src/core/theme`
dark_light::Mode::Dark | dark_light::Mode::Unspecified => {
include_bytes!("../../resources/assets/logo-dark.png")
}
dark_light::Mode::Light => {