Skip to content

AppListUpdateView: use a single header #2333

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

Draft
danirabbit wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

AppListUpdateView: use a single header #2333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion data/styles/MainWindow.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
* SPDX-FileCopyrightText: 2024 elementary, Inc. (https://elementary.io)
*/

.header > box {
box.header {
border-spacing: 1rem;
padding: 1rem;
}

Expand Down
107 changes: 52 additions & 55 deletions src/Views/AppListUpdateView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ namespace AppCenter.Views {
public class AppListUpdateView : Adw.NavigationPage {
public signal void show_app (AppCenterCore.Package package);

private Granite.HeaderLabel header_label;
private Gtk.Label header_label;
private Gtk.FlowBox installed_flowbox;
private Gtk.ListBox list_box;
private Gtk.Revealer header_revealer;
private Gtk.Revealer updated_revealer;
private Gtk.Label updated_label;
private Gtk.SizeGroup action_button_group;
private Granite.HeaderLabel installed_header;
Expand All @@ -39,64 +37,43 @@ namespace AppCenter.Views {
var update_manager = AppCenterCore.UpdateManager.get_default ();
unowned var flatpak_backend = AppCenterCore.FlatpakBackend.get_default ();

header_label = new Granite.HeaderLabel ("") {
hexpand = true,
header_label = new Gtk.Label ("") {
halign = START,
valign = CENTER
};
flatpak_backend.bind_property (
"n-updatable-packages", header_label, "label", SYNC_CREATE,
(binding, from_value, ref to_value) => {
var n_updatable_packages = from_value.get_uint ();

to_value.set_string (ngettext (
"%u Update Available",
"%u Updates Available",
n_updatable_packages
).printf (n_updatable_packages));

return true;
}
);

var size_label = new Widgets.SizeLabel () {
halign = Gtk.Align.END,
valign = Gtk.Align.CENTER
};
flatpak_backend.bind_property ("updates-size", size_label, "size", SYNC_CREATE);

updated_label = new Gtk.Label ("");
updated_label.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);

var updated_box = new Gtk.Box (HORIZONTAL, 6);
updated_box.append (new Gtk.Image.from_icon_name ("process-completed-symbolic"));
updated_box.append (updated_label);

updated_revealer = new Gtk.Revealer () {
child = updated_box
var updated_revealer = new Gtk.Revealer () {
child = new Gtk.Image.from_icon_name ("process-completed-symbolic"),
transition_type = CROSSFADE
};
updated_revealer.add_css_class ("header");
flatpak_backend.bind_property (
"up-to-date", updated_revealer, "reveal-child", SYNC_CREATE
);

var update_all_button = new Gtk.Button.with_label (_("Update All")) {
valign = Gtk.Align.CENTER,
action_name = "app.update-all"
};
update_all_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);

var header = new Gtk.Box (HORIZONTAL, 16);
header.append (header_label);
header.append (size_label);
header.append (update_all_button);
var update_action_box = new Gtk.Box (HORIZONTAL, 12);
update_action_box.append (size_label);
update_action_box.append (update_all_button);

header_revealer = new Gtk.Revealer () {
child = header
var update_action_revealer = new Gtk.Revealer () {
child = update_action_box,
halign = END,
hexpand = true,
transition_type = CROSSFADE
};
header_revealer.add_css_class ("header");
flatpak_backend.bind_property (
"has-updatable-packages", header_revealer, "reveal-child", SYNC_CREATE
);

var header = new Gtk.Box (HORIZONTAL, 0);
header.add_css_class ("header");
header.append (header_label);
header.append (updated_revealer);
header.append (update_action_revealer);

list_box = new Gtk.ListBox () {
activate_on_single_click = true,
Expand All @@ -110,7 +87,6 @@ namespace AppCenter.Views {
margin_bottom = 12,
margin_start = 12
};
flatpak_backend.bind_property ("has-updated-packages", installed_header, "visible", SYNC_CREATE);

installed_flowbox = new Gtk.FlowBox () {
column_spacing = 24,
Expand Down Expand Up @@ -192,8 +168,7 @@ namespace AppCenter.Views {
content = scrolled
};
toolbarview.add_top_bar (headerbar);
toolbarview.add_top_bar (updated_revealer);
toolbarview.add_top_bar (header_revealer);
toolbarview.add_top_bar (header);
toolbarview.add_css_class (Granite.STYLE_CLASS_VIEW);

child = toolbarview;
Expand All @@ -212,6 +187,18 @@ namespace AppCenter.Views {
}
});

flatpak_backend.bind_property (
"up-to-date", updated_revealer, "reveal-child", SYNC_CREATE
);

flatpak_backend.bind_property (
"has-updatable-packages", update_action_revealer, "reveal-child", SYNC_CREATE
);

flatpak_backend.bind_property ("has-updated-packages", installed_header, "visible", SYNC_CREATE);

flatpak_backend.notify["n-updatable-packages"].connect (set_header_label);

flatpak_backend.notify ["working"].connect (() => {
if (flatpak_backend.working) {
refresh_menuitem.sensitive = false;
Expand All @@ -238,25 +225,35 @@ namespace AppCenter.Views {
map.connect (start_updated_label_timeout);
unmap.connect (stop_updated_label_timeout);

App.settings.changed["last-refresh-time"].connect (set_updated_label);
App.settings.changed["last-refresh-time"].connect (set_header_label);
}

private void set_updated_label () {
updated_label.label = _("Everything is up to date. Last checked %s.").printf (
Granite.DateTime.get_relative_datetime (
new DateTime.from_unix_local (AppCenter.App.settings.get_int64 ("last-refresh-time"))
)
);
private void set_header_label () {
unowned var flatpak_backend = AppCenterCore.FlatpakBackend.get_default ();

if (flatpak_backend.has_updatable_packages) {
header_label.label = ngettext (
"%u Update Available",
"%u Updates Available",
flatpak_backend.n_updatable_packages
).printf (flatpak_backend.n_updatable_packages);
} else {
header_label.label = _("Everything is up to date. Last checked %s.").printf (
Granite.DateTime.get_relative_datetime (
new DateTime.from_unix_local (AppCenter.App.settings.get_int64 ("last-refresh-time"))
)
);
}
}

private void start_updated_label_timeout () {
if (updated_label_timeout_id == 0) {
updated_label_timeout_id = Timeout.add_seconds (60, () => {
set_updated_label ();
set_header_label ();
return Source.CONTINUE;
});
}
set_updated_label ();
set_header_label ();
}

private void stop_updated_label_timeout () {
Expand Down