feat(slint/discover): prefs-driven render loop for Home and For You

Replace the fixed Discover layouts with the prefs-driven descriptor repeaters
that read DiscoverState's ordered ENABLED section lists, so the configurator's
visibility + reorder choices drive what renders.

- HomeView.slint: drop `for section in HomeState.sections` + the 5 hardcoded
  typed blocks; render one repeater over the active tab's descriptor list
  (editor-sections when active-tab == "editorPicks", else home-sections). The
  single-root delegate dispatches on desc.id: generic album carousels bind the
  embedded desc.section; qobuzPlaylists / continueListening / recentlyPlayedAlbums
  / mostStreamed(slim) bind HomeState fields and keep their length gates +
  placeholders. `if forYou: ForYouView` stays a static sibling.
- ForYouView.slint: replace the fixed if-sequence with a descriptor repeater
  over foryou-sections; each arm reads the typed ForYouState field by id and
  keeps its own length gate (qobuzMixes excepted — always rendered). The
  skeleton stays a static sibling. essentialsByGenre has no arm (Slice-2c-blocked;
  Rust drops it from the list).
- home.rs: select_tab writes DiscoverState.active-tab (single source of truth,
  alongside the kept HomeState.active-tab pill bindings) and re-renders the
  active tab from the cache via the descriptor lists; apply_home pushes the
  descriptor lists once the cache is populated.
- main.rs: the initial discover load fires album-section artwork via the
  descriptor-targeted jobs returned by select_tab (DiscoverSectionAlbum), spawned
  on the UI thread; slim-grid / recent-album / playlist covers still target the
  HomeState fields the fixed arms render.

Build-time verifications to confirm (documented in the .slint comments): the
for-over-ternary-model form compiles, and an empty delegate does not double the
outer 40px spacing (Rust already drops data-empty album ids — policy b).

cc
This commit is contained in:
vicrodh committed 2026-06-15 13:40:46 -06:00
1 parent 0bb0f73699
commit a06f06e9d8
4 files changed
+289 -264

No files matched your search

