kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2025-09-13 07:55:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PLayback Status property added for loading indicators

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2022-07-04 09:36:22 +06:00
parent ddc3555015
commit a985c19ad8
7 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/components/Album/AlbumCard.dart
View File

@ -25,8 +25,9 @@ class AlbumCard extends HookConsumerWidget {
return PlaybuttonCard(
imageUrl: imageToUrlString(album.images),
margin: EdgeInsets.symmetric(horizontal: marginH.toDouble()),
isPlaying:
playback.playlist?.id != null && playback.playlist?.id == album.id,
isPlaying: playback.playlist?.id == album.id,
isLoading: playback.status == PlaybackStatus.loading &&
playback.playlist?.id == album.id,
title: album.name!,
description:
"Album • ${artistsToString<ArtistSimple>(album.artists ?? [])}",

12
lib/components/Player/PlayerControls.dart
View File

@ -123,11 +123,13 @@ class PlayerControls extends HookConsumerWidget {
onPrevious();
}),
IconButton(
icon: Icon(
playback.isPlaying
? Icons.pause_rounded
: Icons.play_arrow_rounded,
),
icon: playback.status == PlaybackStatus.loading
? const CircularProgressIndicator()
: Icon(
playback.isPlaying
? Icons.pause_rounded
: Icons.play_arrow_rounded,
),
color: iconColor,
onPressed: _playOrPause,
),

1
lib/components/Playlist/PlaylistCard.dart
View File

@ -25,6 +25,7 @@ class PlaylistCard extends HookConsumerWidget {
title: playlist.name!,
imageUrl: imageToUrlString(playlist.images),
isPlaying: isPlaylistPlaying,
isLoading: playback.status == PlaybackStatus.loading && isPlaylistPlaying,
onTap: () {
GoRouter.of(context).push(
"/playlist/${playlist.id}",

18
lib/components/Shared/PlaybuttonCard.dart
View File

@ -9,10 +9,12 @@ class PlaybuttonCard extends StatelessWidget {
final EdgeInsetsGeometry? margin;
final String imageUrl;
final bool isPlaying;
final bool isLoading;
final String title;
const PlaybuttonCard({
required this.imageUrl,
required this.isPlaying,
required this.isLoading,
required this.title,
this.margin,
this.description,
@ -62,11 +64,17 @@ class PlaybuttonCard extends StatelessWidget {
child: Builder(builder: (context) {
return ElevatedButton(
onPressed: onPlaybuttonPressed,
child: Icon(
isPlaying
? Icons.pause_rounded
: Icons.play_arrow_rounded,
),
child: isLoading
? const SizedBox(
height: 23,
width: 23,
child: CircularProgressIndicator(),
)
: Icon(
isPlaying
? Icons.pause_rounded
: Icons.play_arrow_rounded,
),
style: ButtonStyle(
shape: MaterialStateProperty.all(
const CircleBorder(),

5
lib/hooks/playback.dart
View File

@ -1,3 +1,4 @@
import 'package:spotify/spotify.dart';
import 'package:spotube/models/Logger.dart';
import 'package:spotube/provider/Playback.dart';
@ -35,7 +36,9 @@ Future<void> Function([dynamic]) useTogglePlayPause(Playback playback) {
} else if (playback.track != null &&
playback.currentDuration == Duration.zero &&
await playback.player.getCurrentPosition() == Duration.zero) {
await playback.play(playback.track!);
final track = Track.fromJson(playback.track!.toJson());
playback.track = null;
await playback.play(track);
} else {
await playback.togglePlayPause();
}

3
lib/models/SpotubeTrack.dart
View File

@ -63,12 +63,9 @@ class SpotubeTrack extends Track {
"duration": duration.toString(),
"durationMs": durationMs,
"explicit": explicit,
// "externalIds": externalIds,
// "externalUrls": externalUrls,
"href": href,
"id": id,
"isPlayable": isPlayable,
// "linkedFrom": linkedFrom,
"name": name,
"popularity": popularity,
"previewUrl": previewUrl,

19
lib/provider/Playback.dart
View File

@ -27,6 +27,12 @@ import 'package:youtube_explode_dart/youtube_explode_dart.dart' hide Playlist;
import 'package:collection/collection.dart';
import 'package:spotube/extensions/list-sort-multiple.dart';
enum PlaybackStatus {
playing,
loading,
idle,
}
class Playback extends PersistedChangeNotifier {
// player properties
bool isShuffled;
@ -53,6 +59,8 @@ class Playback extends PersistedChangeNotifier {
final List<StreamSubscription> _subscriptions;
final _logger = getLogger(Playback);
PlaybackStatus status;
Playback({
required this.player,
required this.youtube,
@ -63,6 +71,7 @@ class Playback extends PersistedChangeNotifier {
isPlaying = false,
currentDuration = Duration.zero,
_subscriptions = [],
status = PlaybackStatus.idle,
super() {
if (Platform.isLinux) {
_linuxAudioService = LinuxAudioService(this);
@ -82,6 +91,7 @@ class Playback extends PersistedChangeNotifier {
seekForward();
} else {
isPlaying = false;
status = PlaybackStatus.idle;
currentDuration = Duration.zero;
notifyListeners();
}
@ -115,6 +125,8 @@ class Playback extends PersistedChangeNotifier {
if (index < 0 || index > playlist.tracks.length - 1) return;
this.playlist = playlist;
final played = this.playlist!.tracks[index];
status = PlaybackStatus.loading;
notifyListeners();
await play(played).then((_) {
int i = this
.playlist!
@ -131,6 +143,10 @@ class Playback extends PersistedChangeNotifier {
try {
// the track is already playing so no need to change that
if (track.id == this.track?.id) return;
if (status != PlaybackStatus.loading) {
status = PlaybackStatus.loading;
notifyListeners();
}
final tag = MediaItem(
id: track.id!,
title: track.name!,
@ -149,6 +165,8 @@ class Playback extends PersistedChangeNotifier {
notifyListeners();
updatePersistence();
await player.play(UrlSource(track.ytUri));
status = PlaybackStatus.playing;
notifyListeners();
} catch (e, stack) {
_logger.e("play", e, stack);
}
@ -198,6 +216,7 @@ class Playback extends PersistedChangeNotifier {
isShuffled = false;
playlist = null;
track = null;
status = PlaybackStatus.idle;
currentDuration = Duration.zero;
notifyListeners();
updatePersistence(clearNullEntries: true);