User library

This commit is contained in:
2024-08-29 16:42:48 +08:00
parent 7285eb4959
commit a063d19952
17 changed files with 405 additions and 211 deletions

View File

@ -28,15 +28,16 @@ class _SyncedLyricsState extends State<SyncedLyrics> {
final AutoScrollController _autoScrollController = AutoScrollController();
late final int _textZoomLevel = widget.defaultTextZoom;
late Duration _durationCurrent = audioPlayer.position;
SubtitleSimple? _lyric;
String? _activeTrackId;
bool get _isLyricSynced =>
_lyric == null ? false : _lyric!.lyrics.any((x) => x.time.inSeconds > 0);
Future<void> _pullLyrics() async {
if (_playback.state.value.activeTrack == null) return;
_activeTrackId = _playback.state.value.activeTrack!.id;
final out = await _syncedLyrics.fetch(_playback.state.value.activeTrack!);
setState(() => _lyric = out);
}
@ -49,11 +50,15 @@ class _SyncedLyricsState extends State<SyncedLyrics> {
@override
void initState() {
super.initState();
_subscriptions = [
audioPlayer.positionStream
.listen((dur) => setState(() => _durationCurrent = dur)),
];
_pullLyrics();
_subscriptions = [
_playback.state.listen((value) {
if (value.activeTrack == null) return;
if (value.activeTrack!.id != _activeTrackId) {
_pullLyrics();
}
}),
];
}
@override
@ -77,18 +82,19 @@ class _SyncedLyricsState extends State<SyncedLyrics> {
if (_lyric != null && _lyric!.lyrics.isNotEmpty)
SliverList.builder(
itemCount: _lyric!.lyrics.length,
itemBuilder: (context, idx) {
itemBuilder: (context, idx) => Obx(() {
final lyricSlice = _lyric!.lyrics[idx];
final lyricNextSlice = idx + 1 < _lyric!.lyrics.length
? _lyric!.lyrics[idx + 1]
: null;
final isActive =
_durationCurrent.inSeconds >= lyricSlice.time.inSeconds &&
(lyricNextSlice == null ||
lyricNextSlice.time.inSeconds >
_durationCurrent.inSeconds);
final isActive = _playback.durationCurrent.value.inSeconds >=
lyricSlice.time.inSeconds &&
(lyricNextSlice == null ||
lyricNextSlice.time.inSeconds >
_playback.durationCurrent.value.inSeconds);
if (_durationCurrent.inSeconds == lyricSlice.time.inSeconds &&
if (_playback.durationCurrent.value.inSeconds ==
lyricSlice.time.inSeconds &&
_isLyricSynced) {
_autoScrollController.scrollToIndex(
idx,
@ -150,7 +156,7 @@ class _SyncedLyricsState extends State<SyncedLyrics> {
),
),
);
},
}),
),
],
);

View File

@ -0,0 +1,32 @@
import 'package:flutter/material.dart';
import 'package:gap/gap.dart';
import 'package:rhythm_box/widgets/sized_container.dart';
class NoLoginFallback extends StatelessWidget {
const NoLoginFallback({super.key});
@override
Widget build(BuildContext context) {
return CenteredContainer(
maxWidth: 280,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(
Icons.login,
size: 48,
),
const Gap(12),
Text(
'Connect with your Spotify',
style: Theme.of(context).textTheme.titleLarge,
),
const Text(
'You need to connect RhythmBox with your spotify account in settings page, so that we can access your library.',
textAlign: TextAlign.center,
),
],
),
);
}
}

View File

@ -0,0 +1,43 @@
import 'package:flutter/material.dart';
import 'package:rhythm_box/widgets/auto_cache_image.dart';
import 'package:spotify/spotify.dart';
class PlaylistTile extends StatelessWidget {
final PlaylistSimple? item;
final Function? onTap;
const PlaylistTile({super.key, required this.item, this.onTap});
@override
Widget build(BuildContext context) {
return ListTile(
leading: ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(8)),
child: (item?.images?.isNotEmpty ?? false)
? AutoCacheImage(
item!.images!.first.url!,
width: 64.0,
height: 64.0,
)
: const SizedBox(
width: 64,
height: 64,
child: Center(
child: Icon(Icons.image),
),
),
),
title: Text(item?.name ?? 'Loading...'),
subtitle: Text(
item?.description ?? 'Please stand by...',
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
onTap: () {
if (onTap == null) return;
onTap!();
},
);
}
}

View File

