Skip to content

Add header to saved tracks section in library UI #662

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
Cleboost wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add header to saved tracks section in library UI #662

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
185 changes: 116 additions & 69 deletions psst-gui/src/ui/library.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::sync::Arc;

use druid::{
widget::{Flex, List},
widget::{Flex, List, Label},
LensExt, Selector, Widget, WidgetExt,
};

Expand All @@ -14,6 +14,8 @@ use crate::{
ui::home::{shows_that_you_might_like, your_shows},
webapi::WebApi,
widget::{Async, MyWidgetExt},
widget::icons,
ui::theme,
};

use super::{album, playable, track, utils};
Expand All @@ -31,78 +33,123 @@ pub const UNSAVE_ALBUM: Selector<AlbumLink> = Selector::new("app.library.unsave-
pub const SAVE_SHOW: Selector<Arc<Show>> = Selector::new("app.library.save-show");
pub const UNSAVE_SHOW: Selector<ShowLink> = Selector::new("app.library.unsave-show");

fn saved_tracks_header() -> impl Widget<AppState> {
use druid::widget::CrossAxisAlignment;

let size = theme::grid(10.0);
let heart_cover = icons::HEART.scale((size, size));

let title_label = Label::new("Saved Tracks")
.with_text_size(theme::TEXT_SIZE_LARGE)
.with_font(theme::UI_FONT_MEDIUM);

let track_count_label = Label::dynamic(|data: &AppState, _| {
let count = data
.library
.saved_tracks
.resolved()
.map(|tracks| tracks.tracks.len())
.unwrap_or(0);
if count == 1 {
"1 track".to_string()
} else {
format!("{} tracks", count)
}
})
.with_text_size(theme::TEXT_SIZE_SMALL)
.with_text_color(theme::PLACEHOLDER_COLOR);

let info = Flex::column()
.cross_axis_alignment(CrossAxisAlignment::Start)
.with_child(title_label)
.with_spacer(theme::grid(0.2))
.with_child(track_count_label);

Flex::row()
.cross_axis_alignment(CrossAxisAlignment::Center)
.with_child(heart_cover)
.with_default_spacer()
.with_child(info.padding(theme::grid(1.0)))
.align_left()
}

pub fn saved_tracks_widget() -> impl Widget<AppState> {
Async::new(
utils::spinner_widget,
|| {
playable::list_widget_with_find(
playable::Display {
track: track::Display {
title: true,
artist: true,
album: true,
cover: true,
..track::Display::empty()
},
Flex::column()
.with_child(saved_tracks_header())
.with_flex_child(
Async::new(
utils::spinner_widget,
|| {
playable::list_widget_with_find(
playable::Display {
track: track::Display {
title: true,
artist: true,
album: true,
cover: true,
..track::Display::empty()
},
},
cmd::FIND_IN_SAVED_TRACKS,
)
},
cmd::FIND_IN_SAVED_TRACKS,
utils::error_widget,
)
},
utils::error_widget,
)
.lens(
Ctx::make(
AppState::common_ctx,
AppState::library.then(Library::saved_tracks.in_arc()),
.lens(
Ctx::make(
AppState::common_ctx,
AppState::library.then(Library::saved_tracks.in_arc()),
)
.then(Ctx::in_promise()),
)
.on_command_async(
LOAD_TRACKS,
|_| WebApi::global().get_saved_tracks().map(SavedTracks::new),
|_, data, _| {
data.with_library_mut(|library| {
library.saved_tracks.defer_default();
});
},
|_, data, r| {
data.with_library_mut(|library| {
library.saved_tracks.update(r);
});
},
)
.on_command_async(
SAVE_TRACK,
|t| WebApi::global().save_track(&t.id.0.to_base62()),
|_, data, t| {
data.with_library_mut(|library| {
library.add_track(t);
});
},
|_, data, (_, r)| {
if let Err(err) = r {
data.error_alert(err);
} else {
data.info_alert("Track added to library.")
}
},
)
.on_command_async(
UNSAVE_TRACK,
|i| WebApi::global().unsave_track(&i.0.to_base62()),
|_, data, i| {
data.with_library_mut(|library| {
library.remove_track(&i);
});
},
|_, data, (_, r)| {
if let Err(err) = r {
data.error_alert(err);
} else {
data.info_alert("Track removed from library.")
}
},
),
1.0
)
.then(Ctx::in_promise()),
)
.on_command_async(
LOAD_TRACKS,
|_| WebApi::global().get_saved_tracks().map(SavedTracks::new),
|_, data, _| {
data.with_library_mut(|library| {
library.saved_tracks.defer_default();
});
},
|_, data, r| {
data.with_library_mut(|library| {
library.saved_tracks.update(r);
});
},
)
.on_command_async(
SAVE_TRACK,
|t| WebApi::global().save_track(&t.id.0.to_base62()),
|_, data, t| {
data.with_library_mut(|library| {
library.add_track(t);
});
},
|_, data, (_, r)| {
if let Err(err) = r {
data.error_alert(err);
} else {
data.info_alert("Track added to library.")
}
},
)
.on_command_async(
UNSAVE_TRACK,
|i| WebApi::global().unsave_track(&i.0.to_base62()),
|_, data, i| {
data.with_library_mut(|library| {
library.remove_track(&i);
});
},
|_, data, (_, r)| {
if let Err(err) = r {
data.error_alert(err);
} else {
data.info_alert("Track removed from library.")
}
},
)
}

pub fn saved_albums_widget() -> impl Widget<AppState> {
Expand Down