Funkwhale/tsacdop-podcast-app-android
1
0
Fork 0
mirror of https://github.com/stonega/tsacdop synced 2025-02-26 16:27:39 +01:00
Code Issues Releases Wiki Activity

Add time picker in sleeper mode, custom playlist.

Browse Source
This commit is contained in:
Stonegate 2021-01-01 00:52:11 +08:00
parent bb4f26cd34
commit d3d21f28e3
1 changed files with 334 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
lib/home/audioplayer.dart
View File

@ -3,10 +3,12 @@ import 'dart:math' as math;
import 'package:audio_service/audio_service.dart'; import 'package:audio_service/audio_service.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_time_picker_spinner/flutter_time_picker_spinner.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:line_icons/line_icons.dart'; import 'package:line_icons/line_icons.dart';
import 'package:marquee/marquee.dart'; import 'package:marquee/marquee.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:tsacdop/playlists/playlist_home.dart';
import 'package:tuple/tuple.dart'; import 'package:tuple/tuple.dart';
import '../episodes/episode_detail.dart'; import '../episodes/episode_detail.dart';
@ -15,6 +17,7 @@ import '../local_storage/sqflite_localpodcast.dart';
import '../state/audio_state.dart'; import '../state/audio_state.dart';
import '../type/episodebrief.dart'; import '../type/episodebrief.dart';
import '../type/play_histroy.dart'; import '../type/play_histroy.dart';
import '../type/playlist.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../util/pageroute.dart'; import '../util/pageroute.dart';
import '../widgets/audiopanel.dart'; import '../widgets/audiopanel.dart';
@ -402,7 +405,9 @@ class _PlaylistWidgetState extends State<PlaylistWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var audio = Provider.of<AudioPlayerNotifier>(context, listen: false); var audio = Provider.of<AudioPlayerNotifier>(context, listen: false);
return Container( return ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Container(
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
height: 300, height: 300,
width: double.infinity, width: double.infinity,
@ -410,19 +415,21 @@ class _PlaylistWidgetState extends State<PlaylistWidget> {
color: context.accentColor.withAlpha(70), color: context.accentColor.withAlpha(70),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
child: Column( child: Selector<AudioPlayerNotifier, Tuple2<Playlist, EpisodeBrief>>(
selector: (_, audio) => Tuple2(audio.playlist, audio.episode),
builder: (_, data, __) {
var episodes = data.item1.episodes;
return Column(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Selector<AudioPlayerNotifier, List<EpisodeBrief>>( child: data.item1.name == 'Queue'
selector: (_, audio) => audio.playlist.episodes, ? AnimatedList(
builder: (_, data, __) {
var episodesToPlay = data.sublist(1);
return AnimatedList(
key: miniPlaylistKey, key: miniPlaylistKey,
shrinkWrap: true, shrinkWrap: true,
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
initialItemCount: episodesToPlay.length, initialItemCount: episodes.length,
itemBuilder: (context, index, animation) => ScaleTransition( itemBuilder: (context, index, animation) =>
ScaleTransition(
alignment: Alignment.center, alignment: Alignment.center,
scale: animation, scale: animation,
child: Column( child: Column(
@ -434,15 +441,17 @@ class _PlaylistWidgetState extends State<PlaylistWidget> {
color: Colors.transparent, color: Colors.transparent,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
audio.episodeLoad(data[index]); audio.episodeLoad(episodes[index]);
miniPlaylistKey.currentState.removeItem( miniPlaylistKey.currentState
.removeItem(
index, index,
(context, animation) => Center()); (context, animation) =>
Center());
}, },
child: Container( child: Container(
height: 60, height: 60,
padding: padding: EdgeInsets.symmetric(
EdgeInsets.symmetric(horizontal: 20), horizontal: 20),
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
@ -454,22 +463,26 @@ class _PlaylistWidgetState extends State<PlaylistWidget> {
Container( Container(
padding: EdgeInsets.all(10.0), padding: EdgeInsets.all(10.0),
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.all( borderRadius:
Radius.circular(15.0)), BorderRadius.all(
Radius.circular(
15.0)),
child: Container( child: Container(
height: 30.0, height: 30.0,
width: 30.0, width: 30.0,
child: Image.file(File( child: Image.file(File(
"${episodesToPlay[index].imagePath}"))), "${episodes[index].imagePath}"))),
), ),
), ),
Expanded( Expanded(
child: Align( child: Align(
alignment: Alignment.centerLeft, alignment:
Alignment.centerLeft,
child: Text( child: Text(
episodesToPlay[index].title, episodes[index].title,
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow:
TextOverflow.ellipsis,
), ),
), ),
), ),
@ -480,31 +493,37 @@ class _PlaylistWidgetState extends State<PlaylistWidget> {
), ),
), ),
Padding( Padding(
padding: padding: const EdgeInsets.symmetric(
const EdgeInsets.symmetric(horizontal: 20.0), horizontal: 20.0),
child: Material( child: Material(
borderRadius: BorderRadius.circular(100), borderRadius:
BorderRadius.circular(100),
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
color: context.primaryColor, color: context.primaryColor,
child: InkWell( child: InkWell(
borderRadius: borderRadius: BorderRadius.all(
BorderRadius.all(Radius.circular(15.0)), Radius.circular(15.0)),
onTap: () async { onTap: () async {
var episdoe = var episdoe =
episodesToPlay.removeAt(index); episodes.removeAt(index);
episodesToPlay.insert(0, episdoe); episodes.insert(0, episdoe);
miniPlaylistKey.currentState.removeItem( miniPlaylistKey.currentState
.removeItem(
index, index,
(context, animation) { (context, animation) {
return Center(); return Center();
}, },
duration: Duration.zero, duration: Duration.zero,
); );
miniPlaylistKey.currentState.insertItem(0, miniPlaylistKey.currentState
duration: Duration(milliseconds: 100)); .insertItem(
0,
duration: Duration(
milliseconds: 100));
await Future.delayed( await Future.delayed(
Duration(milliseconds: 100)); Duration(milliseconds: 100));
await audio.moveToTop(data[index + 1]); await audio.moveToTop(
data.item1.episodes[index + 1]);
}, },
child: SizedBox( child: SizedBox(
height: 30.0, height: 30.0,
@ -526,6 +545,65 @@ class _PlaylistWidgetState extends State<PlaylistWidget> {
], ],
), ),
), ),
)
: ListView.builder(
itemCount: episodes.length,
itemBuilder: (context, index) {
final isPlaying = episodes[index] != null &&
episodes[index] == data.item2;
return InkWell(
onTap: () async {
if (!isPlaying) {
await context
.read<AudioPlayerNotifier>()
.loadEpisodeFromPlaylist(episodes[index]);
}
},
child: Container(
color: isPlaying
? context.accentColor
: Colors.transparent,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
padding: EdgeInsets.all(10.0),
child: ClipRRect(
borderRadius: BorderRadius.all(
Radius.circular(15.0)),
child: Container(
height: 30.0,
width: 30.0,
child: Image.file(File(
"${episodes[index].imagePath}"))),
),
),
Expanded(
child: Align(
alignment: Alignment.centerLeft,
child: Text(
episodes[index].title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
),
if (isPlaying)
Container(
height: 20,
width: 20,
margin: EdgeInsets.symmetric(
horizontal: 10),
decoration: BoxDecoration(
shape: BoxShape.circle,
),
child: WaveLoader(
color: context.primaryColor)),
],
),
),
); );
}, },
), ),
@ -537,7 +615,10 @@ class _PlaylistWidgetState extends State<PlaylistWidget> {
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
context.s.homeMenuPlaylist, data.item1.name == 'Queue'
? context.s.queue
: '${context.s.homeMenuPlaylist}${'-${data.item1.name}'}',
overflow: TextOverflow.fade,
style: TextStyle( style: TextStyle(
color: context.accentColor, color: context.accentColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -551,8 +632,8 @@ class _PlaylistWidgetState extends State<PlaylistWidget> {
borderRadius: BorderRadius.all(Radius.circular(15)), borderRadius: BorderRadius.all(Radius.circular(15)),
onTap: () { onTap: () {
audio.playNext(); audio.playNext();
miniPlaylistKey.currentState miniPlaylistKey.currentState.removeItem(
.removeItem(0, (context, animation) => Container()); 0, (context, animation) => Container());
miniPlaylistKey.currentState.insertItem(0); miniPlaylistKey.currentState.insertItem(0);
}, },
child: SizedBox( child: SizedBox(
@ -574,10 +655,7 @@ class _PlaylistWidgetState extends State<PlaylistWidget> {
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
SlideLeftRoute( SlideLeftRoute(page: PlaylistHome()),
page: PlaylistPage(
initPage: InitPage.playlist,
)),
); );
}, },
child: SizedBox( child: SizedBox(
@ -598,6 +676,9 @@ class _PlaylistWidgetState extends State<PlaylistWidget> {
), ),
), ),
], ],
);
},
),
), ),
); );
} }
@ -613,6 +694,7 @@ class SleepMode extends StatefulWidget {
class SleepModeState extends State<SleepMode> class SleepModeState extends State<SleepMode>
with SingleTickerProviderStateMixin { with SingleTickerProviderStateMixin {
int _minSelected; int _minSelected;
bool _openClock;
AnimationController _controller; AnimationController _controller;
Animation<double> _animation; Animation<double> _animation;
Future _getDefaultTime() async { Future _getDefaultTime() async {
@ -626,7 +708,7 @@ class SleepModeState extends State<SleepMode>
super.initState(); super.initState();
_minSelected = 30; _minSelected = 30;
_getDefaultTime(); _getDefaultTime();
_openClock = false;
_controller = _controller =
AnimationController(vsync: this, duration: Duration(milliseconds: 400)); AnimationController(vsync: this, duration: Duration(milliseconds: 400));
_animation = Tween<double>(begin: 0.0, end: 1.0).animate(_controller) _animation = Tween<double>(begin: 0.0, end: 1.0).animate(_controller)
@ -707,12 +789,20 @@ class SleepModeState extends State<SleepMode>
padding: EdgeInsets.symmetric(vertical: 20), padding: EdgeInsets.symmetric(vertical: 20),
child: move == 1 child: move == 1
? Center() ? Center()
: _openClock
? SleepTimerPicker(
onChange: (duration) {
setState(() {
_minSelected = duration.inMinutes;
});
},
)
: Wrap( : Wrap(
direction: Axis.horizontal, direction: Axis.horizontal,
children: kMinsToSelect children: kMinsToSelect
.map((e) => InkWell( .map((e) => InkWell(
onTap: () => onTap: () => setState(
setState(() => _minSelected = e), () => _minSelected = e),
child: Container( child: Container(
margin: EdgeInsets.all(10.0), margin: EdgeInsets.all(10.0),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -726,8 +816,10 @@ class SleepModeState extends State<SleepMode>
width: 30, width: 30,
child: Text(e.toString(), child: Text(e.toString(),
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight:
color: (e == _minSelected) FontWeight.bold,
color:
(e == _minSelected)
? Colors.white ? Colors.white
: null)), : null)),
), ),
@ -849,17 +941,39 @@ class SleepModeState extends State<SleepMode>
height: 60.0, height: 60.0,
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 20.0), padding: EdgeInsets.symmetric(horizontal: 20.0),
child: Align( child: Row(
alignment: Alignment.centerLeft, children: [
child: Text( Text(context.s.sleepTimer,
context.s.sleepTimer,
style: TextStyle( style: TextStyle(
color: context.accentColor, color: context.accentColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 16), fontSize: 16)),
Spacer(),
Material(
borderRadius: BorderRadius.circular(100),
color: context.primaryColor,
child: InkWell(
borderRadius: BorderRadius.circular(15.0),
onTap: () {
setState(() {
_openClock = !_openClock;
});
},
child: SizedBox(
height: 30.0,
width: 30.0,
child: Icon(
_openClock
? LineIcons.circle_solid
: LineIcons.clock,
size: 20.0,
), ),
), ),
), ),
),
],
),
),
) )
], ],
), ),