+152 -139
View File
@@ -1,16 +1,23 @@
// Discover > For You — dedicated, ordered layout for the For You tab.
// Unlike Home / Editor's Picks (uniform album carousels from
// HomeState.sections), For You mixes album carousels, a track
// carousel, and artist carousels, so it renders from ForYouState.
// Sections hide themselves when empty.
// Discover > For You — ordered, heterogeneous layout for the For You tab.
// Unlike Home / Editor's Picks (uniform album carousels), For You mixes album
// carousels, a track carousel, artist carousels, radio tiles, Qobuz Mixes, and
// the Spotlight, so each row is a different component.
//
// Slice 5: the order + visibility are driven by the prefs configurator. Rust
// pushes DiscoverState.foryou-sections (the ordered ENABLED descriptor ids); a
// single repeater iterates them and an if-chain delegate mounts the right
// component, reading the matching ForYouState field by id. Each arm keeps its
// own data `length > 0` self-hide gate (qobuzMixes excepted — always rendered).
//
// essentialsByGenre is Slice-2c-blocked (no ForYouState.essentials field yet);
// Rust drops it from the descriptor list, so there is intentionally no arm for
// it here. It returns automatically once Slice 2c adds the field + an arm.
//
// Reuses the shared cards/carousels — no new card components here.
// Qobuz Mixes, Radio Stations, Spotlight, and the reco-DB sections
// (More from library, Rediscover) are later increments.
import { Theme } from "../foundation/semantic-colors.slint";
import { Typography } from "../foundation/typography.slint";
import { ForYouState, RadioStationItem } from "../state.slint";
import { ForYouState, RadioStationItem, DiscoverState } from "../state.slint";
import { Carousel } from "Carousel.slint";
import { SlimCarousel } from "SlimCarousel.slint";
import { ArtistCarousel } from "ArtistCarousel.slint";
@@ -30,11 +37,8 @@ export component ForYouView inherits VerticalLayout {
callback open-mix(string);
// Progressive load: while the first lazy load is in flight, show the
// skeleton Home uses (the Qobuz Mixes tiles stay — they're static). It
// hides as soon as ANY content paints — the recently-played sections
// render first (local, instant), the rest fill in via each section's own
// `if length > 0` gate. The page-level `loading` latch only keeps the
// skeleton up while every backing section is still empty.
// skeleton Home uses (the Qobuz Mixes tiles stay — they're static). It hides
// as soon as ANY content paints. Static, order-independent (top while empty).
property <bool> show-skeleton:
ForYouState.loading
&& ForYouState.release-watch.albums.length == 0
@@ -45,156 +49,165 @@ export component ForYouView inherits VerticalLayout {
spacing: 40px;
alignment: start;
// 0. Qobuz Mixes (static navigation tiles).
QobuzMixesRow {
open-mix(which) => {
root.open-mix(which);
}
}
if root.show-skeleton: HomeSkeleton { }
// 1. Release Watch.
if ForYouState.release-watch.albums.length > 0: Carousel {
section: ForYouState.release-watch;
album-clicked(id) => {
root.open-album(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
// Prefs-driven loop. DiscoverState.foryou-sections = enabled ids in pref
// order (recomputed in Rust). Delegate = single-root VerticalLayout whose
// inner if-chain mounts the right component + binds the matching global;
// exactly one inner `if` matches per descriptor id, so each row resolves to
// one visible child (or none, when its data is empty and it self-hides).
for desc in DiscoverState.foryou-sections: VerticalLayout {
spacing: 0px;
// 1b. Radio Stations — album-seeded radio tiles.
if ForYouState.radio-stations.length > 0: VerticalLayout {
spacing: 12px;
Text {
text: @tr("Radio Stations");
color: Theme.text-primary;
font-size: 18px;
font-weight: Typography.semibold;
// qobuzMixes — static navigation tiles, ALWAYS rendered (no data gate).
if desc.id == "qobuzMixes": QobuzMixesRow {
open-mix(which) => {
root.open-mix(which);
}
}
Rectangle {
height: 234px;
clip: true;
radio-flick := Flickable {
width: 100%;
height: parent.height;
viewport-width: ForYouState.radio-stations.length * (200px + 32px);
viewport-height: self.height;
HorizontalLayout {
spacing: 32px;
alignment: start;
for st in ForYouState.radio-stations: RadioCard {
seed-title: st.title;
seed-subtitle: st.artist;
label: "RADIO";
artwork: st.artwork;
clicked => {
root.start-radio-album(st.album-id);
}
play => {
root.start-radio-album(st.album-id);
// releaseWatch — album carousel.
if desc.id == "releaseWatch" && ForYouState.release-watch.albums.length > 0: Carousel {
section: ForYouState.release-watch;
album-clicked(id) => {
root.open-album(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
// radioStations — album-seeded radio tiles (bespoke Flickable body).
if desc.id == "radioStations" && ForYouState.radio-stations.length > 0: VerticalLayout {
spacing: 12px;
Text {
text: @tr("Radio Stations");
color: Theme.text-primary;
font-size: 18px;
font-weight: Typography.semibold;
}
Rectangle {
height: 234px;
clip: true;
radio-flick := Flickable {
width: 100%;
height: parent.height;
viewport-width: ForYouState.radio-stations.length * (200px + 32px);
viewport-height: self.height;
HorizontalLayout {
spacing: 32px;
alignment: start;
for st in ForYouState.radio-stations: RadioCard {
seed-title: st.title;
seed-subtitle: st.artist;
label: "RADIO";
artwork: st.artwork;
clicked => {
root.start-radio-album(st.album-id);
}
play => {
root.start-radio-album(st.album-id);
}
}
}
}
}
}
}
// 2. Recently Played Tracks.
if ForYouState.recent-tracks.length > 0: SlimCarousel {
title: @tr("Recently Played Tracks");
items: ForYouState.recent-tracks;
item-clicked(id) => {
root.play-track(id);
// continueListening — recently-played tracks slim carousel.
if desc.id == "continueListening" && ForYouState.recent-tracks.length > 0: SlimCarousel {
title: @tr("Recently Played Tracks");
items: ForYouState.recent-tracks;
item-clicked(id) => {
root.play-track(id);
}
}
}
// 3. Recently Played Albums.
if ForYouState.recent-albums.albums.length > 0: Carousel {
section: ForYouState.recent-albums;
album-clicked(id) => {
root.open-album(id);
// recentlyPlayedAlbums — album carousel.
if desc.id == "recentlyPlayedAlbums" && ForYouState.recent-albums.albums.length > 0: Carousel {
section: ForYouState.recent-albums;
album-clicked(id) => {
root.open-album(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
// 4. Your Top Artists.
if ForYouState.top-artists.length > 0: ArtistCarousel {
title: @tr("Your Top Artists");
artists: ForYouState.top-artists;
artist-clicked(id) => {
root.open-artist(id);
// topArtists — artist carousel.
if desc.id == "topArtists" && ForYouState.top-artists.length > 0: ArtistCarousel {
title: @tr("Your Top Artists");
artists: ForYouState.top-artists;
artist-clicked(id) => {
root.open-artist(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
// 6. Favorite Albums.
if ForYouState.favorite-albums.albums.length > 0: Carousel {
section: ForYouState.favorite-albums;
album-clicked(id) => {
root.open-album(id);
// favoriteAlbums — album carousel.
if desc.id == "favoriteAlbums" && ForYouState.favorite-albums.albums.length > 0: Carousel {
section: ForYouState.favorite-albums;
album-clicked(id) => {
root.open-album(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
// 5. More From Your Library.
if ForYouState.more-from-library.albums.length > 0: Carousel {
section: ForYouState.more-from-library;
album-clicked(id) => {
root.open-album(id);
// similarAlbums — "More From Your Library" album carousel.
if desc.id == "similarAlbums" && ForYouState.more-from-library.albums.length > 0: Carousel {
section: ForYouState.more-from-library;
album-clicked(id) => {
root.open-album(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
// 6. Rediscover Your Library.
if ForYouState.rediscover.albums.length > 0: Carousel {
section: ForYouState.rediscover;
album-clicked(id) => {
root.open-album(id);
// rediscoverLibrary — album carousel.
if desc.id == "rediscoverLibrary" && ForYouState.rediscover.albums.length > 0: Carousel {
section: ForYouState.rediscover;
album-clicked(id) => {
root.open-album(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
// 6. Artists to Follow.
if ForYouState.artists-to-follow.length > 0: ArtistCarousel {
title: @tr("Artists to Follow");
artists: ForYouState.artists-to-follow;
artist-clicked(id) => {
root.open-artist(id);
// artistsToFollow — artist carousel.
if desc.id == "artistsToFollow" && ForYouState.artists-to-follow.length > 0: ArtistCarousel {
title: @tr("Artists to Follow");
artists: ForYouState.artists-to-follow;
artist-clicked(id) => {
root.open-artist(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
// 6. Spotlight.
if ForYouState.spotlight-visible: Spotlight {
open-artist(id) => {
root.open-artist(id);
}
open-album(id) => {
root.open-album(id);
}
play-top-tracks(id) => {
root.play-top-tracks(id);
}
start-radio(id) => {
root.start-radio(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
// artistSpotlight — the Spotlight panel.
if desc.id == "artistSpotlight" && ForYouState.spotlight-visible: Spotlight {
open-artist(id) => {
root.open-artist(id);
}
open-album(id) => {
root.open-album(id);
}
play-top-tracks(id) => {
root.play-top-tracks(id);
}
start-radio(id) => {
root.start-radio(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
}
}
+97 -77
View File
@@ -8,7 +8,7 @@
import { Theme } from "../foundation/semantic-colors.slint";
import { Typography } from "../foundation/typography.slint";
import { HomeState, HomeActions, GenreFilterState, GenreFilterActions, NavState, ContentView } from "../state.slint";
import { HomeState, HomeActions, DiscoverState, DiscoverActions, GenreFilterState, GenreFilterActions, NavState, ContentView } from "../state.slint";
import { Carousel } from "Carousel.slint";
import { SlimCarousel } from "SlimCarousel.slint";
import { PlaylistCarousel } from "PlaylistCarousel.slint";
@@ -273,40 +273,110 @@ export component HomeView inherits Rectangle {
spacing: 40px;
alignment: start;
if HomeState.active-tab != "forYou"
// Loading skeleton: shown while a discover load is in flight and
// the active tab's descriptor list is still empty (For You has
// its own skeleton inside ForYouView).
if DiscoverState.active-tab != "forYou"
&& HomeState.loading
&& HomeState.sections.length == 0: HomeSkeleton { }
&& DiscoverState.home-sections.length == 0
&& DiscoverState.editor-sections.length == 0: HomeSkeleton { }
for section in HomeState.sections: Carousel {
section: section;
show-view-all: section.endpoint != "";
album-clicked(id) => {
root.album-clicked(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
view-all-clicked => {
root.discover-view-all(section.endpoint, section.title);
}
}
// Prefs-driven render loop (Slice 5). Rust pushes the ordered
// ENABLED descriptor list for the active tab (home-sections /
// editor-sections); the For You tab's lists are pushed empty so
// this repeater renders nothing for it (the unconditional-
// repeater form — content is controlled purely via the model,
// avoiding an `if cond: for ...`). The delegate is a single-root
// VerticalLayout whose inner if-chain mounts the right component
// and binds the matching data; exactly one arm matches per id.
for desc in (DiscoverState.active-tab == "editorPicks"
? DiscoverState.editor-sections
: DiscoverState.home-sections): VerticalLayout {
spacing: 0px;
// Qobuz Playlists row — shown on Home + Editor's Picks
// (never For You). body=open, overlay=play (1:1 Tauri).
if HomeState.active-tab != "forYou"
&& HomeState.playlists.length > 0: PlaylistCarousel {
title: @tr("Qobuz Playlists");
playlists: HomeState.playlists;
body-opens: true;
show-view-all: false;
media-action(kind, id, action) => {
root.media-action(kind, id, action);
// Generic album carousels (data embedded in desc.section by
// Rust): newReleases / pressAwards / idealDiscography /
// editorPicks / qobuzissimes, plus mostStreamed when it
// renders as an album carousel (Editor's Picks).
if desc.id == "newReleases"
|| desc.id == "pressAwards"
|| desc.id == "idealDiscography"
|| desc.id == "editorPicks"
|| desc.id == "qobuzissimes"
|| (desc.id == "mostStreamed" && desc.kind == "albumCarousel"): Carousel {
section: desc.section;
show-view-all: desc.section.endpoint != "";
album-clicked(id) => {
root.album-clicked(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
view-all-clicked => {
root.discover-view-all(desc.section.endpoint, desc.section.title);
}
}
// Qobuz Playlists row — body=open, overlay=play (1:1 Tauri).
if desc.id == "qobuzPlaylists" && HomeState.playlists.length > 0: PlaylistCarousel {
title: @tr("Qobuz Playlists");
playlists: HomeState.playlists;
body-opens: true;
show-view-all: false;
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
// Recently Played Albums — carousel when it has data, else a
// placeholder (always present on Home, 1:1 Tauri).
if desc.id == "recentlyPlayedAlbums" && HomeState.recent-albums.length > 0: Carousel {
section: {
title: @tr("Recently Played Albums"),
albums: HomeState.recent-albums,
};
album-clicked(id) => {
root.album-clicked(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
if desc.id == "recentlyPlayedAlbums" && HomeState.recent-albums.length == 0: RecentPlaceholder {
title: @tr("Recently Played Albums");
hint: @tr("Albums you play will appear here.");
}
// Recently Played Tracks — slim carousel when it has data,
// else a placeholder (continueListening id).
if desc.id == "continueListening" && HomeState.recent.length > 0: SlimCarousel {
title: @tr("Recently Played Tracks");
items: HomeState.recent;
item-clicked(id) => {
root.media-action("track", id, "play");
}
}
if desc.id == "continueListening" && HomeState.recent.length == 0: RecentPlaceholder {
title: @tr("Recently Played Tracks");
hint: @tr("Tracks you play will appear here.");
}
// Most Streamed on Home renders as the Popular slim grid
// (kind == "slimGrid"); on Editor's Picks it is the album
// carousel handled by the generic arm above.
if desc.id == "mostStreamed" && desc.kind == "slimGrid"
&& HomeState.popular.length > 0: SlimCarousel {
title: @tr("Popular albums");
items: HomeState.popular;
item-clicked(id) => {
root.album-clicked(id);
}
}
}
// For You renders its own ordered, heterogeneous
// sections from ForYouState.
if HomeState.active-tab == "forYou": ForYouView {
if DiscoverState.active-tab == "forYou": ForYouView {
open-album(id) => {
root.album-clicked(id);
}
@@ -332,56 +402,6 @@ export component HomeView inherits Rectangle {
root.media-action("mix", which, "open");
}
}
// The Recently Played + Popular sections below belong
// to the Home tab only; Editor's Picks / For You show
// just their own cached section set above.
// Recently Played Albums — always present; shows a
// placeholder until the play history has data.
if HomeState.active-tab == "home"
&& HomeState.recent-albums.length > 0: Carousel {
section: {
title: @tr("Recently Played Albums"),
albums: HomeState.recent-albums,
};
album-clicked(id) => {
root.album-clicked(id);
}
media-action(kind, id, action) => {
root.media-action(kind, id, action);
}
}
if HomeState.active-tab == "home"
&& HomeState.recent-albums.length == 0: RecentPlaceholder {
title: @tr("Recently Played Albums");
hint: @tr("Albums you play will appear here.");
}
// Recently Played Tracks — paginated 4x3 carousel
// (12 per page, up to two pages).
if HomeState.active-tab == "home"
&& HomeState.recent.length > 0: SlimCarousel {
title: @tr("Recently Played Tracks");
items: HomeState.recent;
item-clicked(id) => {
root.media-action("track", id, "play");
}
}
if HomeState.active-tab == "home"
&& HomeState.recent.length == 0: RecentPlaceholder {
title: @tr("Recently Played Tracks");
hint: @tr("Tracks you play will appear here.");
}
if HomeState.active-tab == "home"
&& HomeState.popular.length > 0: SlimCarousel {
title: @tr("Popular albums");
items: HomeState.popular;
item-clicked(id) => {
root.album-clicked(id);
}
}
}
}
// Shared scrollbar in the right gutter (homologated cross-view).