Skip to content

Commit

Permalink
*
Browse files Browse the repository at this point in the history
  • Loading branch information
alainm23 committed Jan 18, 2025
1 parent be3d762 commit 3fc97ee
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 27 deletions.
12 changes: 6 additions & 6 deletions core/Enum.vala
Original file line number Diff line number Diff line change
Expand Up @@ -175,25 +175,25 @@ public enum FilterType {
}
}

public string get_color () {
public string get_color (bool dark = false) {
switch (this) {
case INBOX:
return "#3584e4";
return dark ? "#99c1f1" : "#3584e4";

case TODAY:
return "#33d17a";

case SCHEDULED:
return "#9141ac";
return dark ? "#dc8add" : "#9141ac";

case PINBOARD:
return "#ed333b";
return dark ? "#f66151" : "#ed333b";

case LABELS:
return "#986a44";
return dark ? "#cdab8f" : "#986a44";

case COMPLETED:
return "#ff7800";
return dark ? "#ffbe6f" : "#ff7800";

default:
assert_not_reached ();
Expand Down
9 changes: 6 additions & 3 deletions core/Widgets/Calendar/CalendarHeader.vala
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,14 @@ public class Widgets.Calendar.CalendarHeader : Gtk.Box {

left_button = new Gtk.Button.from_icon_name ("pan-start-symbolic") {
valign = Gtk.Align.CENTER,
css_classes = { "flat" }
css_classes = { "flat" },
tooltip_text = _("Back")
};

right_button = new Gtk.Button.from_icon_name ("pan-end-symbolic") {
valign = Gtk.Align.CENTER,
css_classes = { "flat" }
css_classes = { "flat" },
tooltip_text = _("Forward")
};

var date_grid = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
Expand All @@ -69,7 +71,8 @@ public class Widgets.Calendar.CalendarHeader : Gtk.Box {

center_button = new Gtk.Button () {
valign = Gtk.Align.CENTER,
hexpand = true
hexpand = true,
tooltip_text = _("Today")
};

center_button.add_css_class ("flat");
Expand Down
9 changes: 6 additions & 3 deletions core/Widgets/Calendar/CalendarView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,22 @@ public class Widgets.Calendar.CalendarView : Adw.Bin {
if (i < start_day || i >= max_day + start_day) {
item.visible = false;
} else {
if (block_past_days && generate_date (day, day_number).compare (current_date) <= -1) {
var day_datetime = generate_date (day, day_number);

if (block_past_days && day_datetime.compare (current_date) <= -1) {
item.sensitive = false;
}

if (generate_date (day, day_number).compare (current_date) == 0) {
if (day_datetime.compare (current_date) == 0) {
item.child.add_css_class ("today");
}

if (show_day && Utils.Datetime.get_date_only (day).compare (generate_date (day, day_number)) == 0) {
if (show_day && Utils.Datetime.get_date_only (day).compare (day_datetime) == 0) {
item.child.add_css_class ("selected");
}

item.day = day_number;
item.tooltip_text = Utils.Datetime.get_relative_date_from_date (day_datetime);
day_number = day_number + 1;
}
}
Expand Down
2 changes: 1 addition & 1 deletion data/io.github.alainm23.planify.appdata.xml.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<url type="donation">https://www.patreon.com/alainm23</url>
<launchable type="desktop-id">@[email protected]</launchable>
<releases>
<release version="4.11.6" date="2024-11-04">
<release version="4.11.7" date="2024-11-15">
<description translate="no">
<ul>
<li>Added feature to verify database integrity</li>
Expand Down
4 changes: 0 additions & 4 deletions data/resources/stylesheet/stylesheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,6 @@ entry.flat:focus-within {
animation: add-animation 0.7s ease-in-out;
}

.magic-button:focus {
outline: none;
}

.header-title {
font-weight: bold;
letter-spacing: -0.05em;
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'io.github.alainm23.planify',
'vala', 'c',
version: '4.11.6'
version: '4.11.7'
)

gnome = import('gnome')
Expand Down
15 changes: 8 additions & 7 deletions src/Dialogs/Preferences/PreferencesWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,6 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesDialog {
};

// Loading

var sync_label = new Gtk.Label (_("Planify is is syncing your tasks, this may take a few minutes")) {
css_classes = { "dim-label" }
};
Expand Down Expand Up @@ -1250,14 +1249,16 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesDialog {
});

webview.load_changed.connect ((load_event) => {
var redirect_uri = webview.get_uri ();

if (("https://github.com/alainm23/planner?code=" in redirect_uri) &&
("&state=%s".printf (state) in redirect_uri)) {
var uri = webview.get_uri ();
var redirect_uri = "https://github.com/alainm23/planner";
print ("url: %s\n".printf (uri));

if ((redirect_uri + "?code=" in uri) &&
("&state=%s".printf (state) in uri)) {
settings_header.title = _("Synchronizing…"); // vala-lint=ellipsis

stack.visible_child_name = "loading";
Services.Todoist.get_default ().login.begin (redirect_uri, (obj, res) => {
Services.Todoist.get_default ().login.begin (uri, (obj, res) => {
HttpResponse response = Services.Todoist.get_default ().login.end (res);
pop_subpage ();
webview.get_network_session ().get_website_data_manager ().clear.begin (WebKit.WebsiteDataTypes.ALL, 0, null);
Expand All @@ -1274,7 +1275,7 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesDialog {
});
}

if ("https://github.com/alainm23/planner?error=access_denied" in redirect_uri) {
if (redirect_uri + "?error=access_denied" in uri) {
debug ("access_denied");
webview.get_network_session ().get_website_data_manager ().clear.begin (WebKit.WebsiteDataTypes.ALL, 0, null);
pop_subpage ();
Expand Down
12 changes: 11 additions & 1 deletion src/Layouts/FilterPaneRow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,19 @@ public class Layouts.FilterPaneRow : Gtk.FlowBoxChild {
main_grid.attach (title_box, 0, 1, 2, 2);

child = main_grid;
Util.get_default ().set_widget_color (filter_type.get_color (), this);
Services.Settings.get_default ().settings.bind ("show-tasks-count", count_revealer, "reveal_child", GLib.SettingsBindFlags.DEFAULT);

var granite_settings = Granite.Settings.get_default ();
Util.get_default ().set_widget_color (filter_type.get_color (Services.Settings.get_default ().settings.get_boolean ("dark-mode")), this);
Services.EventBus.get_default ().theme_changed.connect (() => {
print ("dark: %s\n".printf (
(Services.Settings.get_default ().settings.get_boolean ("dark-mode")).to_string ()
));
Util.get_default ().set_widget_color (filter_type.get_color (
Services.Settings.get_default ().settings.get_boolean ("dark-mode")
), this);
});

var select_gesture = new Gtk.GestureClick ();
add_controller (select_gesture);
select_gesture.pressed.connect (() => {
Expand Down
3 changes: 2 additions & 1 deletion src/Widgets/MagicButton.vala
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public class Widgets.MagicButton : Adw.Bin {
height_request = 48,
width_request = 48,
css_classes = { "suggested-action", "magic-button" },
tooltip_markup = Util.get_default ().markup_accel_tooltip (_("Add Task"), "A")
tooltip_markup = Util.get_default ().markup_accel_tooltip (_("Add Task"), "A"),
focusable = false
};

main_revealer = new Gtk.Revealer () {
Expand Down

0 comments on commit 3fc97ee

Please sign in to comment.