Skip to content
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

Page loading improvements #98

Merged
merged 15 commits into from
Feb 5, 2024
Merged

Page loading improvements #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
be8eb57
chore: update gi-types
vixalien Feb 4, 2024
8b6ddc2
fix: rename typescript types to more sensible names
vixalien Feb 4, 2024
2a18f4b
feat: load the page directly from Page
vixalien Feb 4, 2024
ad0bc94
chore: add refresh icon
vixalien Feb 4, 2024
67be793
feat: make the error pages full pages
vixalien Feb 4, 2024
0c490ed
feat: allow refreshing pages
vixalien Feb 4, 2024
ca68003
feat: add a smooth crossfade transition when a page is loaded
vixalien Feb 4, 2024
3074a23
feat: allow refreshing the home page
vixalien Feb 4, 2024
d5ff968
feat: ported a few more pages
vixalien Feb 4, 2024
b1e9acc
feat: add refresh button to library pages
vixalien Feb 4, 2024
e4a6727
feat: allow refreshing the login code
vixalien Feb 5, 2024
c9058ec
feat: allow replacing the current navigation view instead of pushing …
vixalien Feb 5, 2024
c9a93f4
feat: replace the current view when a search filter is applied
vixalien Feb 5, 2024
7570e64
feat: replace the charts page when the country is changed
vixalien Feb 5, 2024
adc34ab
feat: replace library pages when sort order is changed
vixalien Feb 5, 2024
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
1 change: 1 addition & 0 deletions data/com.vixalien.muzika.data.gresource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
<file preprocess="xml-stripblanks">icons/scalable/actions/playlist2-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/profit-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/progress-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/refresh-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/sentiment-satisfied-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/skip-backwards-10-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/skip-forward-10-symbolic.svg</file>
Expand Down
2 changes: 2 additions & 0 deletions data/icons/scalable/actions/refresh-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion data/ui/components/library/history.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ using Adw 1;
template $HistoryPage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {}
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}
}

content: Adw.BreakpointBin {
width-request: 200;
Expand Down
8 changes: 7 additions & 1 deletion data/ui/components/library/songs.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ using Adw 1;
template $LibrarySongsPage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {}
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}
}

