-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
now we contruct player logic once then pass it who needs it, it fixes…
… the audio control problem
- Loading branch information
Showing
14 changed files
with
373 additions
and
273 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import 'package:flutter/material.dart'; | ||
|
|
||
| class ModelMiniPlayer extends ChangeNotifier{ | ||
| /* bool _miniPlayerShowing=true; | ||
| bool get miniPlayerShowing=>_miniPlayerShowing; | ||
| set miniPlayerShowing(bool isShowing){ | ||
| _miniPlayerShowing = isShowing; | ||
| notifyListeners(); | ||
| }*/ | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,176 +1,42 @@ | ||
| import 'dart:async'; | ||
| import 'package:Raylex/logic/models/playerStateNotify.dart'; | ||
| import 'package:Raylex/logic/models/playlistPosition.dart'; | ||
| import 'package:Raylex/logic/models/songInfo.dart'; | ||
| import 'package:Raylex/logic/playerLogic.dart'; | ||
| import 'dart:ui'; | ||
|
|
||
| import 'package:flutter/material.dart'; | ||
| import 'package:provider/provider.dart'; | ||
|
|
||
| class LibraryAppBar extends StatefulWidget { | ||
| @override | ||
| _LibraryAppBarState createState() => _LibraryAppBarState(); | ||
| } | ||
|
|
||
| class _LibraryAppBarState extends State<LibraryAppBar> with TickerProviderStateMixin { | ||
| AnimationController __animationController; | ||
| StreamSubscription __subscriptionPlayerStateChanged; | ||
| PlayerLogic _playerLogic; | ||
| bool isPlaying=false; | ||
| bool isActive=true; | ||
| PlayerStateNotify appstate; | ||
| //PlaylistPosition appstatepos; | ||
|
|
||
| @override | ||
| void didChangeDependencies(){ | ||
| super.didChangeDependencies(); | ||
| if(appstate==null) | ||
| appstate=Provider.of<PlayerStateNotify>(context); | ||
| //if(appstatepos==null) | ||
| //appstatepos = Provider.of<PlaylistPosition>(context); | ||
| //_playerLogic.getPlaylistPosition().then((value) => appstatepos.index = value); | ||
| print("didchangeddependencies library"); | ||
| if(__subscriptionPlayerStateChanged!=null){ | ||
| print("canceled onstatechangedSecondary"); | ||
| __subscriptionPlayerStateChanged.cancel(); | ||
| __subscriptionPlayerStateChanged = null; | ||
| }else{ | ||
| isActive = true; | ||
| _playerLogic.setMethodCallHandler(); | ||
| print("creating onstateSecondary"); | ||
| __subscriptionPlayerStateChanged = _playerLogic.onPlayerSecondaryStateChanged.handleError((e)=>print("streamerror $e")).listen((state) { | ||
| print("onStateChangedSecondary"); | ||
|
|
||
| if(state == true){ | ||
| setState(() { | ||
| isPlaying = true; | ||
| }); | ||
| __animationController.forward(); | ||
| } | ||
| if(state == false){ | ||
| setState(() { | ||
| isPlaying = false; | ||
| }); | ||
| __animationController.reverse(); | ||
| } | ||
|
|
||
| }); | ||
| } | ||
| _playerLogic.onInstanceIsPlaying().then((isP) { | ||
| setState(() { | ||
| isPlaying = isP; | ||
| }); | ||
| if(isP){ | ||
| __animationController.forward(from: __animationController.upperBound); | ||
| }else{ | ||
| __animationController.reverse(from: __animationController.lowerBound); | ||
| } | ||
| }); | ||
|
|
||
| } | ||
| class LibraryAppBar extends StatelessWidget{ | ||
|
|
||
| @override | ||
| void initState(){ | ||
| super.initState(); | ||
| print("library init"); | ||
| _playerLogic = PlayerLogic(); | ||
| __animationController = AnimationController( | ||
| vsync: this, | ||
| duration: Duration(milliseconds: 300), | ||
| ); | ||
| } | ||
|
|
||
|
|
||
| @override | ||
| void dispose(){ | ||
| super.dispose(); | ||
| print("library dispose"); | ||
| __animationController.dispose(); | ||
| __subscriptionPlayerStateChanged.cancel(); | ||
| //appstate.dispose(); | ||
| } | ||
| @override | ||
| Widget build(BuildContext context) { | ||
| return AppBar( | ||
| backgroundColor: Colors.lightBlue, | ||
| flexibleSpace: SafeArea( | ||
| return SafeArea( | ||
| bottom: false, | ||
| child: Container( | ||
| margin: EdgeInsets.fromLTRB(20, 20, 20, 20), | ||
| alignment: Alignment.bottomLeft, | ||
| height: 200, | ||
| child: Row( | ||
| mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||
| children: <Widget>[ | ||
| Container( | ||
| margin: EdgeInsets.only(bottom: 2), | ||
| child: Text( | ||
| "Library", | ||
| style: TextStyle( | ||
| color: Colors.white, | ||
| fontSize: 27, | ||
| fontWeight: FontWeight.bold | ||
| ) | ||
| ), | ||
| ), | ||
| Row( | ||
| top: false, | ||
| child: ClipRRect( | ||
| child: BackdropFilter( | ||
| filter: ImageFilter.blur(sigmaX: 10.0, sigmaY: 10.0), | ||
| child: Container( | ||
| color: Colors.lightBlue.withAlpha(200), | ||
| alignment: Alignment.bottomLeft, | ||
| height: 100, | ||
| child: Row( | ||
| mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||
| children: <Widget>[ | ||
| IconButton( | ||
| icon: Icon( | ||
| Icons.fast_rewind, | ||
| color: Colors.white, | ||
| ), | ||
| onPressed: (){ | ||
| if(appstate.songinfos!=null && appstate.songinfos.isNotEmpty){ | ||
| _playerLogic.prevSong(appstate.songinfos); | ||
| //appstatepos.index=appstatepos.index-1; | ||
| } | ||
| else | ||
| print("error prev"); | ||
| } | ||
| ), | ||
| IconButton( | ||
| iconSize: 35, | ||
| icon: AnimatedIcon( | ||
| icon: AnimatedIcons.play_pause, | ||
| progress: __animationController, | ||
| color: Colors.white, | ||
| ), | ||
| onPressed: (){ | ||
| if(isPlaying){ | ||
| setState(() { | ||
| isPlaying = false; | ||
| }); | ||
| _playerLogic.pauseMusic(); | ||
| __animationController.reverse(); | ||
| } | ||
| else{ | ||
| setState(() { | ||
| isPlaying = true; | ||
| }); | ||
| _playerLogic.playPausedMusic(); | ||
| //__animationController.forward(); | ||
| } | ||
| } | ||
| ), | ||
| IconButton( | ||
| icon: Icon( | ||
| Icons.fast_forward,color: Colors.white, | ||
| Container( | ||
| margin: EdgeInsets.fromLTRB(20, 20, 20, 20), | ||
| child: Text( | ||
| "Library", | ||
| style: TextStyle( | ||
| color: Colors.white, | ||
| fontSize: 27, | ||
| fontWeight: FontWeight.bold | ||
| ) | ||
| ), | ||
| onPressed: (){ | ||
| if(appstate.songinfos!=null && appstate.songinfos.isNotEmpty){ | ||
| _playerLogic.nextSong(appstate.songinfos); | ||
| //appstatepos.index = appstatepos.index + 1; | ||
| } | ||
| else | ||
| print("error next"); | ||
| } | ||
| ), | ||
| ], | ||
| ) | ||
| ], | ||
| ) | ||
| ] | ||
| ) | ||
| ), | ||
| ), | ||
| ) | ||
| ), | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.