feat(theme): use OS dark/light theme preference for initial theme value

AU-Master-Thesis · Apr 14, 2024 · 3d1e741 · 3d1e741
1 parent aa7b59b
commit 3d1e741
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/gbpplanner-rs/Cargo.toml b/crates/gbpplanner-rs/Cargo.toml
@@ -103,9 +103,11 @@ egui_graphs      = "0.19.0"
 serde_yaml       = "0.9.34"
 colored          = "2.1.0"
 directories      = "5.0.1"
-chrono = "0.4.37"
+chrono           = "0.4.37"
 # font-kit = { version = "0.13.0", features = ["freetype"] }
 
+dark-light = "1.1.1"
+
 
 # TODO: change to not wasm
 [target.'cfg(linux)'.dependencies]

diff --git a/crates/gbpplanner-rs/src/input/general.rs b/crates/gbpplanner-rs/src/input/general.rs
@@ -12,7 +12,7 @@ use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
 use tap::Tap;
 
-use super::{super::theme::ThemeEvent, screenshot::TakeScreenshot};
+use super::{super::theme::CycleTheme, screenshot::TakeScreenshot};
 use crate::{
     config::Config,
     planner::{FactorGraph, NodeKind, PausePlayEvent, RobotId, RobotState},
@@ -219,7 +219,7 @@ fn export_factorgraphs_as_graphviz(
 }
 
 fn cycle_theme(
-    theme_event_writer: &mut EventWriter<ThemeEvent>,
+    theme_event_writer: &mut EventWriter<CycleTheme>,
     catppuccin_theme: Res<CatppuccinTheme>,
 ) {
     info!("toggling application theme");
@@ -231,7 +231,7 @@ fn cycle_theme(
         catppuccin::Flavour::Mocha => catppuccin::Flavour::Latte,
     };
 
-    theme_event_writer.send(ThemeEvent(next_theme));
+    theme_event_writer.send(CycleTheme(next_theme));
 }
 
 fn export_graph_on_event(
@@ -365,7 +365,7 @@ fn quit_application_system(
 }
 
 fn general_actions_system(
-    mut theme_event: EventWriter<ThemeEvent>,
+    mut theme_event: EventWriter<CycleTheme>,
     query: Query<&ActionState<GeneralAction>, With<GeneralInputs>>,
     query_graphs: Query<(Entity, &FactorGraph), With<RobotState>>,
     config: Res<Config>,