pato05/freezer
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

wip: new player_screen fixes

Browse source
This commit is contained in:
Pato05 2021-09-02 22:45:14 +02:00
parent 2bd29f4cea
commit cdf990a3d8
14 changed files with 721 additions and 632 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

3
lib/api/download.dart
View file

@ -578,7 +578,8 @@ class DownloadManager {
int? playlistCount = (await db
.rawQuery('SELECT COUNT(*) FROM Playlists'))[0]['COUNT(*)'] as int?;
//Free space
double diskSpace = await (DiskSpace.getFreeDiskSpace as FutureOr<double>);
double diskSpace =
await DiskSpace.getFreeDiskSpace.then((value) => value ?? 0.0);
//Used space
List<FileSystemEntity> offlineStat =
await Directory(offlinePath).list().toList();

26
lib/api/player.dart
View file

@ -189,7 +189,7 @@ class PlayerHelper {
List<Track>? tracks = [];
switch (queueSource!.source) {
case 'flow':
tracks = await (deezerAPI.flow() as FutureOr<List<Track>>);
tracks = await deezerAPI.flow();
break;
//SmartRadio/Artist radio
case 'smartradio':
@ -198,22 +198,26 @@ class PlayerHelper {
break;
//Library shuffle
case 'libraryshuffle':
tracks = await (deezerAPI.libraryShuffle(
start: audioHandler.queue.value.length) as FutureOr<List<Track>>);
tracks = await deezerAPI.libraryShuffle(
start: audioHandler.queue.value.length);
break;
case 'mix':
tracks =
await (deezerAPI.playMix(queueSource!.id) as FutureOr<List<Track>>);
tracks = await deezerAPI.playMix(queueSource!.id);
// Deduplicate tracks with the same id
List<String> queueIds =
audioHandler.queue.value.map((e) => e.id).toList();
tracks.removeWhere((track) => queueIds.contains(track.id));
tracks?.removeWhere((track) => queueIds.contains(track.id));
break;
default:
// print(queueSource.toJson());
break;
}
if (tracks == null) {
// try again i guess?
return await onQueueEnd();
}
List<MediaItem> mi = tracks.map<MediaItem>((t) => t.toMediaItem()).toList();
await audioHandler.addQueueItems(mi);
// AudioService.skipToNext();
@ -546,9 +550,9 @@ class AudioPlayerTask extends BaseAudioHandler {
void _broadcastState() {
playbackState.add(PlaybackState(
controls: [
MediaControl.skipToPrevious,
if (_player.playing) MediaControl.pause else MediaControl.play,
MediaControl.skipToNext,
if (_queueIndex != 0) MediaControl.skipToPrevious,
_player.playing ? MediaControl.pause : MediaControl.play,
if (_queueIndex != _queue!.length - 1) MediaControl.skipToNext,
//Stop
MediaControl(
androidIcon: 'drawable/ic_action_stop',
@ -725,8 +729,8 @@ class AudioPlayerTask extends BaseAudioHandler {
case 'screenAndroidAuto':
if (_androidAutoCallback != null)
_androidAutoCallback!.complete(
(args!['value'] as List<Map<String, dynamic>>)
.map<MediaItem>(mediaItemFromJson)
(args!['value'] as List<Map<String, dynamic>>?)
?.map<MediaItem>(mediaItemFromJson)
.toList());
break;
//Reorder tracks, args = [old, new]

43
lib/main.dart
View file

@ -46,13 +46,14 @@ void main() async {
audioHandler = await AudioService.init<AudioPlayerTask>(
builder: () => AudioPlayerTask(),
config: AudioServiceConfig(
notificationColor: settings.primaryColor,
androidStopForegroundOnPause: false,
androidNotificationOngoing: false,
androidNotificationClickStartsActivity: true,
androidNotificationChannelDescription: 'Freezer',
androidNotificationChannelName: 'Freezer',
androidNotificationIcon: 'drawable/ic_logo',
preloadArtwork: true,
preloadArtwork: false,
),
);
@ -69,7 +70,6 @@ class _FreezerAppState extends State<FreezerApp> {
void initState() {
//Make update theme global
updateTheme = _updateTheme;
_updateTheme();
super.initState();
}
@ -82,11 +82,6 @@ class _FreezerAppState extends State<FreezerApp> {
setState(() {
settings.themeData;
});
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
systemNavigationBarColor: settings.themeData!.bottomAppBarColor,
systemNavigationBarIconBrightness:
settings.isDark ? Brightness.light : Brightness.dark,
));
}
Locale? _locale() {
@ -171,8 +166,18 @@ class _LoginMainWrapperState extends State<LoginMainWrapper> {
@override
Widget build(BuildContext context) {
if (settings.arl == null)
return LoginWidget(
return AnnotatedRegion<SystemUiOverlayStyle>(
value: (Theme.of(context).brightness == Brightness.dark
? SystemUiOverlayStyle.dark
: SystemUiOverlayStyle.light)
.copyWith(
statusBarColor: Colors.transparent,
systemNavigationBarColor: Theme.of(context).scaffoldBackgroundColor,
statusBarIconBrightness: Brightness.light,
),
child: LoginWidget(
callback: () => setState(() => {}),
),
);
return MainScreen();
}
@ -190,6 +195,9 @@ class _MainScreenState extends State<MainScreen>
StreamSubscription? _urlLinkStream;
int _keyPressed = 0;
bool textFieldVisited = false;
final _slideTween = Tween<Offset>(
begin: const Offset(0.0, 0.025), end: const Offset(0.0, 0.0));
final _scaleTween = Tween(begin: 0.975, end: 1.0);
@override
void initState() {
@ -394,7 +402,7 @@ class _MainScreenState extends State<MainScreen>
}
await navigatorKey.currentState!.maybePop();
_selected.value = s;
if (_selected.value != s) _selected.value = s;
},
selectedItemColor: Theme.of(context).primaryColor,
items: <BottomNavigationBarItem>[
@ -420,7 +428,22 @@ class _MainScreenState extends State<MainScreen>
canRequestFocus: false,
child: ValueListenableBuilder<int>(
valueListenable: _selected,
builder: (context, value, _) => _screens[value]))),
builder: (context, value, _) => AnimatedSwitcher(
duration: Duration(milliseconds: 250),
transitionBuilder: (child, animation) =>
SlideTransition(
position: _slideTween.animate(animation),
child: ScaleTransition(
scale: _scaleTween.animate(animation),
child: FadeTransition(
opacity: animation,
child: child,
),
)),
layoutBuilder: (currentChild, previousChildren) =>
currentChild!,
child: _screens[value],
)))),
));
}
}

12
lib/ui/elements.dart
View file

@ -37,9 +37,13 @@ class FreezerAppBar extends StatelessWidget implements PreferredSizeWidget {
final Widget? bottom;
//Should be specified if bottom is specified
final double height;
final SystemUiOverlayStyle? systemUiOverlayStyle;
FreezerAppBar(this.title,
{this.actions = const [], this.bottom, this.height = 56.0});
const FreezerAppBar(this.title,
{this.actions = const [],
this.bottom,
this.height = 56.0,
this.systemUiOverlayStyle});
Size get preferredSize => Size.fromHeight(this.height);
@ -51,9 +55,7 @@ class FreezerAppBar extends StatelessWidget implements PreferredSizeWidget {
? Colors.white
: Colors.black),
child: AppBar(
systemOverlayStyle: Theme.of(context).brightness == Brightness.dark
? SystemUiOverlayStyle.dark
: SystemUiOverlayStyle.light,
systemOverlayStyle: systemUiOverlayStyle,
elevation: 0.0,
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
title: Text(

7
lib/ui/home_screen.dart
View file

@ -124,12 +124,7 @@ class _HomePageScreenState extends State<HomePageScreen> {
@override
Widget build(BuildContext context) {
if (_homePage == null)
return Center(
child: Padding(
padding: EdgeInsets.all(8.0),
child: CircularProgressIndicator(),
));
if (_homePage == null) return Center(child: CircularProgressIndicator());
if (_error) return ErrorScreen();
return Column(
children: List.generate(

4
lib/ui/login_screen.dart
View file

@ -351,7 +351,7 @@ class _EmailLoginState extends State<EmailLogin> {
setState(() => _loading = true);
//Try logging in
String? arl;
late String exception;
String? exception;
try {
arl = await DeezerAPI.getArlByEmail(_email, _password!);
} catch (e, st) {
@ -376,7 +376,7 @@ class _EmailLoginState extends State<EmailLogin> {
title: Text("Error logging in!".i18n),
content: Text(
"Error logging in using email, please check your credentials.\nError: " +
exception),
(exception ?? 'Unknown')),
actions: [
TextButton(
child: Text('Dismiss'.i18n),

45
lib/ui/lyrics.dart
View file

@ -2,6 +2,7 @@ import 'dart:async';
import 'package:audio_service/audio_service.dart';
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
import 'package:freezer/api/deezer.dart';
import 'package:freezer/api/definitions.dart';
@ -35,17 +36,20 @@ class _LyricsScreenState extends State<LyricsScreen> {
Future _loadForId(String trackId) async {
//Fetch
if (_loading == false && lyrics != null)
if (_loading == false && lyrics != null) {
setState(() {
_freeScroll = false;
_loading = true;
lyrics = null;
});
}
try {
Lyrics l = await deezerAPI.lyrics(trackId);
setState(() {
_loading = false;
lyrics = l;
});
_scrollToLyric();
} catch (e) {
setState(() {
_error = e;
@ -68,6 +72,7 @@ class _LyricsScreenState extends State<LyricsScreen> {
@override
void initState() {
SchedulerBinding.instance!.addPostFrameCallback((_) {
//Enable visualizer
// if (settings.lyricsVisualizer) playerHelper.startVisualizer();
_playbackStateSub = AudioService.position.listen((position) {
@ -83,13 +88,14 @@ class _LyricsScreenState extends State<LyricsScreen> {
if (_freeScroll) return;
_scrollToLyric();
});
});
if (audioHandler.mediaItem.value != null)
_loadForId(audioHandler.mediaItem.value!.id);
/// Track change = ~exit~ reload lyrics
_mediaItemSub = audioHandler.mediaItem.listen((mediaItem) {
if (mediaItem == null) return;
_controller.jumpTo(0.0);
if (_controller.hasClients) _controller.jumpTo(0.0);
_loadForId(mediaItem.id);
});
@ -107,12 +113,17 @@ class _LyricsScreenState extends State<LyricsScreen> {
@override
Widget build(BuildContext context) {
return AnnotatedRegion<SystemUiOverlayStyle>(
value: Theme.of(context).brightness == Brightness.dark
? SystemUiOverlayStyle.dark
: SystemUiOverlayStyle.light,
child: Scaffold(
appBar: FreezerAppBar('Lyrics'.i18n),
return Scaffold(
appBar: FreezerAppBar('Lyrics'.i18n,
systemUiOverlayStyle: SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
statusBarIconBrightness: Brightness.light,
statusBarBrightness: Brightness.light,
systemNavigationBarColor: Theme.of(context).scaffoldBackgroundColor,
systemNavigationBarDividerColor: Color(
Theme.of(context).scaffoldBackgroundColor.value - 0x00111111),
systemNavigationBarIconBrightness: Brightness.light,
)),
body: SafeArea(
child: Column(
children: [
@ -134,8 +145,7 @@ class _LyricsScreenState extends State<LyricsScreen> {
},
child: Text(
_currentIndex! >= 0
? (lyrics?.lyrics?[_currentIndex!].text ??
'...')
? (lyrics?.lyrics?[_currentIndex!].text ?? '...')
: '...',
textAlign: TextAlign.center,
),
@ -177,15 +187,14 @@ class _LyricsScreenState extends State<LyricsScreen> {
itemCount: lyrics!.lyrics!.length,
itemBuilder: (BuildContext context, int i) {
return Padding(
padding: EdgeInsets.symmetric(
horizontal: 8.0),
padding:
EdgeInsets.symmetric(horizontal: 8.0),
child: Container(
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(8.0),
color: _currentIndex == i
? Colors.grey
.withOpacity(0.25)
? Colors.grey.withOpacity(0.25)
: Colors.transparent,
),
height: height,
@ -194,8 +203,7 @@ class _LyricsScreenState extends State<LyricsScreen> {
BorderRadius.circular(8.0),
onTap: lyrics!.id != null
? () => audioHandler.seek(
lyrics!
.lyrics![i].offset!)
lyrics!.lyrics![i].offset!)
: null,
child: Center(
child: Text(
@ -205,8 +213,7 @@ class _LyricsScreenState extends State<LyricsScreen> {
fontSize: 26.0,
fontWeight:
(_currentIndex == i)
? FontWeight
.bold
? FontWeight.bold
: FontWeight
.normal),
),
@ -244,7 +251,7 @@ class _LyricsScreenState extends State<LyricsScreen> {
PlayerBar(shouldHandleClicks: false),
],
),
)),
),
);
}
}

22
lib/ui/menu.dart
View file

@ -32,16 +32,18 @@ class MenuSheet {
isScrollControlled: true,
context: context,
builder: (BuildContext context) {
return ConstrainedBox(
return SafeArea(
child: ConstrainedBox(
constraints: BoxConstraints(
maxHeight:
(MediaQuery.of(context).orientation == Orientation.landscape)
maxHeight: (MediaQuery.of(context).orientation ==
Orientation.landscape)
? 220
: 350,
),
child: SingleChildScrollView(
child: Column(children: options),
),
),
);
});
}
@ -55,12 +57,11 @@ class MenuSheet {
isScrollControlled: true,
context: context,
builder: (BuildContext context) {
return Column(
return SafeArea(
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
height: 16.0,
),
const SizedBox(height: 16.0),
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
@ -74,7 +75,7 @@ class MenuSheet {
label: "Album art".i18n,
image: true,
),
Container(
SizedBox(
width: 240.0,
child: Column(
mainAxisSize: MainAxisSize.min,
@ -109,9 +110,7 @@ class MenuSheet {
),
],
),
Container(
height: 16.0,
),
const SizedBox(height: 16.0),
ConstrainedBox(
constraints: BoxConstraints(
maxHeight: (MediaQuery.of(context).orientation ==
@ -124,6 +123,7 @@ class MenuSheet {
),
)
],
),
);
});
}

34
lib/ui/player_bar.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:audio_service/audio_service.dart';
import 'package:flutter/material.dart';
import 'package:freezer/settings.dart';
@ -17,6 +19,8 @@ class PlayerBar extends StatefulWidget {
class _PlayerBarState extends State<PlayerBar> {
final double iconSize = 28;
late StreamSubscription mediaItemSub;
late bool _isNothingPlaying = audioHandler.mediaItem.value == null;
double parsePosition(Duration position) {
if (audioHandler.mediaItem.value == null) return 0.0;
@ -26,12 +30,30 @@ class _PlayerBarState extends State<PlayerBar> {
audioHandler.mediaItem.value!.duration!.inSeconds;
}
@override
void initState() {
mediaItemSub = audioHandler.mediaItem.listen((playingItem) {
if ((playingItem == null && !_isNothingPlaying) ||
(playingItem != null && _isNothingPlaying))
setState(() => _isNothingPlaying = playingItem == null);
});
super.initState();
}
@override
void dispose() {
mediaItemSub.cancel();
super.dispose();
}
bool _gestureRegistered = false;
@override
Widget build(BuildContext context) {
var focusNode = FocusNode();
return GestureDetector(
return _isNothingPlaying
? const SizedBox()
: GestureDetector(
onHorizontalDragUpdate: (details) async {
if (_gestureRegistered) return;
final double sensitivity = 12.69;
@ -62,10 +84,12 @@ class _PlayerBarState extends State<PlayerBar> {
child: ListTile(
dense: true,
focusNode: focusNode,
contentPadding: EdgeInsets.symmetric(horizontal: 8.0),
contentPadding:
EdgeInsets.symmetric(horizontal: 8.0),
onTap: widget.shouldHandleClicks
? () {
Navigator.of(context).push(MaterialPageRoute(
Navigator.of(context).push(
MaterialPageRoute(
builder: (BuildContext context) =>
PlayerScreen()));
}
@ -74,7 +98,8 @@ class _PlayerBarState extends State<PlayerBar> {
width: 50,
height: 50,
url: currentMediaItem.extras!['thumb'] ??
audioHandler.mediaItem.value!.artUri as String?,
audioHandler.mediaItem.value!.artUri
as String?,
),
title: Text(
currentMediaItem.displayTitle!,
@ -205,7 +230,6 @@ class _PlayPauseButtonState extends State<PlayPauseButton>
_controller.reverse();
return IconButton(
splashRadius: widget.size,
icon: AnimatedIcon(
icon: AnimatedIcons.play_pause,
progress: _animation,

334
lib/ui/player_screen.dart
View file

@ -4,6 +4,7 @@ import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:audio_service/audio_service.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:fluttertoast/fluttertoast.dart';
@ -21,6 +22,7 @@ import 'package:freezer/ui/tiles.dart';
import 'package:just_audio/just_audio.dart';
import 'package:marquee/marquee.dart';
import 'package:palette_generator/palette_generator.dart';
import 'package:photo_view/photo_view.dart';
import 'cached_image.dart';
import '../api/definitions.dart';
@ -176,30 +178,24 @@ class PlayerScreenHorizontal extends StatefulWidget {
class _PlayerScreenHorizontalState extends State<PlayerScreenHorizontal> {
@override
Widget build(BuildContext context) {
return Row(
return Padding(
padding: const EdgeInsets.all(16.0),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: <Widget>[
Padding(
padding: EdgeInsets.fromLTRB(16, 0, 16, 8),
child: Container(
width: ScreenUtil().setWidth(500),
child: Stack(
children: <Widget>[
BigAlbumArt(),
],
),
),
Expanded(
flex: 5,
child: BigAlbumArt(),
),
//Right side
SizedBox(
width: ScreenUtil().setWidth(500),
Expanded(
flex: 5,
child: Column(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Padding(
padding: EdgeInsets.fromLTRB(8, 16, 8, 0),
padding: EdgeInsets.fromLTRB(8, 0, 8, 0),
child: Container(
child: PlayerScreenTopRow(
textSize: ScreenUtil().setSp(24),
@ -216,9 +212,10 @@ class _PlayerScreenHorizontalState extends State<PlayerScreenHorizontal> {
.mediaItem.value!.displayTitle!.length >=
22
? Marquee(
text: audioHandler.mediaItem.value!.displayTitle!,
text:
audioHandler.mediaItem.value!.displayTitle!,
style: TextStyle(
fontSize: ScreenUtil().setSp(40),
fontSize: 40.sp,
fontWeight: FontWeight.bold),
blankSpace: 32.0,
startPadding: 10.0,
@ -230,7 +227,7 @@ class _PlayerScreenHorizontalState extends State<PlayerScreenHorizontal> {
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: ScreenUtil().setSp(40),
fontSize: 40.sp,
fontWeight: FontWeight.bold),
)),
const SizedBox(height: 4.0),
@ -240,46 +237,26 @@ class _PlayerScreenHorizontalState extends State<PlayerScreenHorizontal> {
textAlign: TextAlign.center,
overflow: TextOverflow.clip,
style: TextStyle(
fontSize: ScreenUtil().setSp(32),
fontSize: 32.sp,
color: Theme.of(context).primaryColor,
),
),
],
),
Container(
const Padding(
padding: EdgeInsets.symmetric(horizontal: 16.0),
child: SeekBar(),
),
PlaybackControls(ScreenUtil().setSp(60)),
PlaybackControls(56.sp),
Padding(
padding: EdgeInsets.fromLTRB(8, 0, 8, 16),
child: Container(
padding: EdgeInsets.symmetric(horizontal: 2.0),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
IconButton(
icon: Icon(
Icons.subtitles,
size: ScreenUtil().setWidth(32),
semanticLabel: "Lyrics".i18n,
),
onPressed: () {
Navigator.of(context).push(MaterialPageRoute(
builder: (context) => LyricsScreen()));
},
),
QualityInfoWidget(),
RepeatButton(ScreenUtil().setWidth(32)),
PlayerMenuButton()
],
),
))
padding: const EdgeInsets.symmetric(horizontal: 10.0),
child: BottomBarControls(size: 42.sp),
)
],
),
)
],
),
);
}
}
@ -293,23 +270,19 @@ class PlayerScreenVertical extends StatefulWidget {
class _PlayerScreenVerticalState extends State<PlayerScreenVertical> {
@override
Widget build(BuildContext context) {
return Column(
return Padding(
padding: EdgeInsets.fromLTRB(30, 4, 16, 0),
child: Column(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Padding(
padding: EdgeInsets.fromLTRB(30, 4, 16, 0),
child: PlayerScreenTopRow()),
PlayerScreenTopRow(),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.0),
child: SizedBox(
child: BigAlbumArt(),
width: min(MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height) *
0.9,
height: min(MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height) *
0.9,
width: 1000.w,
height: 1000.w,
),
),
const SizedBox(height: 4.0),
@ -318,7 +291,8 @@ class _PlayerScreenVerticalState extends State<PlayerScreenVertical> {
children: <Widget>[
Container(
height: ScreenUtil().setSp(80),
child: audioHandler.mediaItem.value!.displayTitle!.length >= 26
child: audioHandler.mediaItem.value!.displayTitle!.length >=
26
? Marquee(
text: audioHandler.mediaItem.value!.displayTitle!,
style: TextStyle(
@ -351,58 +325,13 @@ class _PlayerScreenVerticalState extends State<PlayerScreenVertical> {
],
),
SeekBar(),
PlaybackControls(ScreenUtil().setWidth(100)),
PlaybackControls(86.sp),
Padding(
padding: EdgeInsets.symmetric(vertical: 0, horizontal: 16.0),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
IconButton(
icon: Icon(
Icons.subtitles,
size: ScreenUtil().setWidth(46),
semanticLabel: "Lyrics".i18n,
),
onPressed: () async {
//Fix bottom buttons
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
systemNavigationBarColor:
settings.themeData!.bottomAppBarColor,
statusBarColor: Colors.transparent));
await Navigator.of(context).push(
MaterialPageRoute(builder: (context) => LyricsScreen()));
updateColor();
},
),
IconButton(
icon: Icon(
Icons.file_download,
semanticLabel: "Download".i18n,
),
onPressed: () async {
Track t = Track.fromMediaItem(audioHandler.mediaItem.value!);
if (await downloadManager.addOfflineTrack(t,
private: false,
context: context,
isSingleton: true) !=
false)
Fluttertoast.showToast(
msg: 'Downloads added!'.i18n,
gravity: ToastGravity.BOTTOM,
toastLength: Toast.LENGTH_SHORT);
},
),
QualityInfoWidget(),
RepeatButton(ScreenUtil().setWidth(46)),
PlayerMenuButton()
],
),
child: BottomBarControls(size: 56.sp),
)
],
);
));
}
}
@ -422,7 +351,7 @@ class _QualityInfoWidgetState extends State<QualityInfoWidget> {
"getStreamInfo", {"id": audioHandler.mediaItem.value!.id});
//N/A
if (data == null) {
setState(() => value = '');
if (mounted) setState(() => value = '');
//If not show, try again later
if (audioHandler.mediaItem.value!.extras!['show'] == null)
Future.delayed(Duration(milliseconds: 200), _load);
@ -439,10 +368,8 @@ class _QualityInfoWidgetState extends State<QualityInfoWidget> {
@override
void initState() {
_load();
streamSubscription = audioHandler.mediaItem.listen((event) async {
_load();
});
SchedulerBinding.instance!.addPostFrameCallback((_) => _load());
streamSubscription = audioHandler.mediaItem.listen((_) => _load());
super.initState();
}
@ -465,12 +392,15 @@ class _QualityInfoWidgetState extends State<QualityInfoWidget> {
}
class PlayerMenuButton extends StatelessWidget {
final double size;
const PlayerMenuButton({required this.size});
@override
Widget build(BuildContext context) {
return IconButton(
icon: Icon(
Icons.more_vert,
size: ScreenUtil().setWidth(46),
size: size,
semanticLabel: "Options".i18n,
),
onPressed: () {
@ -552,13 +482,11 @@ class _PlaybackControlsState extends State<PlaybackControls> {
Track.fromMediaItem(audioHandler.mediaItem.value!))) {
return Icon(
Icons.favorite,
size: widget.iconSize * 0.64,
semanticLabel: "Unlove".i18n,
);
}
return Icon(
Icons.favorite_border,
size: widget.iconSize * 0.64,
semanticLabel: "Love".i18n,
);
}
@ -574,9 +502,9 @@ class _PlaybackControlsState extends State<PlaybackControls> {
IconButton(
icon: Icon(
Icons.sentiment_very_dissatisfied,
size: ScreenUtil().setWidth(46),
semanticLabel: "Dislike".i18n,
),
iconSize: widget.iconSize * 0.75,
onPressed: () async {
await deezerAPI.dislikeTrack(audioHandler.mediaItem.value!.id);
if (playerHelper.queueIndex <
@ -589,6 +517,7 @@ class _PlaybackControlsState extends State<PlaybackControls> {
PrevNextButton(widget.iconSize),
IconButton(
icon: libraryIcon,
iconSize: widget.iconSize * 0.75,
onPressed: () async {
if (cache.libraryTracks == null) cache.libraryTracks = [];
@ -624,6 +553,7 @@ class BigAlbumArt extends StatefulWidget {
class _BigAlbumArtState extends State<BigAlbumArt> {
PageController _pageController = PageController(
initialPage: playerHelper.queueIndex,
viewportFraction: 1.0,
);
StreamSubscription? _currentItemSub;
bool _animationLock = true;
@ -632,6 +562,7 @@ class _BigAlbumArtState extends State<BigAlbumArt> {
void initState() {
_currentItemSub = audioHandler.mediaItem.listen((event) async {
_animationLock = true;
// TODO: a lookup in the entire queue isn't that good, this can definitely be improved in some way
await _pageController.animateToPage(playerHelper.queueIndex,
duration: Duration(milliseconds: 300), curve: Curves.easeInOut);
_animationLock = false;
@ -653,6 +584,22 @@ class _BigAlbumArtState extends State<BigAlbumArt> {
Navigator.of(context).pop();
}
},
onTap: () => Navigator.push(
context,
PageRouteBuilder(
opaque: false, // transparent background
barrierDismissible: true,
pageBuilder: (context, _, __) {
return PhotoView(
imageProvider: CachedNetworkImageProvider(
audioHandler.mediaItem.value!.artUri.toString()),
maxScale: 8.0,
minScale: 0.2,
heroAttributes: PhotoViewHeroAttributes(
tag: audioHandler.mediaItem.value!.id),
backgroundDecoration:
BoxDecoration(color: Color.fromARGB(0x90, 0, 0, 0)));
})),
child: PageView(
controller: _pageController,
onPageChanged: (int index) {
@ -665,8 +612,14 @@ class _BigAlbumArtState extends State<BigAlbumArt> {
},
children: List.generate(
audioHandler.queue.value.length,
(i) => ZoomableImage(
(i) => Padding(
padding: const EdgeInsets.all(8.0),
child: Hero(
tag: audioHandler.queue.value[i].id,
child: CachedImage(
url: audioHandler.queue.value[i].artUri.toString(),
),
),
)),
),
);
@ -719,6 +672,8 @@ class PlayerScreenTopRow extends StatelessWidget {
}
class SeekBar extends StatefulWidget {
const SeekBar();
@override
_SeekBarState createState() => _SeekBarState();
}
@ -763,26 +718,6 @@ class _SeekBarState extends State<SeekBar> {
return Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Padding(
padding: EdgeInsets.symmetric(horizontal: 24.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
ValueListenableBuilder<Duration>(
valueListenable: position,
builder: (context, value, _) => Text(
_timeString(value),
style: TextStyle(fontSize: ScreenUtil().setSp(35)),
)),
StreamBuilder<MediaItem?>(
stream: audioHandler.mediaItem,
builder: (context, snapshot) => Text(
_timeString(snapshot.data?.duration ?? Duration.zero),
style: TextStyle(fontSize: ScreenUtil().setSp(35)),
)),
],
),
),
ValueListenableBuilder<Duration>(
valueListenable: position,
builder: (context, value, _) => Slider(
@ -804,6 +739,38 @@ class _SeekBarState extends State<SeekBar> {
audioHandler.seek(Duration(milliseconds: d.toInt()));
},
)),
Padding(
padding: EdgeInsets.symmetric(horizontal: 24.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
ValueListenableBuilder<Duration>(
valueListenable: position,
builder: (context, value, _) => Text(
_timeString(value),
style: TextStyle(
fontSize: ScreenUtil().setSp(35),
color: Theme.of(context)
.textTheme
.bodyText1!
.color!
.withOpacity(.75)),
)),
StreamBuilder<MediaItem?>(
stream: audioHandler.mediaItem,
builder: (context, snapshot) => Text(
_timeString(snapshot.data?.duration ?? Duration.zero),
style: TextStyle(
fontSize: ScreenUtil().setSp(35),
color: Theme.of(context)
.textTheme
.bodyText1!
.color!
.withOpacity(.75)),
)),
],
),
),
],
);
}
@ -816,6 +783,20 @@ class QueueScreen extends StatefulWidget {
class _QueueScreenState extends State<QueueScreen> {
late StreamSubscription _queueSub;
static const _dismissibleBackground = DecoratedBox(
decoration: BoxDecoration(color: Colors.red),
child: Align(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 24.0),
child: Icon(Icons.delete)),
alignment: Alignment.centerLeft));
static const _dismissibleSecondaryBackground = DecoratedBox(
decoration: BoxDecoration(color: Colors.red),
child: Align(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 24.0),
child: Icon(Icons.delete)),
alignment: Alignment.centerRight));
/// Basically a simple list that keeps itself synchronized with [AudioHandler.queue],
/// so that the [ReorderableListView] is updated instanly (as it should be)
@ -827,7 +808,10 @@ class _QueueScreenState extends State<QueueScreen> {
_queueSub = audioHandler.queue.listen((newQueue) {
print('got queue $newQueue');
// avoid rebuilding if the cache has got the right update
if (listEquals(_queueCache, newQueue)) return;
if (listEquals(_queueCache, newQueue)) {
print('avoiding rebuilding queue since they are the same');
return;
}
setState(() => _queueCache = newQueue);
});
super.initState();
@ -844,6 +828,15 @@ class _QueueScreenState extends State<QueueScreen> {
return Scaffold(
appBar: FreezerAppBar(
'Queue'.i18n,
systemUiOverlayStyle: SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
statusBarIconBrightness: Brightness.light,
statusBarBrightness: Brightness.light,
systemNavigationBarColor: Theme.of(context).scaffoldBackgroundColor,
systemNavigationBarDividerColor: Color(
Theme.of(context).scaffoldBackgroundColor.value - 0x00111111),
systemNavigationBarIconBrightness: Brightness.light,
),
actions: <Widget>[
IconButton(
icon: Icon(
@ -857,7 +850,8 @@ class _QueueScreenState extends State<QueueScreen> {
)
],
),
body: ReorderableListView.builder(
body: SafeArea(
child: ReorderableListView.builder(
onReorder: (int oldIndex, int newIndex) {
if (oldIndex == playerHelper.queueIndex) return;
setState(() => _queueCache.reorder(oldIndex, newIndex));
@ -868,20 +862,8 @@ class _QueueScreenState extends State<QueueScreen> {
Track track = Track.fromMediaItem(audioHandler.queue.value[i]);
return Dismissible(
key: Key(track.id),
background: DecoratedBox(
decoration: BoxDecoration(color: Colors.red),
child: Align(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Icon(Icons.delete)),
alignment: Alignment.centerLeft)),
secondaryBackground: DecoratedBox(
decoration: BoxDecoration(color: Colors.red),
child: Align(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Icon(Icons.delete)),
alignment: Alignment.centerRight)),
background: _dismissibleBackground,
secondaryBackground: _dismissibleSecondaryBackground,
onDismissed: (_) {
audioHandler.removeQueueItemAt(i);
setState(() => _queueCache.removeAt(i));
@ -898,6 +880,56 @@ class _QueueScreenState extends State<QueueScreen> {
),
);
},
));
),
),
);
}
}
class BottomBarControls extends StatelessWidget {
final double size;
const BottomBarControls({Key? key, required this.size}) : super(key: key);
@override
Widget build(BuildContext context) {
return Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
IconButton(
icon: Icon(
Icons.subtitles,
size: size,
semanticLabel: "Lyrics".i18n,
),
onPressed: () async {
await Navigator.of(context)
.push(MaterialPageRoute(builder: (context) => LyricsScreen()));
updateColor();
},
),
IconButton(
iconSize: size,
icon: Icon(
Icons.file_download,
semanticLabel: "Download".i18n,
),
onPressed: () async {
Track t = Track.fromMediaItem(audioHandler.mediaItem.value!);
if (await downloadManager.addOfflineTrack(t,
private: false, context: context, isSingleton: true) !=
false)
Fluttertoast.showToast(
msg: 'Downloads added!'.i18n,
gravity: ToastGravity.BOTTOM,
toastLength: Toast.LENGTH_SHORT);
},
),
QualityInfoWidget(),
RepeatButton(size),
PlayerMenuButton(size: size)
],
);
}
}

17
lib/ui/settings_screen.dart
View file

@ -240,19 +240,20 @@ class _AppearanceSettingsState extends State<AppearanceSettings> {
.i18n),
secondary: Icon(Icons.equalizer),
value: settings.lyricsVisualizer!,
onChanged: (bool v) async {
if (await Permission.microphone.request().isGranted) {
setState(() => settings.lyricsVisualizer = v);
await settings.save();
return;
}
},
onChanged: null, // TODO: visualizer
//(bool v) async {
// if (await Permission.microphone.request().isGranted) {
// setState(() => settings.lyricsVisualizer = v);
// await settings.save();
// return;
// }
//},
),
ListTile(
title: Text('Primary color'.i18n),
leading: Icon(Icons.format_paint),
trailing: Padding(
padding: EdgeInsets.only(left: 8.0),
padding: EdgeInsets.only(right: 8.0),
child: CircleAvatar(
backgroundColor: settings.primaryColor,
)),

4
pubspec.lock
View file

@ -548,10 +548,10 @@ packages:
description:
path: just_audio
ref: dev
resolved-ref: "7ac783939a758be2799faefc8877c34a84fe1554"
resolved-ref: "27a777fbb5e0fca2c9db6bdf1cdc9672b3fe9971"
url: "https://github.com/ryanheise/just_audio.git"
source: git
version: "0.9.7"
version: "0.9.8"
just_audio_platform_interface:
dependency: transitive
description:

2
pubspec.yaml
View file

@ -50,7 +50,7 @@ dependencies:
disk_space:
git: https://github.com/phipps980316/disk_space
random_string: ^2.0.1
async: ^2.8.1
async: ^2.6.1
html: ^0.15.0
flutter_screenutil: ^5.0.0+2
marquee: ^2.2.0