LittleSheep/RhythmBox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ Improve progress display

Browse Source
This commit is contained in:
LittleSheep
2024-08-29 00:41:40 +08:00
parent 2134500089
commit 249c8fbf80
4 changed files with 66 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/widgets/lyrics/synced.dart
View File

@ -107,7 +107,7 @@ class _SyncedLyricsState extends State<SyncedLyrics> {
)
: Padding(
padding: idx == _lyric!.lyrics.length - 1
? const EdgeInsets.all(8.0).copyWith(bottom: 100)
? const EdgeInsets.all(8.0).copyWith(bottom: 80)
: const EdgeInsets.all(8.0),
child: AnimatedDefaultTextStyle(
duration: const Duration(milliseconds: 250),
@ -141,8 +141,9 @@ class _SyncedLyricsState extends State<SyncedLyrics> {
),
).animate(target: isActive ? 1 : 0).scale(
duration: 300.ms,
begin: const Offset(0.9, 0.9),
end: const Offset(1.3, 1.3),
begin: const Offset(1, 1),
end: const Offset(1.25, 1.25),
curve: Curves.easeInOut,
);
}).paddingSymmetric(horizontal: 12),
),

13
lib/widgets/player/bottom_player.dart
View File

@ -44,9 +44,6 @@ class _BottomPlayerState extends State<BottomPlayer>
bool get _isPlaying => _playback.isPlaying.value;
bool get _isFetchingActiveTrack => _query.isQueryingTrackInfo.value;
Duration _durationCurrent = Duration.zero;
Duration _durationTotal = Duration.zero;
List<StreamSubscription>? _subscriptions;
Future<void> _togglePlayState() async {
@ -63,10 +60,6 @@ class _BottomPlayerState extends State<BottomPlayer>
void initState() {
super.initState();
_subscriptions = [
audioPlayer.durationStream
.listen((dur) => setState(() => _durationTotal = dur)),
audioPlayer.positionStream
.listen((dur) => setState(() => _durationCurrent = dur)),
_playback.state.listen((state) {
if (state.playlist.medias.isNotEmpty && !_isLifted) {
_animationController.animateTo(1);
@ -109,12 +102,12 @@ class _BottomPlayerState extends State<BottomPlayer>
behavior: HitTestBehavior.translucent,
child: Column(
children: [
if (_durationCurrent != Duration.zero)
if (_playback.durationCurrent.value != Duration.zero)
TweenAnimationBuilder<double>(
tween: Tween(
begin: 0,
end: _durationCurrent.inMilliseconds /
max(_durationTotal.inMilliseconds, 1),
end: _playback.durationCurrent.value.inMilliseconds /
max(_playback.durationTotal.value.inMilliseconds, 1),
),
duration: const Duration(milliseconds: 1000),
builder: (context, value, _) => LinearProgressIndicator(