Remove dark mode switch (#836)

geigi · Apr 28, 2024 · 5feb9cf · 5feb9cf
1 parent 5afc973
commit 5feb9cf
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 41 deletions.
diff --git a/cozy/application_settings.py b/cozy/application_settings.py
@@ -109,14 +109,6 @@ def forward_duration(self) -> int:
     def forward_duration(self, new_value):
         self._settings.set_int("forward-duration", new_value)
 
-    @property
-    def dark_mode(self) -> bool:
-        return self._settings.get_boolean("dark-mode")
-
-    @dark_mode.setter
-    def dark_mode(self, new_value: bool):
-        self._settings.set_boolean("dark-mode", new_value)
-
     @property
     def window_width(self) -> int:
         return self._settings.get_int("window-width")

diff --git a/cozy/ui/preferences_window.py b/cozy/ui/preferences_window.py
@@ -16,7 +16,6 @@ class PreferencesWindow(Adw.PreferencesDialog):
     storages_page: Adw.PreferencesPage = Gtk.Template.Child()
     user_feedback_preference_group: Adw.PreferencesGroup = Gtk.Template.Child()
 
-    dark_mode_switch: Adw.SwitchRow = Gtk.Template.Child()
     swap_author_reader_switch: Adw.SwitchRow = Gtk.Template.Child()
     replay_switch: Adw.SwitchRow = Gtk.Template.Child()
     sleep_timer_fadeout_switch: Adw.SwitchRow = Gtk.Template.Child()
@@ -44,7 +43,6 @@ def _bind_settings(self) -> None:
             setting, widget, propetry, Gio.SettingsBindFlags.DEFAULT
         )
 
-        bind_settings("dark-mode", self.dark_mode_switch, "active")
         bind_settings("swap-author-reader", self.swap_author_reader_switch, "active")
         bind_settings("replay", self.replay_switch, "active")
         bind_settings("rewind-duration", self.rewind_duration_adjustment, "value")

diff --git a/cozy/view_model/settings_view_model.py b/cozy/view_model/settings_view_model.py
@@ -1,7 +1,5 @@
 import logging
 
-from gi.repository import Adw
-
 from cozy.application_settings import ApplicationSettings
 from cozy.architecture.event_sender import EventSender
 from cozy.architecture.observable import Observable
@@ -23,11 +21,6 @@ def __init__(self):
 
         self._lock_ui: bool = False
 
-        self.style_manager = Adw.StyleManager.get_default()
-        self._set_dark_mode()
-
-        self._app_settings.add_listener(self._on_app_setting_changed)
-
         if self._model.first_start:
             self._importer.scan()
 
@@ -39,13 +32,3 @@ def lock_ui(self) -> bool:
     def lock_ui(self, new_value: bool):
         self._lock_ui = new_value
         self._notify("lock_ui")
-
-    def _set_dark_mode(self):
-        if self._app_settings.dark_mode:
-            self.style_manager.set_color_scheme(Adw.ColorScheme.PREFER_DARK)
-        else:
-            self.style_manager.set_color_scheme(Adw.ColorScheme.PREFER_LIGHT)
-
-    def _on_app_setting_changed(self, event: str, data):
-        if event == "dark-mode":
-            self._set_dark_mode()
diff --git a/data/com.github.geigi.cozy.gschema.xml b/data/com.github.geigi.cozy.gschema.xml
@@ -41,11 +41,6 @@
       <summary>Display the time according to the playback speed.</summary>
       <description></description>
     </key>
-    <key type="b" name="dark-mode">
-      <default>false</default> 
-      <summary>Enable Dark Mode.</summary>
-      <description></description>
-    </key>
     <key type="b" name="swap-author-reader">
       <default>false</default>
       <summary>Swap author and reader tag assignment.</summary>
@@ -112,4 +107,4 @@
       <description></description>
     </key>
   </schema>
-</schemalist>
+</schemalist>
diff --git a/data/ui/preferences.blp b/data/ui/preferences.blp
@@ -28,14 +28,6 @@ template $PreferencesWindow: Adw.PreferencesDialog {
     icon-name: 'settings-symbolic';
     title: _("General");
 
-    Adw.PreferencesGroup {
-      title: _("Appearance");
-
-      Adw.SwitchRow dark_mode_switch {
-        title: _("Dark Mode");
-      }
-    }
-
     Adw.PreferencesGroup {
       title: _("Tags");