Persist theme preference

Cargo.toml

@@ -32,7 +32,7 @@ thiserror = "1.0.38"
 surf = "2.3.2"
 serde = { version = "1.0.164", features = ["derive"] }
 log = { version = "0.4.19", features = ["kv"] }
-egui-theme-switch = "0.1.0"
+egui-theme-switch = { version = "0.1.1", features = ["serde"] }
 
 [lints]
 workspace = true

src/lib.rs

@@ -56,7 +56,7 @@ impl PortalApp {
         cc.egui_ctx.set_fonts(font_definitions());
 
         PortalApp {
-            visuals: CustomVisuals::new(default_theme),
+            visuals: CustomVisuals::new(default_theme, cc),
             state: PortalAppState::from(action),
             version: cc
                 .egui_ctx
@@ -89,6 +89,10 @@ impl eframe::App for PortalApp {
             });
         });
     }
+
+    fn save(&mut self, storage: &mut dyn eframe::Storage) {
+        self.visuals.save(storage)
+    }
 }
 
 impl PortalApp {

src/visuals.rs

@@ -1,6 +1,6 @@
-use eframe::Theme;
+use eframe::{get_value, set_value, CreationContext, Theme};
 use egui::epaint::hex_color;
-use egui::{Context, Visuals};
+use egui::{Context, ViewportCommand, Visuals};
 use egui_theme_switch::ThemePreference;
 use log::trace;
 
@@ -17,24 +17,36 @@ pub(crate) enum Accent {
     Blue,
 }
 
+const THEME_PREFERENCE_KEY: &str = "theme-preference";
+
 impl CustomVisuals {
-    pub(crate) fn new(default_theme: Theme) -> Self {
+    pub(crate) fn new(default_theme: Theme, cc: &CreationContext) -> Self {
+        let preference = cc
+            .storage
+            .and_then(|s| get_value(s, THEME_PREFERENCE_KEY))
+            .unwrap_or(ThemePreference::System);
+
         Self {
             current: None,
             default_theme,
-            preference: ThemePreference::System,
+            preference,
         }
     }
 
     pub(crate) fn update(&mut self, accent: Accent, ctx: &Context, frame: &eframe::Frame) {
         let theme = self.resolve_theme(frame);
         if self.current != Some((theme, accent)) {
-            ctx.set_visuals(visuals(theme, accent));
             trace!("Updating visuals for theme {theme:?} and accent {accent:?}");
+            ctx.set_visuals(visuals(theme, accent));
+            ctx.send_viewport_cmd(ViewportCommand::SetTheme(self.preference.into()));
             self.current = Some((theme, accent));
         }
     }
 
+    pub(crate) fn save(&mut self, storage: &mut dyn eframe::Storage) {
+        set_value(storage, THEME_PREFERENCE_KEY, &self.preference)
+    }
+
     pub(crate) fn preference_mut(&mut self) -> &mut ThemePreference {
         &mut self.preference
     }

src/widgets/menu.rs

@@ -13,7 +13,6 @@ pub(crate) fn app_menu(
         menu::bar(ui, |ui| {
             let version = AppVersion::current();
 
-            #[cfg(debug_assertions)]
             ui.menu_button("View", |ui| {
                 ui.add(ThemeSwitch::new(visuals.preference_mut()));
             });