feat(lyrics): lyrics delay working implementation

This commit is contained in:
Kingkor Roy Tirtho 2023-03-05 00:01:03 +06:00
parent 1ce0972b88
commit 2ebcbc4cea
3 changed files with 94 additions and 36 deletions

View File

@ -6,19 +6,49 @@ import 'package:spotube/collections/spotube_icons.dart';
class ZoomControls extends HookWidget { class ZoomControls extends HookWidget {
final int value; final int value;
final ValueChanged<int> onChanged; final ValueChanged<int> onChanged;
final int min; final int? min;
final int max; final int? max;
final int interval;
final Icon increaseIcon;
final Icon decreaseIcon;
final Axis direction;
final String unit;
const ZoomControls({ const ZoomControls({
Key? key, Key? key,
required this.value, required this.value,
required this.onChanged, required this.onChanged,
this.min = 50, this.min,
this.max = 200, this.max,
this.interval = 10,
this.increaseIcon = const Icon(SpotubeIcons.zoomIn),
this.decreaseIcon = const Icon(SpotubeIcons.zoomOut),
this.direction = Axis.horizontal,
this.unit = "%",
}) : super(key: key); }) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final actions = [
PlatformIconButton(
icon: decreaseIcon,
onPressed: () {
if (value == min) return;
onChanged(value - interval);
},
),
PlatformText("$value$unit"),
PlatformIconButton(
icon: increaseIcon,
onPressed: () {
if (value == max) return;
onChanged(value + interval);
},
),
];
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: PlatformTheme.of(context) color: PlatformTheme.of(context)
@ -26,28 +56,20 @@ class ZoomControls extends HookWidget {
?.withOpacity(0.7), ?.withOpacity(0.7),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
constraints: const BoxConstraints(maxHeight: 50), constraints:
BoxConstraints(maxHeight: direction == Axis.horizontal ? 50 : 200),
margin: const EdgeInsets.all(8), margin: const EdgeInsets.all(8),
child: Row( child: direction == Axis.horizontal
? Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: actions,
PlatformIconButton( )
icon: const Icon(SpotubeIcons.zoomOut), : Column(
onPressed: () { mainAxisAlignment: MainAxisAlignment.end,
if (value == min) return; mainAxisSize: MainAxisSize.min,
onChanged(value - 10); verticalDirection: VerticalDirection.up,
}, children: actions,
),
PlatformText("$value%"),
PlatformIconButton(
icon: const Icon(SpotubeIcons.zoomIn),
onPressed: () {
if (value == max) return;
onChanged(value + 10);
},
),
],
), ),
); );
} }

View File

@ -5,6 +5,7 @@ import 'package:spotube/provider/playlist_queue_provider.dart';
int useSyncedLyrics( int useSyncedLyrics(
WidgetRef ref, WidgetRef ref,
Map<int, String> lyricsMap, Map<int, String> lyricsMap,
int delay,
) { ) {
final stream = PlaylistQueueNotifier.position; final stream = PlaylistQueueNotifier.position;
@ -12,11 +13,11 @@ int useSyncedLyrics(
useEffect(() { useEffect(() {
return stream.listen((pos) { return stream.listen((pos) {
if (lyricsMap.containsKey(pos.inSeconds)) { if (lyricsMap.containsKey(pos.inSeconds + delay)) {
currentTime.value = pos.inSeconds; currentTime.value = pos.inSeconds + delay;
} }
}).cancel; }).cancel;
}, [lyricsMap]); }, [lyricsMap, delay]);
return (Duration(seconds: currentTime.value)).inSeconds; return (Duration(seconds: currentTime.value)).inSeconds;
} }

View File

@ -3,6 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:palette_generator/palette_generator.dart'; import 'package:palette_generator/palette_generator.dart';
import 'package:spotify/spotify.dart'; import 'package:spotify/spotify.dart';
import 'package:spotube/collections/spotube_icons.dart';
import 'package:spotube/components/lyrics/zoom_controls.dart'; import 'package:spotube/components/lyrics/zoom_controls.dart';
import 'package:spotube/components/shared/shimmers/shimmer_lyrics.dart'; import 'package:spotube/components/shared/shimmers/shimmer_lyrics.dart';
import 'package:spotube/components/shared/spotube_marquee_text.dart'; import 'package:spotube/components/shared/spotube_marquee_text.dart';
@ -15,6 +16,8 @@ import 'package:spotube/services/queries/queries.dart';
import 'package:spotube/utils/type_conversion_utils.dart'; import 'package:spotube/utils/type_conversion_utils.dart';
final _delay = StateProvider<int>((ref) => 0);
class SyncedLyrics extends HookConsumerWidget { class SyncedLyrics extends HookConsumerWidget {
final PaletteColor palette; final PaletteColor palette;
final bool? isModal; final bool? isModal;
@ -32,9 +35,13 @@ class SyncedLyrics extends HookConsumerWidget {
final breakpoint = useBreakpoints(); final breakpoint = useBreakpoints();
final controller = useAutoScrollController(); final controller = useAutoScrollController();
final delay = ref.watch(_delay);
final timedLyricsQuery = final timedLyricsQuery =
useQueries.lyrics.spotifySynced(ref, playlist?.activeTrack); useQueries.lyrics.spotifySynced(ref, playlist?.activeTrack);
final lyricValue = timedLyricsQuery.data; final lyricValue = timedLyricsQuery.data;
final lyricsMap = useMemoized( final lyricsMap = useMemoized(
() => () =>
lyricValue?.lyrics lyricValue?.lyrics
@ -44,13 +51,16 @@ class SyncedLyrics extends HookConsumerWidget {
{}, {},
[lyricValue], [lyricValue],
); );
final currentTime = useSyncedLyrics(ref, lyricsMap); final currentTime = useSyncedLyrics(ref, lyricsMap, delay);
final textZoomLevel = useState<int>(100); final textZoomLevel = useState<int>(100);
final textTheme = Theme.of(context).textTheme; final textTheme = Theme.of(context).textTheme;
useEffect(() { useEffect(() {
controller.scrollToIndex(0); controller.scrollToIndex(0);
WidgetsBinding.instance.addPostFrameCallback((_) {
ref.read(_delay.notifier).state = 0;
});
return null; return null;
}, [playlist?.activeTrack]); }, [playlist?.activeTrack]);
@ -137,12 +147,37 @@ class SyncedLyrics extends HookConsumerWidget {
), ),
Align( Align(
alignment: Alignment.bottomRight, alignment: Alignment.bottomRight,
child: ZoomControls( child: Builder(builder: (context) {
final actions = [
ZoomControls(
value: delay,
onChanged: (value) => ref.read(_delay.notifier).state = value,
interval: 1,
unit: "s",
increaseIcon: const Icon(SpotubeIcons.add),
decreaseIcon: const Icon(SpotubeIcons.remove),
direction: isModal == true ? Axis.horizontal : Axis.vertical,
),
ZoomControls(
value: textZoomLevel.value, value: textZoomLevel.value,
onChanged: (value) => textZoomLevel.value = value, onChanged: (value) => textZoomLevel.value = value,
min: 50, min: 50,
max: 200, max: 200,
), ),
];
return isModal == true
? Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.end,
children: actions,
)
: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.end,
children: actions,
);
}),
), ),
], ],
); );