content: Adw.BreakpointBin {
width-request: 200;
Expand Down
1 change: 1 addition & 0 deletions data/ui/components/nav/page.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ using Adw 1;
template $Page : $AdwNavigationPage {
Stack stack {
vhomogeneous: false;
transition-type: crossfade;

Adw.Bin loading {
Adw.ToolbarView {
Expand Down
6 changes: 6 additions & 0 deletions data/ui/pages/album.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ template $AlbumPage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}

[end]
MenuButton menu {
icon-name: "view-more-symbolic";
Expand Down
8 changes: 7 additions & 1 deletion data/ui/pages/artist-albums.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ using Adw 1;
template $ArtistAlbumsPage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {}
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}
}

content: ScrolledWindow scrolled {
hexpand: true;
Expand Down
6 changes: 6 additions & 0 deletions data/ui/pages/artist.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ template $ArtistPage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}

[end]
MenuButton menu {
icon-name: "view-more-symbolic";
Expand Down
117 changes: 64 additions & 53 deletions data/ui/pages/authentication-error.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,85 @@
using Gtk 4.0;
using Adw 1;

template $AuthenticationErrorPage : Box {
Adw.StatusPage status {
hexpand: true;
icon-name: "system-lock-screen-symbolic";
title: _("Authentication is required");
template $AuthenticationErrorPage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}
}

Box more {
orientation: vertical;
spacing: 6;
Adw.StatusPage status {
hexpand: true;
icon-name: 'system-lock-screen-symbolic';
title: _('Authentication is required');

Box buttons {
halign: center;
margin-bottom: 12;
Box more {
orientation: vertical;
spacing: 6;

Button {
label: _("Log in");
action-name: "win.login";
Box buttons {
halign: center;
margin-bottom: 12;
spacing: 6;

styles [
"pill",
"suggested-action",
]
}
Button {
label: _('Log in');
action-name: 'win.login';

Button home_button {
label: _("Go to Home");

styles [
"pill",
]
}
}
styles [
"pill",
"suggested-action",
]
}

Expander expander {
label: _("Error Details");
halign: center;
}
Button home_button {
label: _('Go to Home');

Revealer {
reveal-child: bind expander.expanded;
styles [
"pill",
]
}
}

Adw.Clamp {
maximum-size: 1000;
tightening-threshold: 600;
Expander expander {
label: _('Error Details');
halign: center;
}

Box {
margin-top: 6;
margin-bottom: 6;
margin-end: 6;
margin-start: 6;
Revealer {
reveal-child: bind-property expander.expanded;

styles [
"card",
]
Adw.Clamp {
maximum-size: 1000;
tightening-threshold: 600;

TextView text_view {
hexpand: true;
top-margin: 12;
bottom-margin: 12;
left-margin: 12;
right-margin: 12;
wrap-mode: word_char;
editable: false;
Box {
margin-top: 6;
margin-bottom: 6;
margin-end: 6;
margin-start: 6;

styles [
"transparent",
"card",
]

TextView text_view {
hexpand: true;
top-margin: 12;
bottom-margin: 12;
left-margin: 12;
right-margin: 12;
wrap-mode: word_char;
editable: false;

styles [
"transparent",
]
}
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion data/ui/pages/channel-playlists.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ using Adw 1;
template $ChannelPlaylistsPage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {}
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}
}

content: ScrolledWindow scrolled {
hexpand: true;
Expand Down
6 changes: 6 additions & 0 deletions data/ui/pages/channel.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ template $ChannelPage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}

[end]
MenuButton menu {
icon-name: "view-more-symbolic";
Expand Down
8 changes: 7 additions & 1 deletion data/ui/pages/charts.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ using Adw 1;
template $ChartsPage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {}
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}
}

content: ScrolledWindow scrolled {
vexpand: true;
Expand Down
83 changes: 47 additions & 36 deletions data/ui/pages/error.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,62 @@
using Gtk 4.0;
using Adw 1;

template $ErrorPage : Box {
Adw.StatusPage status {
hexpand: true;
icon-name: "dialog-question-symbolic";
title: _("An error occurred");
description: "";

Box more {
orientation: vertical;
spacing: 6;

Expander expander {
label: _("Error Details");
halign: center;
template $ErrorPage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}
}

Adw.StatusPage status {
hexpand: true;
icon-name: 'dialog-question-symbolic';
title: _('An error occurred');
description: '';

Revealer {
reveal-child: bind expander.expanded;
Box more {
orientation: vertical;
spacing: 6;

Adw.Clamp {
maximum-size: 1000;
tightening-threshold: 600;
Expander expander {
label: _('Error Details');
halign: center;
}

Box {
margin-top: 6;
margin-bottom: 6;
margin-end: 6;
margin-start: 6;
Revealer {
reveal-child: bind expander.expanded;

styles [
"card",
]
Adw.Clamp {
maximum-size: 1000;
tightening-threshold: 600;

TextView text_view {
hexpand: true;
top-margin: 12;
bottom-margin: 12;
left-margin: 12;
right-margin: 12;
wrap-mode: word_char;
editable: false;
Box {
margin-top: 6;
margin-bottom: 6;
margin-end: 6;
margin-start: 6;

styles [
"transparent",
"card",
]

TextView text_view {
hexpand: true;
top-margin: 12;
bottom-margin: 12;
left-margin: 12;
right-margin: 12;
wrap-mode: word_char;
editable: false;

styles [
"transparent",
]
}
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion data/ui/pages/explore.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ using Adw 1;
template $ExplorePage : Adw.Bin {
Adw.ToolbarView {
[top]
Adw.HeaderBar {}
Adw.HeaderBar {
[start]
Button {
icon-name: "refresh";
action-name: "navigator.reload";
}
}

content: ScrolledWindow scrolled {
vexpand: true;
Expand Down
Loading
Loading