Skip to content

Add buttons and functionality #511

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

Open
SO9010 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add buttons and functionality #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f701027
Add buttons and functionality
SO9010 Aug 9, 2024
bcbf466
Merge branch 'jpochyla:master' into Visualize-keyboard-shortcuts
SO9010 Aug 28, 2024
3a2556f
Merge branch 'jpochyla:master' into Visualize-keyboard-shortcuts
SO9010 Sep 3, 2024
22876d0
Update numerous symbols to Sfsymbols
SO9010 Sep 10, 2024
0fa17ce
note
SO9010 Sep 10, 2024
be98682
Merge branch 'jpochyla:master' into Visualize-keyboard-shortcuts
SO9010 Sep 23, 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
67 changes: 64 additions & 3 deletions psst-gui/src/ui/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ fn root_widget() -> impl Widget<AppState> {
.with_child(topbar_back_button_widget())
.with_child(topbar_title_widget())
.with_child(topbar_sort_widget())
.with_flex_spacer(6.0)
.with_child(topbar_shortcut_buttons_widget())
.background(Border::Bottom.with_color(theme::BACKGROUND_DARK));

let main = Flex::column()
Expand Down Expand Up @@ -347,8 +349,8 @@ fn volume_slider() -> impl Widget<AppState> {
}

fn topbar_sort_widget() -> impl Widget<AppState> {
let up_icon = icons::UP.scale((10.0, theme::grid(2.0)));
let down_icon = icons::DOWN.scale((10.0, theme::grid(2.0)));
let up_icon = icons::UP.scale((theme::grid(2.0), theme::grid(2.0)));
let down_icon = icons::DOWN.scale((theme::grid(2.0), theme::grid(2.0)));

let ascending_icon = up_icon
.padding(theme::grid(1.0))
Expand Down Expand Up @@ -391,7 +393,7 @@ fn topbar_sort_widget() -> impl Widget<AppState> {
}

fn topbar_back_button_widget() -> impl Widget<AppState> {
let icon = icons::BACK.scale((10.0, theme::grid(2.0)));
let icon = icons::BACK.scale((theme::grid(2.0), theme::grid(2.0)));
let disabled = icon
.clone()
.with_color(theme::GREY_600)
Expand All @@ -413,6 +415,65 @@ fn topbar_back_button_widget() -> impl Widget<AppState> {
.lens(AppState::history)
}

fn topbar_shortcut_buttons_widget() -> impl Widget<AppState> {
let reload_icon = icons::RELOAD.scale(theme::ICON_SIZE_LARGE)
.padding(theme::grid(1.0))
.link()
.rounded(theme::BUTTON_BORDER_RADIUS)
.on_left_click(|ctx, _, data: &mut AppState, _| {
match &data.nav {
Nav::SavedTracks => {
ctx.submit_command(library::LOAD_TRACKS);
}
Nav::SavedShows => {
ctx.submit_command(library::LOAD_SHOWS);
}
Nav::SavedAlbums => {
ctx.submit_command(library::LOAD_ALBUMS);
}
Nav::Home => {
ctx.submit_command(home::LOAD_MADE_FOR_YOU);
}
Nav::PlaylistDetail(_) => {
ctx.submit_command(cmd::NAVIGATE_REFRESH);
}
_ => {}
}
});

let search_icon = icons::SEARCH.scale(theme::ICON_SIZE_LARGE)
.padding(theme::grid(1.0))
.link()
.rounded(theme::BUTTON_BORDER_RADIUS)
.on_left_click(|ctx, _, _, _| {
ctx.submit_command(cmd::TOGGLE_FINDER);
});
let srch_icon = Either::new(
|nav: &AppState, _| {
// check if the current nav is PlaylistDetail
!matches!(nav.nav, Nav::SavedTracks)
&& !matches!(nav.nav, Nav::SavedShows)
&& !matches!(nav.nav, Nav::Home)
&& !matches!(nav.nav, Nav::SavedAlbums)
},
search_icon,
Empty.boxed(),
);

let icons = Flex::row()
.with_child(reload_icon)
.with_child(srch_icon);

Either::new(
|nav: &AppState, _| {
!matches!(nav.nav, Nav::SearchResults(_))
&& !matches!(nav.nav, Nav::Recommendations(_))
},
icons,
Empty.boxed(),
)
}

fn history_menu(history: &Vector<Nav>) -> Menu<AppState> {
let mut menu = Menu::empty();

Expand Down
Loading