From b68d736d92aa015230a7f604d85115a9c35c0984 Mon Sep 17 00:00:00 2001
From: stonega <xijieyin@gmail.com>
Date: Fri, 6 Nov 2020 22:04:08 +0800
Subject: [PATCH] Fixed issue, notification skip next  not work.

---
 lib/state/audio_state.dart | 53 +++++++++++++++++++++-----------------
 pubspec.yaml               |  6 +++--
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/lib/state/audio_state.dart b/lib/state/audio_state.dart
index a48c824..783e0bb 100644
--- a/lib/state/audio_state.dart
+++ b/lib/state/audio_state.dart
@@ -23,12 +23,12 @@ MediaControl pauseControl = MediaControl(
   label: 'Pause',
   action: MediaAction.pause,
 );
-MediaControl skipToNext = MediaControl(
+MediaControl skipToNextControl = MediaControl(
   androidIcon: 'drawable/baseline_skip_next_white_24',
   label: 'Next',
   action: MediaAction.skipToNext,
 );
-MediaControl skipToPrevious = MediaControl(
+MediaControl skipToPreviousControl = MediaControl(
   androidIcon: 'drawable/ic_action_skip_previous',
   label: 'Previous',
   action: MediaAction.skipToPrevious,
@@ -38,13 +38,13 @@ MediaControl stopControl = MediaControl(
   label: 'Stop',
   action: MediaAction.stop,
 );
-MediaControl forward = MediaControl(
+MediaControl forwardControl = MediaControl(
   androidIcon: 'drawable/baseline_fast_forward_white_24',
   label: 'forward',
   action: MediaAction.fastForward,
 );
 
-MediaControl rewind = MediaControl(
+MediaControl rewindControl = MediaControl(
   androidIcon: 'drawable/baseline_fast_rewind_white_24',
   label: 'rewind',
   action: MediaAction.rewind,
@@ -1111,32 +1111,37 @@ class AudioPlayerTask extends BackgroundAudioTask {
   List<MediaControl> _getControls(int index) {
     switch (index) {
       case 0:
-        if (_playing) {
-          return [pauseControl, forward, skipToNext, stopControl];
-        } else {
-          return [playControl, forward, skipToNext, stopControl];
-        }
+        return [
+          _playing ? pauseControl : playControl,
+          forwardControl,
+          skipToNextControl,
+          stopControl
+        ];
         break;
       case 1:
-        if (_playing) {
-          return [pauseControl, rewind, skipToNext, stopControl];
-        } else {
-          return [playControl, rewind, skipToNext, stopControl];
-        }
+        return [
+          _playing ? pauseControl : playControl,
+          rewindControl,
+          skipToNextControl,
+          stopControl
+        ];
         break;
       case 2:
-        if (_playing) {
-          return [rewind, pauseControl, forward, stopControl];
-        } else {
-          return [rewind, playControl, forward, stopControl];
-        }
+        return [
+          rewindControl,
+          _playing ? pauseControl : playControl,
+          forwardControl,
+          stopControl
+        ];
+
         break;
       default:
-        if (_playing) {
-          return [pauseControl, forward, skipToNext, stopControl];
-        } else {
-          return [playControl, forward, skipToNext, stopControl];
-        }
+        return [
+          _playing ? pauseControl : playControl,
+          forwardControl,
+          skipToNextControl,
+          stopControl
+        ];
         break;
     }
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 328cef0..532a702 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: tsacdop
 description: An open source podacasts player.
 
-version: 0.5.0+38
+version: 0.5.1+39
 
 environment:
   sdk: ">=2.6.0 <3.0.0"
@@ -30,7 +30,6 @@ dependencies:
   feature_discovery: ^0.12.1
   file_picker: ^2.0.11
   flutter_html: ^0.11.1
-  flutter_downloader: ^1.5.2
   fluttertoast: ^4.0.0
   flutter_isolate: ^1.0.0+14
   flutter_linkify: ^3.1.3
@@ -56,6 +55,9 @@ dependencies:
   xml: ^4.2.0
   workmanager: ^0.2.3
   wc_flutter_share: ^0.2.2
+  flutter_downloader:
+    git:
+      url: https://github.com/stonega/flutter_downloader.git
   audio_service:
     git:
       url: https://github.com/stonega/audio_service.git