-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
306 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_hooks/flutter_hooks.dart'; | ||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||
| import 'package:platform_ui/platform_ui.dart'; | ||
| import 'package:spotube/collections/spotube_icons.dart'; | ||
| import 'package:spotube/components/shared/page_window_title_bar.dart'; | ||
| import 'package:spotube/pages/home/genres.dart'; | ||
| import 'package:spotube/pages/home/personalized.dart'; | ||
|
|
||
| class HomePage extends HookConsumerWidget { | ||
| const HomePage({Key? key}) : super(key: key); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context, ref) { | ||
| final index = useState(0); | ||
| final tabbar = PlatformTabBar( | ||
| androidIsScrollable: true, | ||
| selectedIndex: index.value, | ||
| onSelectedIndexChanged: (value) => index.value = value, | ||
| isNavigational: | ||
| PlatformProperty.byPlatformGroup(mobile: false, desktop: true), | ||
| tabs: [ | ||
| PlatformTab( | ||
| label: 'Genres', | ||
| icon: PlatformProperty.only( | ||
| android: const SizedBox.shrink(), | ||
| other: const Icon(SpotubeIcons.genres), | ||
| ).resolve(platform!), | ||
| ), | ||
| PlatformTab( | ||
| label: 'Personalized', | ||
| icon: PlatformProperty.only( | ||
| android: const SizedBox.shrink(), | ||
| other: const Icon(SpotubeIcons.personalized), | ||
| ).resolve(platform!), | ||
| ), | ||
| ], | ||
| ); | ||
|
|
||
| return PlatformScaffold( | ||
| appBar: platform == TargetPlatform.windows | ||
| ? PreferredSize( | ||
| preferredSize: const Size.fromHeight(40), | ||
| child: tabbar, | ||
| ) | ||
| : PageWindowTitleBar( | ||
| titleWidth: 347, | ||
| centerTitle: true, | ||
| center: tabbar, | ||
| ), | ||
| body: AnimatedSwitcher( | ||
| duration: const Duration(milliseconds: 300), | ||
| transitionBuilder: (child, animation) => SlideTransition( | ||
| position: animation.drive( | ||
| Tween<Offset>( | ||
| begin: const Offset(1, 0), | ||
| end: const Offset(0, 0), | ||
| ), | ||
| ), | ||
| child: child, | ||
| ), | ||
| child: [ | ||
| const GenrePage(), | ||
| const PersonalizedPage(), | ||
| ][index.value], | ||
| ), | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| import 'package:fl_query_hooks/fl_query_hooks.dart'; | ||
| import 'package:flutter/gestures.dart'; | ||
| import 'package:flutter/material.dart' hide Page; | ||
| import 'package:flutter_hooks/flutter_hooks.dart'; | ||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||
| import 'package:platform_ui/platform_ui.dart'; | ||
| import 'package:spotify/spotify.dart'; | ||
| import 'package:spotube/components/album/album_card.dart'; | ||
| import 'package:spotube/components/playlist/playlist_card.dart'; | ||
| import 'package:spotube/components/shared/shimmers/shimmer_playbutton_card.dart'; | ||
| import 'package:spotube/components/shared/waypoint.dart'; | ||
| import 'package:spotube/models/logger.dart'; | ||
| import 'package:spotube/provider/spotify_provider.dart'; | ||
| import 'package:spotube/services/queries/queries.dart'; | ||
| import 'package:spotube/utils/type_conversion_utils.dart'; | ||
|
|
||
| class PersonalizedItemCard extends HookWidget { | ||
| final Iterable<Page<PlaylistSimple>>? playlists; | ||
| final Iterable<Page<AlbumSimple>>? albums; | ||
| final String title; | ||
| final bool hasNextPage; | ||
| final void Function() onFetchMore; | ||
|
|
||
| PersonalizedItemCard({ | ||
| this.playlists, | ||
| this.albums, | ||
| required this.title, | ||
| required this.hasNextPage, | ||
| required this.onFetchMore, | ||
| Key? key, | ||
| }) : assert(playlists == null || albums == null), | ||
| super(key: key); | ||
|
|
||
| final logger = getLogger(PersonalizedItemCard); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final scrollController = useScrollController(); | ||
|
|
||
| final playlistItems = playlists | ||
| ?.expand( | ||
| (page) => page.items ?? const Iterable<PlaylistSimple>.empty(), | ||
| ) | ||
| .toList(); | ||
|
|
||
| final albumItems = albums | ||
| ?.expand( | ||
| (page) => page.items ?? const Iterable<AlbumSimple>.empty(), | ||
| ) | ||
| .toList(); | ||
|
|
||
| return Column( | ||
| children: [ | ||
| Padding( | ||
| padding: const EdgeInsets.all(8.0), | ||
| child: Row( | ||
| children: [ | ||
| PlatformText.headline(title), | ||
| ], | ||
| ), | ||
| ), | ||
| SizedBox( | ||
| height: playlists != null ? 245 : 285, | ||
| child: ScrollConfiguration( | ||
| behavior: ScrollConfiguration.of(context).copyWith( | ||
| dragDevices: { | ||
| PointerDeviceKind.touch, | ||
| PointerDeviceKind.mouse, | ||
| }, | ||
| ), | ||
| child: Scrollbar( | ||
| controller: scrollController, | ||
| interactive: false, | ||
| child: Waypoint( | ||
| controller: scrollController, | ||
| onTouchEdge: hasNextPage ? onFetchMore : null, | ||
| child: ListView( | ||
| scrollDirection: Axis.horizontal, | ||
| shrinkWrap: true, | ||
| controller: scrollController, | ||
| physics: const AlwaysScrollableScrollPhysics(), | ||
| children: [ | ||
| ...?playlistItems | ||
| ?.map((playlist) => PlaylistCard(playlist)), | ||
| ...?albumItems?.map( | ||
| (album) => AlbumCard( | ||
| TypeConversionUtils.simpleAlbum_X_Album(album), | ||
| ), | ||
| ), | ||
| if (hasNextPage) const ShimmerPlaybuttonCard(count: 1), | ||
| ], | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ], | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| class PersonalizedPage extends HookConsumerWidget { | ||
| const PersonalizedPage({Key? key}) : super(key: key); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context, ref) { | ||
| final spotify = ref.watch(spotifyProvider); | ||
|
|
||
| final featuredPlaylistsQuery = useInfiniteQuery( | ||
| job: Queries.playlist.featured, | ||
| externalData: spotify, | ||
| ); | ||
|
|
||
| final newReleases = useInfiniteQuery( | ||
| job: Queries.album.newReleases, | ||
| externalData: spotify, | ||
| ); | ||
|
|
||
| useEffect(() { | ||
| if (featuredPlaylistsQuery.hasError && | ||
| featuredPlaylistsQuery.pages.first == null) { | ||
| featuredPlaylistsQuery.setExternalData(spotify); | ||
| featuredPlaylistsQuery.refetch(); | ||
| } | ||
| if (newReleases.hasError && newReleases.pages.first == null) { | ||
| newReleases.setExternalData(spotify); | ||
| newReleases.refetch(); | ||
| } | ||
| return null; | ||
| }, [spotify]); | ||
|
|
||
| return ListView( | ||
| children: [ | ||
| PersonalizedItemCard( | ||
| playlists: | ||
| featuredPlaylistsQuery.pages.whereType<Page<PlaylistSimple>>(), | ||
| title: 'Featured', | ||
| hasNextPage: featuredPlaylistsQuery.hasNextPage, | ||
| onFetchMore: featuredPlaylistsQuery.fetchNextPage, | ||
| ), | ||
| PersonalizedItemCard( | ||
| albums: newReleases.pages.whereType<Page<AlbumSimple>>(), | ||
| title: 'New Releases', | ||
| hasNextPage: newReleases.hasNextPage, | ||
| onFetchMore: newReleases.fetchNextPage, | ||
| ), | ||
| ], | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.