- Dark Mode off by default

- Dark mode toggle switches immediately

2 files changed, 8 insertions, 14 deletions

diff --git a/src/application.rs b/src/application.rs
index 6d051ba..bc90642 100755
--- a/src/application.rs
+++ b/src/application.rs
@@ -28,9 +28,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default)]
-    pub struct FurtheranceApplication {
-        // pub settings: gio::Settings,
-    }
+    pub struct FurtheranceApplication {}
 
     #[glib::object_subclass]
     impl ObjectSubclass for FurtheranceApplication {
@@ -115,16 +113,6 @@ impl FurtheranceApplication {
     }
 
     fn setup_application(&self) {
-        let app_id = config::APP_ID.trim_end_matches(".Devel");
-        let settings = gio::Settings::new(app_id);
-
-        settings.connect_changed(
-            Some("dark-mode"),
-            clone!(@weak self as app => move |_, _| {
-                    app.update_light_dark();
-                }
-            ),
-        );
         self.update_light_dark()
     }
 
@@ -197,7 +185,7 @@ impl FurtheranceApplication {
         }
     }
 
-    fn update_light_dark(&self) {
+    pub fn update_light_dark(&self) {
         let manager = adw::StyleManager::default();
 
         if !manager.system_supports_color_schemes() {
diff --git a/src/ui/preferences_window.rs b/src/ui/preferences_window.rs
index 12e8c30..f871e31 100755
--- a/src/ui/preferences_window.rs
+++ b/src/ui/preferences_window.rs
@@ -22,6 +22,7 @@ use gtk::CompositeTemplate;
 
 use crate::settings_manager;
 use crate::ui::FurtheranceWindow;
+use crate::FurtheranceApplication;
 
 mod imp {
     use super::*;
@@ -156,6 +157,11 @@ impl FurPreferencesWindow {
             "active"
         );
 
+        imp.dark_theme_switch.connect_active_notify(move |_|{
+            let app = FurtheranceApplication::default();
+            app.update_light_dark();
+        });
+
         imp.limit_tasks_expander.connect_enable_expansion_notify(move |_|{
             let window = FurtheranceWindow::default();
             window.reset_history_box();