Skip to content

PrefersColorSchemeSettings: add gsetting #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 2 commits into from
Apr 15, 2025
Merged

PrefersColorSchemeSettings: add gsetting #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27dd001
PrefersColorSchemeSettings: add gsetting
danirabbit Apr 11, 2025
3c6da35
Implement dark mode snoozing
danirabbit Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions data/io.elementary.settings-daemon.gschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<enum id="ColorScheme">
<value nick='no-preference' value='0'/>
<value nick='prefer-dark' value='1'/>
<value nick='prefer-light' value='2'/>
</enum>

<enum id="PreferDarkScheduleType">
<value nick='disabled' value='0'/>
<value nick='sunset-to-sunrise' value='1'/>
<value nick='manual' value='2'/>
</enum>

<schema path="/io/elementary/settings-daemon/prefers-color-scheme/" id="io.elementary.settings-daemon.prefers-color-scheme">
<key enum="ColorScheme" name="color-scheme">
<default>'no-preference'</default>
<summary>Color Scheme</summary>
<description>The preferred color scheme for the user interface. Valid values are “no-preference”, “prefer-dark”, “prefer-light”.</description>
</key>
<key enum="PreferDarkScheduleType" name="prefer-dark-schedule">
<default>'disabled'</default>
<summary>Algorithm for prefer dark schedule</summary>
Expand All @@ -22,6 +33,11 @@
<summary>The stop time</summary>
<description></description>
</key>
<key type="b" name="prefer-dark-schedule-snoozed">
<default>false</default>
<summary>Snooze Dark Schedule</summary>
<description>True if color scheme was changed during the dark mode schedule. Does nothing if set directly.</description>
</key>
<key type="(dd)" name="last-coordinates">
<default>(91,181)</default>
<summary>The last detected position</summary>
Expand Down
83 changes: 51 additions & 32 deletions src/Backends/PrefersColorSchemeSettings.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
public class SettingsDaemon.Backends.PrefersColorSchemeSettings : Object {
public unowned Pantheon.AccountsService accounts_service { get; construct; }

private const string COLOR_SCHEME = "color-scheme";
private const string DARK_SCHEDULE = "prefer-dark-schedule";
private const string DARK_SCHEDULE_SNOOZED = "prefer-dark-schedule-snoozed";

private Settings color_settings;
private double sunrise = -1.0;
private double sunset = -1.0;
Expand All @@ -35,19 +39,20 @@ public class SettingsDaemon.Backends.PrefersColorSchemeSettings : Object {
construct {
color_settings = new Settings ("io.elementary.settings-daemon.prefers-color-scheme");

var schedule = color_settings.get_string ("prefer-dark-schedule");
var schedule = color_settings.get_string (DARK_SCHEDULE);
if (schedule == "sunset-to-sunrise") {
var variant = color_settings.get_value ("last-coordinates");
on_location_updated (variant.get_child_value (0).get_double (), variant.get_child_value (1).get_double ());
}

color_settings.changed["prefer-dark-schedule"].connect (update_timer);
color_settings.changed[DARK_SCHEDULE].connect (update_timer);
color_settings.changed[COLOR_SCHEME].connect (update_color_scheme);

update_timer ();
}

private void update_timer () {
var schedule = color_settings.get_string ("prefer-dark-schedule");
var schedule = color_settings.get_string (DARK_SCHEDULE);

if (schedule == "sunset-to-sunrise") {
get_location.begin ();
Expand All @@ -56,6 +61,7 @@ public class SettingsDaemon.Backends.PrefersColorSchemeSettings : Object {
} else if (schedule == "manual") {
start_timer ();
} else {
color_settings.set_boolean (DARK_SCHEDULE_SNOOZED, false);
stop_timer ();
}
}
Expand Down Expand Up @@ -91,43 +97,22 @@ public class SettingsDaemon.Backends.PrefersColorSchemeSettings : Object {
}

private bool time_callback () {
var schedule = color_settings.get_string ("prefer-dark-schedule");

var now = new DateTime.now_local ();
double from, to;
if (schedule == "sunset-to-sunrise") {
if (sunrise >= 0 && sunset >= 0) {
from = sunset;
to = sunrise;
} else {
// fallback times (6AM and 8PM) for when an invalid result was returned
// from the calculation (i.e. probably wasn't able to get a location)
from = 20.0;
to = 6.0;
}
} else if (schedule == "manual") {
from = color_settings.get_double ("prefer-dark-schedule-from");
to = color_settings.get_double ("prefer-dark-schedule-to");
} else {
return true;
}

var is_in = is_in_time_window (date_time_double (now), from, to);
var new_color_scheme = Granite.Settings.ColorScheme.NO_PREFERENCE;
if (is_in) {
if (is_in_schedule ()) {
new_color_scheme = Granite.Settings.ColorScheme.DARK;
}

if (new_color_scheme == accounts_service.prefers_color_scheme) {
if (new_color_scheme == color_settings.get_enum (COLOR_SCHEME)) {
color_settings.set_boolean (DARK_SCHEDULE_SNOOZED, false);
return true;
}

accounts_service.prefers_color_scheme = new_color_scheme;

var mutter_settings = new GLib.Settings ("org.gnome.desktop.interface");
mutter_settings.set_enum ("color-scheme", new_color_scheme);
if (!color_settings.get_boolean (DARK_SCHEDULE_SNOOZED)) {
color_settings.set_enum (COLOR_SCHEME, new_color_scheme);
return true;
};

return true;
return GLib.Source.CONTINUE;
}

private void on_location_updated (double latitude, double longitude) {
Expand All @@ -141,6 +126,40 @@ public class SettingsDaemon.Backends.PrefersColorSchemeSettings : Object {
}
}

private void update_color_scheme () {
var color_scheme = color_settings.get_enum (COLOR_SCHEME);
if (
color_scheme == Granite.Settings.ColorScheme.DARK && !is_in_schedule () ||
color_scheme != Granite.Settings.ColorScheme.DARK && is_in_schedule ()
) {
color_settings.set_boolean (DARK_SCHEDULE_SNOOZED, true);
}

accounts_service.prefers_color_scheme = color_scheme;

var mutter_settings = new GLib.Settings ("org.gnome.desktop.interface");
mutter_settings.set_enum ("color-scheme", color_scheme);
}

private bool is_in_schedule () {
var schedule = color_settings.get_string (DARK_SCHEDULE);

// fallback times (6AM and 8PM) for when an invalid result was returned
// from the calculation (i.e. probably wasn't able to get a location)
double from = 20.0;
double to = 6.0;
if (schedule == "sunset-to-sunrise" && sunrise >= 0 && sunset >= 0) {
from = sunset;
to = sunrise;
} else if (schedule == "manual") {
from = color_settings.get_double ("prefer-dark-schedule-from");
to = color_settings.get_double ("prefer-dark-schedule-to");
}

var now = new DateTime.now_local ();
return is_in_time_window (date_time_double (now), from, to);
}

public static bool is_in_time_window (double time_double, double from, double to) {
// PM to AM
if (from > to) {
Expand Down