@ -0,0 +1,64 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:go_router/go_router.dart';
import 'package:rhythm_box/providers/spotify.dart';
import 'package:rhythm_box/widgets/playlist/playlist_tile.dart';
import 'package:skeletonizer/skeletonizer.dart';
import 'package:spotify/spotify.dart';
class UserPlaylistList extends StatefulWidget {
const UserPlaylistList({super.key});
@override
State<UserPlaylistList> createState() => _UserPlaylistListState();
}
class _UserPlaylistListState extends State<UserPlaylistList> {
late final SpotifyProvider _spotify = Get.find();
PlaylistSimple get _userLikedPlaylist => PlaylistSimple()
..name = 'Liked Music'
..description = 'Your favorite music'
..type = 'playlist'
..collaborative = false
..public = false
..id = 'user-liked-tracks';
bool _isLoading = true;
List<PlaylistSimple>? _playlist;
Future<void> _pullPlaylist() async {
_playlist = [_userLikedPlaylist, ...await _spotify.api.playlists.me.all()];
setState(() => _isLoading = false);
}
@override
void initState() {
super.initState();
_pullPlaylist();
}
@override
Widget build(BuildContext context) {
return Skeletonizer(
enabled: _isLoading,
child: ListView.builder(
itemCount: _playlist?.length ?? 3,
itemBuilder: (context, idx) {
final item = _playlist?[idx];
return PlaylistTile(
item: item,
onTap: () {
if (item == null) return;
GoRouter.of(context).pushNamed(
'playlistView',
pathParameters: {'id': item.id!},
);
},
);
},
),
);
}
}

View File

@ -1,82 +1,42 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:rhythm_box/providers/audio_player.dart';
import 'package:rhythm_box/providers/spotify.dart';
import 'package:rhythm_box/widgets/auto_cache_image.dart';
import 'package:rhythm_box/widgets/tracks/track_tile.dart';
import 'package:skeletonizer/skeletonizer.dart';
import 'package:spotify/spotify.dart';
import 'package:rhythm_box/services/artist.dart';
class PlaylistTrackList extends StatefulWidget {
class PlaylistTrackList extends StatelessWidget {
final String playlistId;
final List<Track>? tracks;
const PlaylistTrackList({super.key, required this.playlistId});
final bool isLoading;
@override
State<PlaylistTrackList> createState() => _PlaylistTrackListState();
}
class _PlaylistTrackListState extends State<PlaylistTrackList> {
late final SpotifyProvider _spotify = Get.find();
bool _isLoading = true;
List<Track>? _tracks;
Future<void> _pullTracks() async {
_tracks = (await _spotify.api.playlists
.getTracksByPlaylistId(widget.playlistId)
.all())
.toList();
setState(() => _isLoading = false);
}
@override
void initState() {
_pullTracks();
super.initState();
}
const PlaylistTrackList({
super.key,
this.isLoading = false,
required this.playlistId,
required this.tracks,
});
@override
Widget build(BuildContext context) {
return Skeletonizer.sliver(
enabled: _isLoading,
enabled: isLoading,
child: SliverList.builder(
itemCount: _tracks?.length ?? 3,
itemCount: tracks?.length ?? 3,
itemBuilder: (context, idx) {
final item = _tracks?[idx];
return ListTile(
leading: ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(8)),
child: item != null
? AutoCacheImage(
item.album!.images!.first.url!,
width: 64.0,
height: 64.0,
)
: const SizedBox(
width: 64,
height: 64,
child: Center(
child: Icon(Icons.image),
),
),
),
title: Text(item?.name ?? 'Loading...'),
subtitle: Text(
item?.artists?.asString() ?? 'Please stand by...',
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
final item = tracks?[idx];
return TrackTile(
item: item,
onTap: () {
if (item == null) return;
Get.find<AudioPlayerProvider>()
..load(
_tracks!,
tracks!,
initialIndex: idx,
autoPlay: true,
)
..addCollection(widget.playlistId);
..addCollection(playlistId);
},
);
},

View File

@ -1,9 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:rhythm_box/providers/audio_player.dart';
import 'package:rhythm_box/widgets/auto_cache_image.dart';
import 'package:rhythm_box/widgets/tracks/track_tile.dart';
import 'package:spotify/spotify.dart';
import 'package:rhythm_box/services/artist.dart';
class TrackSliverList extends StatelessWidget {
final List<Track> tracks;
@ -19,21 +18,8 @@ class TrackSliverList extends StatelessWidget {
itemCount: tracks.length,
itemBuilder: (context, idx) {
final item = tracks[idx];
return ListTile(
leading: ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(8)),
child: AutoCacheImage(
item.album!.images!.first.url!,
width: 64.0,
height: 64.0,
),
),
title: Text(item.name ?? 'Loading...'),
subtitle: Text(
item.artists?.asString() ?? 'Please stand by...',
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
return TrackTile(
item: item,
onTap: () {
Get.find<AudioPlayerProvider>().load(
[item],

View File

@ -0,0 +1,44 @@
import 'package:flutter/material.dart';
import 'package:rhythm_box/widgets/auto_cache_image.dart';
import 'package:spotify/spotify.dart';
import 'package:rhythm_box/services/artist.dart';
class TrackTile extends StatelessWidget {
final Track? item;
final Function? onTap;
const TrackTile({super.key, required this.item, this.onTap});
@override
Widget build(BuildContext context) {
return ListTile(
leading: ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(8)),
child: (item?.album?.images?.isNotEmpty ?? false)
? AutoCacheImage(
item!.album!.images!.first.url!,
width: 64.0,
height: 64.0,
)
: const SizedBox(
width: 64,
height: 64,
child: Center(
child: Icon(Icons.image),
),
),
),
title: Text(item?.name ?? 'Loading...'),
subtitle: Text(
item?.artists?.asString() ?? 'Please stand by...',
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
onTap: () {
if (onTap == null) return;
onTap!();
},
);
}
}