Skip to content

Commit 3fc97ee

Browse files
committed
*
1 parent be3d762 commit 3fc97ee

File tree

9 files changed

+41
-27
lines changed

9 files changed

+41
-27
lines changed

core/Enum.vala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,25 +175,25 @@ public enum FilterType {
175175
}
176176
}
177177

178-
public string get_color () {
178+
public string get_color (bool dark = false) {
179179
switch (this) {
180180
case INBOX:
181-
return "#3584e4";
181+
return dark ? "#99c1f1" : "#3584e4";
182182

183183
case TODAY:
184184
return "#33d17a";
185185

186186
case SCHEDULED:
187-
return "#9141ac";
187+
return dark ? "#dc8add" : "#9141ac";
188188

189189
case PINBOARD:
190-
return "#ed333b";
190+
return dark ? "#f66151" : "#ed333b";
191191

192192
case LABELS:
193-
return "#986a44";
193+
return dark ? "#cdab8f" : "#986a44";
194194

195195
case COMPLETED:
196-
return "#ff7800";
196+
return dark ? "#ffbe6f" : "#ff7800";
197197

198198
default:
199199
assert_not_reached ();

core/Widgets/Calendar/CalendarHeader.vala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,14 @@ public class Widgets.Calendar.CalendarHeader : Gtk.Box {
5555

5656
left_button = new Gtk.Button.from_icon_name ("pan-start-symbolic") {
5757
valign = Gtk.Align.CENTER,
58-
css_classes = { "flat" }
58+
css_classes = { "flat" },
59+
tooltip_text = _("Back")
5960
};
6061

6162
right_button = new Gtk.Button.from_icon_name ("pan-end-symbolic") {
6263
valign = Gtk.Align.CENTER,
63-
css_classes = { "flat" }
64+
css_classes = { "flat" },
65+
tooltip_text = _("Forward")
6466
};
6567

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

7072
center_button = new Gtk.Button () {
7173
valign = Gtk.Align.CENTER,
72-
hexpand = true
74+
hexpand = true,
75+
tooltip_text = _("Today")
7376
};
7477

7578
center_button.add_css_class ("flat");

core/Widgets/Calendar/CalendarView.vala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,22 @@ public class Widgets.Calendar.CalendarView : Adw.Bin {
9898
if (i < start_day || i >= max_day + start_day) {
9999
item.visible = false;
100100
} else {
101-
if (block_past_days && generate_date (day, day_number).compare (current_date) <= -1) {
101+
var day_datetime = generate_date (day, day_number);
102+
103+
if (block_past_days && day_datetime.compare (current_date) <= -1) {
102104
item.sensitive = false;
103105
}
104106

105-
if (generate_date (day, day_number).compare (current_date) == 0) {
107+
if (day_datetime.compare (current_date) == 0) {
106108
item.child.add_css_class ("today");
107109
}
108110

109-
if (show_day && Utils.Datetime.get_date_only (day).compare (generate_date (day, day_number)) == 0) {
111+
if (show_day && Utils.Datetime.get_date_only (day).compare (day_datetime) == 0) {
110112
item.child.add_css_class ("selected");
111113
}
112114

113115
item.day = day_number;
116+
item.tooltip_text = Utils.Datetime.get_relative_date_from_date (day_datetime);
114117
day_number = day_number + 1;
115118
}
116119
}

data/io.github.alainm23.planify.appdata.xml.in.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<url type="donation">https://www.patreon.com/alainm23</url>
6262
<launchable type="desktop-id">@[email protected]</launchable>
6363
<releases>
64-
<release version="4.11.6" date="2024-11-04">
64+
<release version="4.11.7" date="2024-11-15">
6565
<description translate="no">
6666
<ul>
6767
<li>Added feature to verify database integrity</li>

data/resources/stylesheet/stylesheet.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,6 @@ entry.flat:focus-within {
146146
animation: add-animation 0.7s ease-in-out;
147147
}
148148

149-
.magic-button:focus {
150-
outline: none;
151-
}
152-
153149
.header-title {
154150
font-weight: bold;
155151
letter-spacing: -0.05em;

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project(
22
'io.github.alainm23.planify',
33
'vala', 'c',
4-
version: '4.11.6'
4+
version: '4.11.7'
55
)
66

77
gnome = import('gnome')

src/Dialogs/Preferences/PreferencesWindow.vala

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,6 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesDialog {
12051205
};
12061206

12071207
// Loading
1208-
12091208
var sync_label = new Gtk.Label (_("Planify is is syncing your tasks, this may take a few minutes")) {
12101209
css_classes = { "dim-label" }
12111210
};
@@ -1250,14 +1249,16 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesDialog {
12501249
});
12511250

12521251
webview.load_changed.connect ((load_event) => {
1253-
var redirect_uri = webview.get_uri ();
1254-
1255-
if (("https://github.com/alainm23/planner?code=" in redirect_uri) &&
1256-
("&state=%s".printf (state) in redirect_uri)) {
1252+
var uri = webview.get_uri ();
1253+
var redirect_uri = "https://github.com/alainm23/planner";
1254+
print ("url: %s\n".printf (uri));
1255+
1256+
if ((redirect_uri + "?code=" in uri) &&
1257+
("&state=%s".printf (state) in uri)) {
12571258
settings_header.title = _("Synchronizing…"); // vala-lint=ellipsis
12581259

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

1277-
if ("https://github.com/alainm23/planner?error=access_denied" in redirect_uri) {
1278+
if (redirect_uri + "?error=access_denied" in uri) {
12781279
debug ("access_denied");
12791280
webview.get_network_session ().get_website_data_manager ().clear.begin (WebKit.WebsiteDataTypes.ALL, 0, null);
12801281
pop_subpage ();

src/Layouts/FilterPaneRow.vala

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,19 @@ public class Layouts.FilterPaneRow : Gtk.FlowBoxChild {
9797
main_grid.attach (title_box, 0, 1, 2, 2);
9898

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

102+
var granite_settings = Granite.Settings.get_default ();
103+
Util.get_default ().set_widget_color (filter_type.get_color (Services.Settings.get_default ().settings.get_boolean ("dark-mode")), this);
104+
Services.EventBus.get_default ().theme_changed.connect (() => {
105+
print ("dark: %s\n".printf (
106+
(Services.Settings.get_default ().settings.get_boolean ("dark-mode")).to_string ()
107+
));
108+
Util.get_default ().set_widget_color (filter_type.get_color (
109+
Services.Settings.get_default ().settings.get_boolean ("dark-mode")
110+
), this);
111+
});
112+
103113
var select_gesture = new Gtk.GestureClick ();
104114
add_controller (select_gesture);
105115
select_gesture.pressed.connect (() => {

src/Widgets/MagicButton.vala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public class Widgets.MagicButton : Adw.Bin {
4343
height_request = 48,
4444
width_request = 48,
4545
css_classes = { "suggested-action", "magic-button" },
46-
tooltip_markup = Util.get_default ().markup_accel_tooltip (_("Add Task"), "A")
46+
tooltip_markup = Util.get_default ().markup_accel_tooltip (_("Add Task"), "A"),
47+
focusable = false
4748
};
4849

4950
main_revealer = new Gtk.Revealer () {

0 commit comments

Comments
 (0)