From d5f41f3cb985d88dd52997ec1358bf5b8637c594 Mon Sep 17 00:00:00 2001
From: chuongvd <vuduychuong1994@gmail.com>
Date: Mon, 22 Jul 2019 21:01:09 +0700
Subject: [PATCH 1/4] add notification ios when playing

---
 .gitignore                                    |   2 +
 android/.project                              |  17 ++
 .../org.eclipse.buildship.core.prefs          |  13 +
 android/build.gradle                          |   7 +-
 android/src/main/AndroidManifest.xml          |   1 -
 .../rxla/audioplayer/AudioplayerPlugin.java   |  17 +-
 example/android/app/build.gradle              |   2 +-
 .../android/app/src/main/AndroidManifest.xml  |   2 +-
 .../rxla/audioplayerexample/MainActivity.java |   2 +-
 example/android/gradle.properties             |   1 +
 .../ios/Flutter/flutter_export_environment.sh |  10 +
 example/ios/Runner.xcodeproj/project.pbxproj  |  29 +-
 example/lib/main.dart                         |   2 +-
 ios/Classes/AudioPlayerNotification.h         |  32 +++
 ios/Classes/AudioPlayerNotification.m         | 247 ++++++++++++++++++
 ios/Classes/AudioplayerPlugin.m               | 151 ++++++++---
 ios/Classes/NSString+Extension.h              |  24 ++
 ios/Classes/NSString+Extension.m              |  69 +++++
 lib/audioplayer.dart                          |   2 +
 19 files changed, 563 insertions(+), 67 deletions(-)
 create mode 100644 android/.project
 create mode 100644 android/.settings/org.eclipse.buildship.core.prefs
 create mode 100755 example/ios/Flutter/flutter_export_environment.sh
 create mode 100644 ios/Classes/AudioPlayerNotification.h
 create mode 100644 ios/Classes/AudioPlayerNotification.m
 create mode 100644 ios/Classes/NSString+Extension.h
 create mode 100644 ios/Classes/NSString+Extension.m

diff --git a/.gitignore b/.gitignore
index 92f1318..88087ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ build/
 ios/.generated/
 packages
 pubspec.lock
+example/android/**
+**/android/.project
 
 Podfile
 Podfile.lock
diff --git a/android/.project b/android/.project
new file mode 100644
index 0000000..b6ece59
--- /dev/null
+++ b/android/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android__</name>
+	<comment>Project android__ created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000..7a23d11
--- /dev/null
+++ b/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(5.6.1))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true
diff --git a/android/build.gradle b/android/build.gradle
index 14d1a1f..80c8fd8 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,11 +21,12 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.3'
 
-    defaultConfig {
+  defaultConfig {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
+      minSdkVersion 16
+    targetSdkVersion 21
+  }
     lintOptions {
         disable 'InvalidPackage'
     }
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 520ab75..a73c4a3 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -3,5 +3,4 @@
   android:versionCode="1"
   android:versionName="0.1.0">
 
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
 </manifest>
diff --git a/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java b/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java
index 5f47e51..d07b7e0 100644
--- a/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java
+++ b/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java
@@ -1,20 +1,16 @@
 package bz.rxla.audioplayer;
 
+import android.content.Context;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
+import android.os.Build;
 import android.os.Handler;
 import android.util.Log;
+import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
-import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
-
 import java.io.IOException;
-import java.util.HashMap;
-
-import android.content.Context;
-import android.os.Build;
 
 /**
  * Android implementation for AudioPlayerPlugin.
@@ -43,7 +39,12 @@ private AudioplayerPlugin(Registrar registrar, MethodChannel channel) {
   public void onMethodCall(MethodCall call, MethodChannel.Result response) {
     switch (call.method) {
       case "play":
-        play(call.argument("url").toString());
+        Object url = call.argument("url");
+        if (url instanceof String) {
+          play((String) url);
+        } else {
+          play("");
+        }
         response.success(null);
         break;
       case "pause":
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 15c153b..ea9f091 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -33,7 +33,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "bz.rxla.audioplayerexample"
+        applicationId "com.chuongvd.audioplayerExample"
         minSdkVersion 16
         targetSdkVersion 27
         versionCode flutterVersionCode.toInteger()
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 8d127cb..e4ba1ff 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="bz.rxla.audioplayerexample">
+    package="com.chuongvd.audioplayerExample">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
diff --git a/example/android/app/src/main/java/bz/rxla/audioplayerexample/MainActivity.java b/example/android/app/src/main/java/bz/rxla/audioplayerexample/MainActivity.java
index e4e5180..ee22508 100644
--- a/example/android/app/src/main/java/bz/rxla/audioplayerexample/MainActivity.java
+++ b/example/android/app/src/main/java/bz/rxla/audioplayerexample/MainActivity.java
@@ -1,4 +1,4 @@
-package bz.rxla.audioplayerexample;
+package com.chuongvd.audioplayerExample;
 
 import android.os.Bundle;
 import io.flutter.app.FlutterActivity;
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 8bd86f6..7be3d8b 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
new file mode 100755
index 0000000..7d6b606
--- /dev/null
+++ b/example/ios/Flutter/flutter_export_environment.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=/Users/chuongvd/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/chuongvd/Documents/ws-quangich/flutter/ritc/audioplayer/example"
+export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "FLUTTER_FRAMEWORK_DIR=/Users/chuongvd/flutter/bin/cache/artifacts/engine/ios"
+export "FLUTTER_BUILD_NAME=2.0.0"
+export "FLUTTER_BUILD_NUMBER=2.0.0"
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index 5bda733..8996e73 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -39,9 +38,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0E58CB8CF10A593C5511B6A8 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -56,7 +55,9 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		D3E3E21847E82C9CF2275302 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		E48D0AE7188E1F579859BC6E /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E994614AE4D3BF2261BA365E /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -76,6 +77,9 @@
 		1297BB7B33D227B1444646AE /* Pods */ = {
 			isa = PBXGroup;
 			children = (
+				E994614AE4D3BF2261BA365E /* Pods-Runner.debug.xcconfig */,
+				0E58CB8CF10A593C5511B6A8 /* Pods-Runner.release.xcconfig */,
+				D3E3E21847E82C9CF2275302 /* Pods-Runner.profile.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -91,7 +95,6 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -181,7 +184,7 @@
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = 2P474ERK4G;
+						DevelopmentTeam = XU2L9699JF;
 					};
 				};
 			};
@@ -190,6 +193,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -212,7 +216,6 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -254,7 +257,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
 				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -263,7 +266,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		F03958679560A770F25AD138 /* [CP] Check Pods Manifest.lock */ = {
@@ -373,7 +376,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 2P474ERK4G;
+				DEVELOPMENT_TEAM = XU2L9699JF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -385,7 +388,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = bz.rxla.audioplayerExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.chuongvd.audioplayerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -499,7 +502,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 2P474ERK4G;
+				DEVELOPMENT_TEAM = XU2L9699JF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -511,7 +514,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = bz.rxla.audioplayerExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.chuongvd.audioplayerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -523,7 +526,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 2P474ERK4G;
+				DEVELOPMENT_TEAM = XU2L9699JF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -535,7 +538,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = bz.rxla.audioplayerExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.chuongvd.audioplayerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 7cba5c8..4167e70 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -84,7 +84,7 @@ class _AudioAppState extends State<AudioApp> {
   }
 
   Future play() async {
-    await audioPlayer.play(kUrl);
+    await audioPlayer.play("https://5a6872aace0ce.streamlock.net/nghevov3/vov3.stream_aac/chunklist_w981158175.m3u8");
     setState(() {
       playerState = PlayerState.playing;
     });
diff --git a/ios/Classes/AudioPlayerNotification.h b/ios/Classes/AudioPlayerNotification.h
new file mode 100644
index 0000000..ed75d2b
--- /dev/null
+++ b/ios/Classes/AudioPlayerNotification.h
@@ -0,0 +1,32 @@
+//
+//  AudioPlayerNotification.h
+//  audioplayer
+//
+//  Created by Chuong Vu Duy on 7/9/19.
+//
+
+#import <Foundation/Foundation.h>
+#import <AVFoundation/AVFoundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AudioPlayerNotification : NSObject
+@property(nonatomic, strong) AVQueuePlayer *avQueuePlayer;
+@property(nonatomic, strong) NSURL *currentUrl;
+//initialize the audio session
++(void) initSession;
++(void) endSession;
+-(void) playSongWithUrl:(NSURL *)url;
+-(void) playSongWithItem:(AVPlayerItem *)url;
+-(void) playSongWithUrl:(NSURL *)url songTitle:(NSString *)songTitle artist:(NSString *)artist;
+-(void) playSongWithItem:(AVPlayerItem *)url songTitle:(NSString *)songTitle artist:(NSString *)artist;
+-(void) setMediaItem:(NSDictionary *)arguments;
+-(void) pause;
+-(void) play;
+-(void) stop;
+-(void) clear;
+-(void) dispose;
+- (void)setCommandState:(int)state;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/ios/Classes/AudioPlayerNotification.m b/ios/Classes/AudioPlayerNotification.m
new file mode 100644
index 0000000..0620b31
--- /dev/null
+++ b/ios/Classes/AudioPlayerNotification.m
@@ -0,0 +1,247 @@
+//
+//  AudioPlayerNotification.m
+//  audioplayer
+//
+//  Created by Chuong Vu Duy on 7/9/19.
+//
+
+#import "AudioPlayerNotification.h"
+#import <MediaPlayer/MediaPlayer.h>
+#import "NSString+Extension.h"
+
+@implementation AudioPlayerNotification
+
+
++ (void)initSession {
+    NSLog(@"AudioPlayerNotification initSession");
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector:    @selector(audioSessionInterrupted:)
+                                                 name:        AVAudioSessionInterruptionNotification
+                                               object:      [AVAudioSession sharedInstance]];
+    [[UIApplication sharedApplication] beginReceivingRemoteControlEvents];
+    [[UIApplication sharedApplication] becomeFirstResponder];
+    //set audio category with options - for this demo we'll do playback only
+    NSError *categoryError = nil;
+    [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryPlayback error:&categoryError];
+
+    if (categoryError) {
+        NSLog(@"Error setting category! %@", [categoryError description]);
+    }
+
+    //activation of audio session
+    NSError *activationError = nil;
+    BOOL success = [[AVAudioSession sharedInstance] setActive: YES error: &activationError];
+    if (!success) {
+        if (activationError) {
+            NSLog(@"Could not activate audio session. %@", [activationError localizedDescription]);
+        } else {
+            NSLog(@"audio session could not be activated!");
+        }
+    }
+}
+
++ (void)endSession {
+    NSLog(@"AudioPlayerNotification endSession");
+    [[NSNotificationCenter defaultCenter] removeObserver: self
+                                                    name:        AVAudioSessionInterruptionNotification
+                                                  object:      [AVAudioSession sharedInstance]];
+    //set audio category with options - for this demo we'll do playback only
+    NSError *categoryError = nil;
+    [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryPlayback error:&categoryError];
+
+    if (categoryError) {
+        NSLog(@"Error setting category! %@", [categoryError description]);
+    }
+
+    //activation of audio session
+    NSError *activationError = nil;
+    BOOL success = [[AVAudioSession sharedInstance] setActive:NO error: &activationError];
+    if (!success) {
+        if (activationError) {
+            NSLog(@"Could not activate audio session. %@", [activationError localizedDescription]);
+        } else {
+            NSLog(@"audio session could not be activated!");
+        }
+    }
+}
+
+- (void)playSongWithUrl:(NSURL *)url {
+    if (url) {
+        AVPlayerItem *avSongItem = [[AVPlayerItem alloc] initWithURL:url];
+        [self playSongWithItem:avSongItem];
+    } else {
+        NSLog(@"ERROR: url not found: %@", url);
+    }
+}
+
+- (void)playSongWithItem:(AVPlayerItem *)avSongItem {
+    if (avSongItem) {
+        self.currentUrl = [avSongItem.asset isKindOfClass:AVURLAsset.class] ? [(AVURLAsset *)avSongItem.asset URL] : [[NSURL alloc] init];
+        if (![[self avQueuePlayer] canInsertItem:avSongItem afterItem:nil]) return;
+        [[self avQueuePlayer] insertItem:avSongItem afterItem:nil];
+        [self play];
+        // Set command center
+        [self setCommandState:3];
+        MPRemoteCommandCenter *commandCenter = [MPRemoteCommandCenter sharedCommandCenter];
+        [[commandCenter playCommand] addTargetWithHandler:^MPRemoteCommandHandlerStatus(MPRemoteCommandEvent * _Nonnull event) {
+            if (self.avQueuePlayer && !self.avQueuePlayer.currentItem) {
+                [self playSongWithUrl:self.currentUrl];
+            } else {
+                [self setCommandState:3];
+                [self play];
+            }
+            return MPRemoteCommandHandlerStatusSuccess;
+        }];
+        [[commandCenter pauseCommand] addTargetWithHandler:^MPRemoteCommandHandlerStatus(MPRemoteCommandEvent * _Nonnull event) {
+            [self setCommandState:1];
+            [self pause];
+            return MPRemoteCommandHandlerStatusSuccess;
+        }];
+        [[commandCenter stopCommand] addTargetWithHandler:^MPRemoteCommandHandlerStatus(MPRemoteCommandEvent * _Nonnull event) {
+            [self setCommandState:1];
+            [self stop];
+            [self clear];
+            return MPRemoteCommandHandlerStatusSuccess;
+        }];
+    }
+}
+
+-(void) playSongWithUrl:(NSURL*)url songTitle:(NSString*)songTitle artist:(NSString*)artist
+{
+    if (url) {
+        AVPlayerItem *avSongItem = [[AVPlayerItem alloc] initWithURL:url];
+        [self playSongWithItem:avSongItem songTitle:songTitle artist:artist];
+    } else {
+        NSLog(@"ERROR: url not found: %@", url);
+    }
+}
+
+- (void)playSongWithItem:(AVPlayerItem *)avSongItem songTitle:(NSString *)songTitle artist:(NSString *)artist {
+    if (avSongItem) {
+        self.currentUrl = [avSongItem.asset isKindOfClass:AVURLAsset.class] ? [(AVURLAsset *)avSongItem.asset URL] : [[NSURL alloc] init];
+        if (![[self avQueuePlayer] canInsertItem:avSongItem afterItem:nil]) return;
+        [[self avQueuePlayer] insertItem:avSongItem afterItem:nil];
+        [self play];
+        
+        // Set Song Info
+        NSDictionary *songInfo = @{MPMediaItemPropertyTitle: songTitle,
+                                   MPMediaItemPropertyArtist: artist
+        };
+        [MPNowPlayingInfoCenter defaultCenter].nowPlayingInfo = songInfo;
+        
+        // Set command center
+         [self setCommandState:3];
+        MPRemoteCommandCenter *commandCenter = [MPRemoteCommandCenter sharedCommandCenter];
+        [[commandCenter pauseCommand] addTargetWithHandler:^MPRemoteCommandHandlerStatus(MPRemoteCommandEvent * _Nonnull event) {
+            [self pause];
+            return MPRemoteCommandHandlerStatusSuccess;
+        }];
+        [[commandCenter playCommand] addTargetWithHandler:^MPRemoteCommandHandlerStatus(MPRemoteCommandEvent * _Nonnull event) {
+            if (self.avQueuePlayer && CMTimeGetSeconds(self.avQueuePlayer.currentTime) == 0) {
+                [self playSongWithUrl:self.currentUrl songTitle:songTitle artist:artist];
+            }
+            [self play];
+            return MPRemoteCommandHandlerStatusSuccess;
+        }];
+    }
+}
+
+- (void)setMediaItem:(NSDictionary *)arguments {
+    NSString *title = [arguments objectForKey:@"title"];
+    NSString *artist = [arguments objectForKey:@"artist"];
+    // Set Song Info
+    NSMutableDictionary *songInfo = [[NSMutableDictionary alloc] init];
+    if (![NSString isNilOrEmpty:title]) [songInfo setValue:title forKey:MPMediaItemPropertyTitle];
+    if (![NSString isNilOrEmpty:artist]) [songInfo setValue:artist forKey:MPMediaItemPropertyArtist];
+    if (@available(iOS 10.0, *)) {
+        [songInfo setValue:[NSNumber numberWithBool:YES] forKey:MPNowPlayingInfoPropertyIsLiveStream];
+    } else {
+        // Fallback on earlier versions
+    }
+    [MPNowPlayingInfoCenter defaultCenter].nowPlayingInfo = songInfo;
+}
+
+#pragma mark - notifications
++ (void) audioSessionInterrupted:(NSNotification*)interruptionNotification
+{
+    NSLog(@"interruption received: %@", interruptionNotification);
+}
+
+#pragma mark - player actions
+- (void) pause {
+    [[self avQueuePlayer] pause];
+}
+
+- (void) play {
+    [[self avQueuePlayer] play];
+}
+
+- (void)stop {
+    [self.avQueuePlayer pause];
+    [self.avQueuePlayer seekToTime:CMTimeMake(0, 1)];
+    [self.avQueuePlayer setRate:0];
+}
+
+- (void) clear {
+    [[self avQueuePlayer] removeAllItems];
+}
+
+- (void)setCommandState:(int)state {
+    MPRemoteCommandCenter *commandCenter = [MPRemoteCommandCenter sharedCommandCenter];
+    switch (state) {
+        case 1:
+        {
+        [[commandCenter previousTrackCommand] setEnabled:NO];
+        [[commandCenter nextTrackCommand] setEnabled:NO];
+        [[commandCenter togglePlayPauseCommand] setEnabled:NO];
+        [[commandCenter seekForwardCommand] setEnabled:NO];
+        [[commandCenter seekBackwardCommand] setEnabled:NO];
+        [[commandCenter playCommand] setEnabled:YES];
+        [[commandCenter pauseCommand] setEnabled:NO];
+        [[commandCenter stopCommand] setEnabled:NO];
+        }
+            break;
+        case 2:
+        {
+        [[commandCenter previousTrackCommand] setEnabled:NO];
+        [[commandCenter nextTrackCommand] setEnabled:NO];
+        [[commandCenter togglePlayPauseCommand] setEnabled:NO];
+        [[commandCenter seekForwardCommand] setEnabled:NO];
+        [[commandCenter seekBackwardCommand] setEnabled:NO];
+        [[commandCenter playCommand] setEnabled:YES];
+        [[commandCenter pauseCommand] setEnabled:NO];
+        [[commandCenter stopCommand] setEnabled:NO];
+        }
+            break;
+        case 3:
+        {
+        [[commandCenter previousTrackCommand] setEnabled:NO];
+        [[commandCenter nextTrackCommand] setEnabled:NO];
+        [[commandCenter togglePlayPauseCommand] setEnabled:NO];
+        [[commandCenter seekForwardCommand] setEnabled:NO];
+        [[commandCenter seekBackwardCommand] setEnabled:NO];
+        [[commandCenter playCommand] setEnabled:NO];
+        [[commandCenter pauseCommand] setEnabled:NO];
+        [[commandCenter stopCommand] setEnabled:YES];
+        }
+            break;
+        default:
+            break;
+    }
+}
+
+- (void) dispose {
+    [[UIApplication sharedApplication] endReceivingRemoteControlEvents];
+    [[UIApplication sharedApplication] resignFirstResponder];
+}
+
+- (AVPlayer *)avQueuePlayer {
+    if (!_avQueuePlayer) {
+        _avQueuePlayer = [[AVQueuePlayer alloc]init];
+    }
+
+    return _avQueuePlayer;
+}
+
+
+@end
diff --git a/ios/Classes/AudioplayerPlugin.m b/ios/Classes/AudioplayerPlugin.m
index fa6bf5e..be2d3f3 100644
--- a/ios/Classes/AudioplayerPlugin.m
+++ b/ios/Classes/AudioplayerPlugin.m
@@ -2,13 +2,17 @@
 #import <UIKit/UIKit.h>
 #import <AVKit/AVKit.h>
 #import <AVFoundation/AVFoundation.h>
+#import "AudioPlayerNotification.h"
+#import "Constants.h"
 
 static NSString *const CHANNEL_NAME = @"bz.rxla.flutter/audio";
 static FlutterMethodChannel *channel;
-static AVPlayer *player;
+//static AVPlayer *player;
 static AVPlayerItem *playerItem;
 
 @interface AudioplayerPlugin()
+@property(nonatomic,strong) AudioPlayerNotification *musicPlayer;
+
 -(void)pause;
 -(void)stop;
 -(void)mute:(BOOL)muted;
@@ -35,6 +39,17 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
     _channel = channel;
 }
 
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pause) name:MEDIA_ACTION_PAUSE object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(play) name:MEDIA_ACTION_PLAY object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(stop) name:MEDIA_ACTION_STOP object:nil];
+    }
+    return self;
+}
+
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     typedef void (^CaseBlock)(void);
     // Squint and this looks like a proper switch!
@@ -78,8 +93,9 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
 
 - (void)play:(NSString*)url isLocal:(int)isLocal {
     if (![url isEqualToString:lastUrl]) {
+        
         [playerItem removeObserver:self
-                        forKeyPath:@"player.currentItem.status"];
+                        forKeyPath:@"status"];
         
         for (id ob in observers) {
             [[NSNotificationCenter defaultCenter] removeObserver:ob];
@@ -93,42 +109,47 @@ - (void)play:(NSString*)url isLocal:(int)isLocal {
         }
         lastUrl = url;
         
-        id anobserver = [[NSNotificationCenter defaultCenter] addObserverForName:AVPlayerItemDidPlayToEndTimeNotification
-                                                                          object:playerItem
-                                                                           queue:nil
-                                                                      usingBlock:^(NSNotification* note){
-                                                                          [self stop];
-                                                                          [_channel invokeMethod:@"audio.onComplete" arguments:nil];
-                                                                      }];
+        id anobserver = [[NSNotificationCenter defaultCenter] addObserverForName:AVPlayerItemDidPlayToEndTimeNotification object:playerItem queue:nil usingBlock:^(NSNotification* note){
+            [self stop];
+            [_channel invokeMethod:@"audio.onComplete" arguments:nil];
+        }];
         [observers addObject:anobserver];
         
-        if (player) {
-            [player replaceCurrentItemWithPlayerItem:playerItem];
+        [AudioPlayerNotification initSession];
+        if (self.musicPlayer.avQueuePlayer) {
+            [self.musicPlayer.avQueuePlayer replaceCurrentItemWithPlayerItem:playerItem];
         } else {
-            player = [[AVPlayer alloc] initWithPlayerItem:playerItem];
+            if (!self.musicPlayer) {
+                self.musicPlayer = [[AudioPlayerNotification alloc] init];
+            }
             // Stream player position.
             // This call is only active when the player is active so there's no need to
             // remove it when player is paused or stopped.
+            __weak typeof(self) weakSelf = self;
             CMTime interval = CMTimeMakeWithSeconds(0.2, NSEC_PER_SEC);
-            id timeObserver = [player addPeriodicTimeObserverForInterval:interval queue:nil usingBlock:^(CMTime time){
-                [self onTimeInterval:time];
+            id timeObserver = [self.musicPlayer.avQueuePlayer addPeriodicTimeObserverForInterval:interval queue:nil usingBlock:^(CMTime time){
+                [weakSelf onTimeInterval:time];
             }];
             [timeobservers addObject:timeObserver];
         }
         
         // is sound ready
-        [[player currentItem] addObserver:self
-                               forKeyPath:@"player.currentItem.status"
-                                  options:0
-                                  context:nil];
+        [playerItem addObserver:self forKeyPath:@"status" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
+        [playerItem addObserver:self forKeyPath:@"playbackBufferEmpty" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
+        [playerItem addObserver:self forKeyPath:@"playbackLikelyToKeepUp" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
+        [playerItem addObserver:self forKeyPath:@"playbackBufferFull" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
+
+        [self.musicPlayer.avQueuePlayer addObserver:self forKeyPath:@"currentItem" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
+        [self.musicPlayer.avQueuePlayer addObserver:self forKeyPath:@"timeControlStatus" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
     }
     [self onStart];
-    [player play];
+    [self.musicPlayer playSongWithItem:playerItem];
+    //    [player play];
     isPlaying = true;
 }
 
 - (void)onStart {
-    CMTime duration = [[player currentItem] duration];
+    CMTime duration = [[self.musicPlayer.avQueuePlayer currentItem] duration];
     if (CMTimeGetSeconds(duration) > 0) {
         int mseconds= CMTimeGetSeconds(duration)*1000;
         [_channel invokeMethod:@"audio.onStart" arguments:@(mseconds)];
@@ -140,51 +161,105 @@ - (void)onTimeInterval:(CMTime)time {
     [_channel invokeMethod:@"audio.onCurrentPosition" arguments:@(mseconds)];
 }
 
+- (void)play {
+    [self.musicPlayer play];
+    isPlaying = true;
+    [_channel invokeMethod:@"audio.onPlay" arguments:nil];
+}
+
 - (void)pause {
-    [player pause];
+    [self.musicPlayer pause];
     isPlaying = false;
     [_channel invokeMethod:@"audio.onPause" arguments:nil];
 }
 
 - (void)stop {
-    if (isPlaying) {
-        [player pause];
-        isPlaying = false;
-    }
-    [playerItem seekToTime:CMTimeMake(0, 1)];
+    isPlaying = false;
+    [self.musicPlayer stop];
+    [self.musicPlayer clear];
+    [AudioPlayerNotification endSession];
+    [[NSNotificationCenter defaultCenter] postNotificationName:MEDIA_ACTION_CHANGE_STATE object:nil userInfo:@{@"data": @[@1, @547, @0, @1.0, [self getCurrentTimeInMilis]]}];
     [_channel invokeMethod:@"audio.onStop" arguments:nil];
 }
 
 - (void)mute:(BOOL)muted {
-    player.muted = muted;
+    self.musicPlayer.avQueuePlayer.muted = muted;
 }
 
 - (void)seek:(CMTime)time {
     [playerItem seekToTime:time];
 }
 
+- (NSNumber *)getCurrentPosition {
+    if (!self.musicPlayer || !self.musicPlayer.avQueuePlayer || !self.musicPlayer.avQueuePlayer.currentItem) return [NSNumber numberWithLong:0];
+    long currentPosition = (long) 1000 * CMTimeGetSeconds([self.musicPlayer.avQueuePlayer.currentItem currentTime]);
+    return [NSNumber numberWithLong: currentPosition];
+}
+
+- (NSNumber *)getCurrentTimeInMilis {
+    long currentTimeInMilis = (long) 1000 * [[NSDate date] timeIntervalSince1970];
+    return [NSNumber numberWithLong: currentTimeInMilis];
+}
+
 - (void)observeValueForKeyPath:(NSString *)keyPath
                       ofObject:(id)object
                         change:(NSDictionary *)change
                        context:(void *)context {
-    if ([keyPath isEqualToString:@"player.currentItem.status"]) {
-        if ([[player currentItem] status] == AVPlayerItemStatusReadyToPlay) {
+    if (!self.musicPlayer.avQueuePlayer) return;
+    if (object == self.musicPlayer.avQueuePlayer.currentItem && [@"status" isEqualToString:keyPath]) {
+        if ([[self.musicPlayer.avQueuePlayer currentItem] status] == AVPlayerItemStatusReadyToPlay) {
+            [self.musicPlayer setMediaItem:@{@"title": @"Test title new", @"artist": @"Chuongvd"}];
             [self onStart];
-        } else if ([[player currentItem] status] == AVPlayerItemStatusFailed) {
-            [_channel invokeMethod:@"audio.onError" arguments:@[(player.currentItem.error.localizedDescription)]];
+        } else if ([[self.musicPlayer.avQueuePlayer currentItem] status] == AVPlayerItemStatusFailed) {
+            [_channel invokeMethod:@"audio.onError" arguments:@[(self.musicPlayer.avQueuePlayer.currentItem.error.localizedDescription)]];
+        }
+    }
+
+    if (object == self.musicPlayer.avQueuePlayer.currentItem && [@"playbackBufferEmpty" isEqualToString:keyPath]) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:MEDIA_ACTION_CHANGE_STATE object:nil userInfo:@{@"data": @[@6, @547, [self getCurrentPosition], @1.0, [self getCurrentTimeInMilis]]}];
+        NSLog(@"buffering...");
+    }
+
+    if (object == self.musicPlayer.avQueuePlayer.currentItem && [@"playbackLikelyToKeepUp" isEqualToString:keyPath]) {
+        NSLog(@"buffering ends...");
+    }
+
+    if (object == self.musicPlayer.avQueuePlayer.currentItem && [@"playbackBufferFull" isEqualToString:keyPath]) {
+        NSLog(@"buffering is hidden...");
+    }
+
+    if (object == self.musicPlayer.avQueuePlayer && [@"timeControlStatus" isEqualToString:keyPath]) {
+        if (@available(iOS 10.0, *)) {
+            switch (self.musicPlayer.avQueuePlayer.timeControlStatus) {
+                case AVPlayerTimeControlStatusPlaying:
+                {
+                NSLog(@"Playing...");
+                [[NSNotificationCenter defaultCenter] postNotificationName:MEDIA_ACTION_CHANGE_STATE object:nil userInfo:@{@"data": @[@3, @547, [self getCurrentPosition], @1.0, [self getCurrentTimeInMilis]]}];
+                break;
+                }
+                case AVPlayerTimeControlStatusPaused:
+                {
+                NSLog(@"Paused");
+                [[NSNotificationCenter defaultCenter] postNotificationName:MEDIA_ACTION_CHANGE_STATE object:nil userInfo:@{@"data": @[@2, @547, [self getCurrentPosition], @1.0, [self getCurrentTimeInMilis]]}];
+                break;
+                }
+                case AVPlayerTimeControlStatusWaitingToPlayAtSpecifiedRate:
+                    NSLog(@"AVPlayerTimeControlStatusWaitingToPlayAtSpecifiedRate");
+                    break;
+                default:
+                    break;
+            }
+        } else {
+            // Fallback on earlier versions
         }
-    } else {
-        // Any unrecognized context must belong to super
-        [super observeValueForKeyPath:keyPath
-                             ofObject:object
-                               change:change
-                              context:context];
     }
 }
 
 - (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
     for (id ob in timeobservers) {
-        [player removeTimeObserver:ob];
+        [self.musicPlayer.avQueuePlayer removeTimeObserver:ob];
     }
     timeobservers = nil;
     
diff --git a/ios/Classes/NSString+Extension.h b/ios/Classes/NSString+Extension.h
new file mode 100644
index 0000000..553cff3
--- /dev/null
+++ b/ios/Classes/NSString+Extension.h
@@ -0,0 +1,24 @@
+//
+//  NSString+Extension.h
+//  Runner
+//
+//  Created by Chuong Vu Duy on 10/2/19.
+//  Copyright © 2019 The Chromium Authors. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSString (Extension)
+
++ (BOOL)isNilOrEmpty:(NSString*)aString;
+
++ (BOOL)containUnsign: (NSString *)data compareText:(NSString *)text;
+
++ (BOOL)isNewAppVersion: (NSString *)currentVersion :(NSString *)remoteVersion;
+
++ (NSString *)getShortName:(NSString *)fullName;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/ios/Classes/NSString+Extension.m b/ios/Classes/NSString+Extension.m
new file mode 100644
index 0000000..9dd346d
--- /dev/null
+++ b/ios/Classes/NSString+Extension.m
@@ -0,0 +1,69 @@
+//
+//  NSString+Extension.m
+//  Runner
+//
+//  Created by Chuong Vu Duy on 10/2/19.
+//  Copyright © 2019 The Chromium Authors. All rights reserved.
+//
+
+#import "NSString+Extension.h"
+
+@implementation NSString (Extension)
+
++ (BOOL)isNilOrEmpty:(NSString*)aString {
+    if ([aString isKindOfClass:NSNull.class]) return YES;
+    return !(aString && [NSString stringWithFormat:@"%@", aString].length);
+}
+
++ (BOOL)containUnsign: (NSString *)data compareText:(NSString *)text {
+    if ([self isNilOrEmpty:data] || [self isNilOrEmpty:text]) return NO;
+    return [[data toLowerAndUnsign:data] containsString:[text toLowerAndUnsign:text]];
+}
+
+- (NSString *)toLowerAndUnsign: (NSString *) data{
+    NSError *error = nil;
+    data = [data lowercaseString];
+    NSRegularExpression *regexA = [NSRegularExpression regularExpressionWithPattern:@"/à|á|ạ|ả|ã|â|ầ|ấ|ậ|ẩ|ẫ|ă|ằ|ắ|ặ|ẳ|ẵ/g" options:NSRegularExpressionCaseInsensitive error:&error];
+    data = [regexA stringByReplacingMatchesInString:data options:0 range:NSMakeRange(0, [data length]) withTemplate:@"a"];
+    NSRegularExpression *regexE = [NSRegularExpression regularExpressionWithPattern:@"/è|é|ẹ|ẻ|ẽ|ê|ề|ế|ệ|ể|ễ/g" options:NSRegularExpressionCaseInsensitive error:&error];
+    data = [regexE stringByReplacingMatchesInString:data options:0 range:NSMakeRange(0, [data length]) withTemplate:@"e"];
+    NSRegularExpression *regexI = [NSRegularExpression regularExpressionWithPattern:@"/ì|í|ị|ỉ|ĩ/g" options:NSRegularExpressionCaseInsensitive error:&error];
+    data = [regexI stringByReplacingMatchesInString:data options:0 range:NSMakeRange(0, [data length]) withTemplate:@"i"];
+    NSRegularExpression *regexO = [NSRegularExpression regularExpressionWithPattern:@"/ò|ó|ọ|ỏ|õ|ô|ồ|ố|ộ|ổ|ỗ|ơ|ờ|ớ|ợ|ở|ỡ/g" options:NSRegularExpressionCaseInsensitive error:&error];
+    data = [regexO stringByReplacingMatchesInString:data options:0 range:NSMakeRange(0, [data length]) withTemplate:@"o"];
+    NSRegularExpression *regexU = [NSRegularExpression regularExpressionWithPattern:@"/ù|ú|ụ|ủ|ũ|ư|ừ|ứ|ự|ử|ữ/g" options:NSRegularExpressionCaseInsensitive error:&error];
+    data = [regexU stringByReplacingMatchesInString:data options:0 range:NSMakeRange(0, [data length]) withTemplate:@"u"];
+    NSRegularExpression *regexY = [NSRegularExpression regularExpressionWithPattern:@"/ỳ|ý|ỵ|ỷ|ỹ/g" options:NSRegularExpressionCaseInsensitive error:&error];
+    data = [regexY stringByReplacingMatchesInString:data options:0 range:NSMakeRange(0, [data length]) withTemplate:@"y"];
+    NSRegularExpression *regexD = [NSRegularExpression regularExpressionWithPattern:@"/đ/g" options:NSRegularExpressionCaseInsensitive error:&error];
+    data = [regexD stringByReplacingMatchesInString:data options:0 range:NSMakeRange(0, [data length]) withTemplate:@"d"];
+    return data;
+}
+
++ (NSString *)getShortName:(NSString *)fullName {
+    if (!fullName) return nil;
+    NSString *trimmedFullName = [fullName stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    if (trimmedFullName.length < 1) return nil;
+    NSRange range = [trimmedFullName rangeOfString:@" " options:NSBackwardsSearch];
+    if (range.location == NSNotFound || range.location >= trimmedFullName.length) return [trimmedFullName substringWithRange:NSMakeRange(0, 1)];
+    return [trimmedFullName substringWithRange:NSMakeRange(range.location + 1, 1)];
+}
+
++ (BOOL)isNewAppVersion: (NSString *)currentVersion :(NSString *)remoteVersion {
+    if (![NSString isNilOrEmpty:currentVersion] || ![NSString isNilOrEmpty:remoteVersion]) return NO;
+    if (![currentVersion containsString:@"."]) currentVersion = [currentVersion stringByAppendingString:@"."];
+    if (![remoteVersion containsString:@"."]) remoteVersion = [remoteVersion stringByAppendingString:@"."];
+    currentVersion = [NSString stringWithFormat:@"%@",currentVersion];
+    remoteVersion = [NSString stringWithFormat:@"%@",remoteVersion];
+    NSArray *arrayCurrent = [currentVersion componentsSeparatedByString:@"."];
+    NSArray *arrayRemote = [remoteVersion componentsSeparatedByString:@"."];
+    NSInteger sizeCurrent = arrayCurrent.count;
+    NSInteger sizeRemote = arrayRemote.count;
+    int minsize = (int) (sizeCurrent < sizeRemote ? sizeCurrent : sizeRemote);
+    for (int i = 0; i < minsize; i++) {
+        if ([arrayRemote[i] intValue] > [arrayCurrent[i] intValue]) return YES;
+    }
+    return sizeRemote > sizeCurrent;
+}
+
+@end
diff --git a/lib/audioplayer.dart b/lib/audioplayer.dart
index c254b96..e91ce61 100644
--- a/lib/audioplayer.dart
+++ b/lib/audioplayer.dart
@@ -76,8 +76,10 @@ class AudioPlayer {
   Stream<Duration> get onAudioPositionChanged => _positionController.stream;
 
   Future<void> _audioPlayerStateChange(MethodCall call) async {
+//    print('callback method: ${call.method}');
     switch (call.method) {
       case "audio.onCurrentPosition":
+//        print('audio.onCurrentPosition: ${call.arguments}');
         assert(_state == AudioPlayerState.PLAYING);
         _positionController.add(new Duration(milliseconds: call.arguments));
         break;

From 22cd8847d4d1d7a21eeb78fc8b27951c3016c8a6 Mon Sep 17 00:00:00 2001
From: Med Kadhem <kadhem03@gmail.com>
Date: Wed, 4 Mar 2020 13:09:26 +0100
Subject: [PATCH 2/4] adding audioFOcus and mediaSession support [ANDROID]

---
 android/build.gradle                          |  17 +-
 android/gradle.properties                     |   1 +
 android/src/main/AndroidManifest.xml          |   9 +-
 .../rxla/audioplayer/AudioplayerPlugin.java   | 430 ++++++++++++++++--
 example/android/app/build.gradle              |   4 +-
 example/android/build.gradle                  |   2 +-
 example/android/gradle.properties             |   2 +
 .../ios/Flutter/flutter_export_environment.sh |   6 +-
 example/lib/main.dart                         |   4 +-
 9 files changed, 423 insertions(+), 52 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 80c8fd8..4ac9c6b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,30 +4,37 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         jcenter()
+        google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
   defaultConfig {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-      minSdkVersion 16
-    targetSdkVersion 21
+      minSdkVersion 21
   }
     lintOptions {
         disable 'InvalidPackage'
     }
 }
+
+dependencies {
+    implementation 'androidx.core:core:1.1.0'
+    implementation 'androidx.media:media:1.1.0'
+}
+
diff --git a/android/gradle.properties b/android/gradle.properties
index 8bd86f6..7be3d8b 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index a73c4a3..1fec554 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -2,5 +2,12 @@
   package="bz.rxla.audioplayer"
   android:versionCode="1"
   android:versionName="0.1.0">
-
+    <application>
+        <service android:name=".AudioplayerPlugin"
+            android:label="MediaService" >
+            <intent-filter>
+                <action android:name="android.media.browse.MediaBrowserService" />
+            </intent-filter>
+        </service>
+    </application>
 </manifest>
diff --git a/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java b/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java
index d07b7e0..237f1d2 100644
--- a/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java
+++ b/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java
@@ -1,27 +1,85 @@
 package bz.rxla.audioplayer;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
+import android.media.browse.MediaBrowser;
+import android.media.session.MediaSession;
+import android.media.session.PlaybackState;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Handler;
+import android.os.PowerManager;
+import android.os.SystemClock;
+import android.service.media.MediaBrowserService;
+import android.support.v4.media.MediaBrowserCompat;
+import android.support.v4.media.session.MediaSessionCompat;
+import android.support.v4.media.session.PlaybackStateCompat;
 import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.RequiresApi;
+import android.media.AudioFocusRequest;
+import androidx.media.MediaBrowserServiceCompat;
 
 /**
  * Android implementation for AudioPlayerPlugin.
  */
-public class AudioplayerPlugin implements MethodCallHandler {
+public class AudioplayerPlugin extends MediaBrowserService implements MethodCallHandler {
   private static final String ID = "bz.rxla.flutter/audio";
-
+  private static final String MEDIA_ROOT_ID = "root";
+  private static final String TAG="AudioFocusTEST";
+  private static final String CMD_NAME = "command";
+  private static final String CMD_PAUSE = "pause";
+  private static final String CMD_STOP = "pause";
+  private static final String CMD_PLAY = "play";
+  // Jellybean
+  private static String SERVICE_CMD = "com.sec.android.app.music.musicservicecommand";
+  private static String PAUSE_SERVICE_CMD = "com.sec.android.app.music.musicservicecommand.pause";
+  private static String PLAY_SERVICE_CMD = "com.sec.android.app.music.musicservicecommand.play";
+  // Honeycomb
+  {
+    if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
+      SERVICE_CMD = "com.android.music.musicservicecommand";
+      PAUSE_SERVICE_CMD = "com.android.music.musicservicecommand.pause";
+      PLAY_SERVICE_CMD = "com.android.music.musicservicecommand.play";
+    }
+  };
+  private Context mContext;
   private final MethodChannel channel;
   private final AudioManager am;
   private final Handler handler = new Handler();
+  private String currentPlayingURRL;
+  private boolean mAudioFocusGranted=false;
+  private boolean isPlaying=false;
   private MediaPlayer mediaPlayer;
+  private Object audioFocusRequest;
+  private MediaSessionCompat mediaSession;
+  private PowerManager.WakeLock wakeLock;
+  private AudioManager.OnAudioFocusChangeListener mOnAudioFocusChangeListener;
+  private BroadcastReceiver mIntentReceiver;
+  private boolean mReceiverRegistered = false;
+
+  //sessions related
+
+  private MediaSession mSession;
+  private int mState = PlaybackState.STATE_NONE;
+  private List<MediaSession.QueueItem> mPlayingQueue;
+  private int mCurrentIndexOnQueue;
+
 
   public static void registerWith(Registrar registrar) {
     final MethodChannel channel = new MethodChannel(registrar.messenger(), ID);
@@ -32,7 +90,53 @@ private AudioplayerPlugin(Registrar registrar, MethodChannel channel) {
     this.channel = channel;
     channel.setMethodCallHandler(this);
     Context context = registrar.context().getApplicationContext();
+    mContext=context;
     this.am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+
+    mOnAudioFocusChangeListener = new AudioManager.OnAudioFocusChangeListener() {
+      @Override
+      public void onAudioFocusChange(int focusChange) {
+        switch (focusChange) {
+          case AudioManager.AUDIOFOCUS_GAIN:
+            Log.i(TAG, "AUDIOFOCUS_GAIN");
+            break;
+          case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT:
+            Log.i(TAG, "AUDIOFOCUS_GAIN_TRANSIENT");
+            break;
+          case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK:
+            Log.i(TAG, "AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK");
+            break;
+          case AudioManager.AUDIOFOCUS_LOSS:
+            Log.e(TAG, "AUDIOFOCUS_LOSS");
+            pause();
+            break;
+          case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+            Log.e(TAG, "AUDIOFOCUS_LOSS_TRANSIENT");
+            pause();
+            break;
+          case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+            Log.e(TAG, "AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK");
+            break;
+          case AudioManager.AUDIOFOCUS_REQUEST_FAILED:
+            Log.e(TAG, "AUDIOFOCUS_REQUEST_FAILED");
+            break;
+          default:
+//
+        }
+      }
+    };
+    setupBroadcastReceiver();
+    startSession(mContext);
+  }
+
+  // On destroy method :
+
+
+  @Override
+  public void onDestroy() {
+    mSession.release();
+    handleStopRequest(null);
+    super.onDestroy();
   }
 
   @Override
@@ -89,60 +193,74 @@ private void stop() {
       mediaPlayer.release();
       mediaPlayer = null;
       channel.invokeMethod("audio.onStop", null);
+      isPlaying=false;
     }
   }
 
   private void pause() {
+    Log.d(TAG, "pause: Pausing the music");
     handler.removeCallbacks(sendData);
     if (mediaPlayer != null) {
       mediaPlayer.pause();
       channel.invokeMethod("audio.onPause", true);
+      abandonAudioFocus();
+      isPlaying=false;
     }
   }
 
   private void play(String url) {
-    if (mediaPlayer == null) {
-      mediaPlayer = new MediaPlayer();
-      mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+    currentPlayingURRL =url;
+    int result = requestAudioFocus();
+    Log.d("AUDIOPLAYERPLUGIN", "AudioplayerPlugin: RESULT OF FOCUS REQUESTING : "+ result);
+    if(result ==AudioManager.AUDIOFOCUS_REQUEST_GRANTED){
+      if (mediaPlayer == null) {
+        mediaPlayer = new MediaPlayer();
+        mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
 
-      try {
-        mediaPlayer.setDataSource(url);
-      } catch (IOException e) {
-        Log.w(ID, "Invalid DataSource", e);
-        channel.invokeMethod("audio.onError", "Invalid Datasource");
-        return;
-      }
+        try {
+          mediaPlayer.setDataSource(url);
+        } catch (IOException e) {
+          Log.w(ID, "Invalid DataSource", e);
+          channel.invokeMethod("audio.onError", "Invalid Datasource");
+          return;
+        }
 
-      mediaPlayer.prepareAsync();
+        mediaPlayer.prepareAsync();
 
-      mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener(){
-        @Override
-        public void onPrepared(MediaPlayer mp) {
-          mediaPlayer.start();
-          channel.invokeMethod("audio.onStart", mediaPlayer.getDuration());
-        }
-      });
+        mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener(){
+          @Override
+          public void onPrepared(MediaPlayer mp) {
+            mediaPlayer.start();
+            channel.invokeMethod("audio.onStart", mediaPlayer.getDuration());
+          }
+        });
 
-      mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener(){
-        @Override
-        public void onCompletion(MediaPlayer mp) {
-          stop();
-          channel.invokeMethod("audio.onComplete", null);
-        }
-      });
+        mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener(){
+          @Override
+          public void onCompletion(MediaPlayer mp) {
+            stop();
+            //will abandon audio focus when play ends
+            abandonAudioFocus();
+            channel.invokeMethod("audio.onComplete", null);
+          }
+        });
 
-      mediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener(){
-        @Override
-        public boolean onError(MediaPlayer mp, int what, int extra) {
-          channel.invokeMethod("audio.onError", String.format("{\"what\":%d,\"extra\":%d}", what, extra));
-          return true;
-        }
-      });
-    } else {
-      mediaPlayer.start();
-      channel.invokeMethod("audio.onStart", mediaPlayer.getDuration());
+        mediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener(){
+          @Override
+          public boolean onError(MediaPlayer mp, int what, int extra) {
+            //will abandon focus when error
+            abandonAudioFocus();
+            channel.invokeMethod("audio.onError", String.format("{\"what\":%d,\"extra\":%d}", what, extra));
+            return true;
+          }
+        });
+      } else {
+        mediaPlayer.start();
+        channel.invokeMethod("audio.onStart", mediaPlayer.getDuration());
+      }
+      isPlaying=true;
+      handler.post(sendData);
     }
-    handler.post(sendData);
   }
 
   private final Runnable sendData = new Runnable(){
@@ -160,4 +278,240 @@ public void run(){
       }
     }
   };
+
+  private int requestAudioFocus() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+      return requestAudioFocusO();
+    else
+      return am.requestAudioFocus(mOnAudioFocusChangeListener,
+              AudioManager.STREAM_MUSIC,
+              AudioManager.AUDIOFOCUS_GAIN);
+  }
+
+  @RequiresApi(Build.VERSION_CODES.O)
+  private int requestAudioFocusO() {
+    AudioAttributes audioAttributes = new AudioAttributes.Builder()
+            .setUsage(AudioAttributes.USAGE_MEDIA)
+            .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+            .build();
+    audioFocusRequest = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+            .setAudioAttributes(audioAttributes)
+            .setWillPauseWhenDucked(true)
+            .setOnAudioFocusChangeListener(mOnAudioFocusChangeListener)
+            .build();
+    return am.requestAudioFocus((AudioFocusRequest)audioFocusRequest);
+  }
+
+  private void abandonAudioFocus() {
+    int result = am.abandonAudioFocus(mOnAudioFocusChangeListener);
+    if (result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+      mAudioFocusGranted = false;
+    } else {
+// FAILED
+      Log.e(TAG,
+              ">>>>>>>>>>>>> FAILED TO ABANDON AUDIO FOCUS <<<<<<<<<<<<<<<<<<<<<<<<");
+    }
+  }
+
+  private void setupBroadcastReceiver() {
+    mIntentReceiver = new BroadcastReceiver() {
+      @Override
+      public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        String cmd = intent.getStringExtra(CMD_NAME);
+        Log.i(TAG, "mIntentReceiver.onReceive " + action + " / " + cmd);
+        if (PAUSE_SERVICE_CMD.equals(action)
+                || (SERVICE_CMD.equals(action) && CMD_PAUSE.equals(cmd))) {
+          if(currentPlayingURRL!=null){
+            Log.d(TAG, "onReceive: RECIEVED A BROADCAST OF PAUSE");
+            play(currentPlayingURRL);
+          }
+        }
+        if (PLAY_SERVICE_CMD.equals(action)
+                || (SERVICE_CMD.equals(action) && CMD_PLAY.equals(cmd))) {
+          Log.d(TAG, "onReceive: RECIEVED A BROADCAST OF PLAY");
+          pause();
+        }
+      }
+    };
+// Do the right thing when something else tries to play
+    if (!mReceiverRegistered) {
+      IntentFilter commandFilter = new IntentFilter();
+      commandFilter.addAction(SERVICE_CMD);
+      commandFilter.addAction(PAUSE_SERVICE_CMD);
+      commandFilter.addAction(PLAY_SERVICE_CMD);
+      mContext.registerReceiver(mIntentReceiver, commandFilter);
+      mReceiverRegistered = true;
+    }
+  }
+
+  @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+  private void startSession(Context context){
+    mSession = new MediaSession(context, "MusicService");
+    setSessionToken(mSession.getSessionToken());
+    mSession.setCallback(new MediaSession.Callback() {
+      @Override
+      public void onPlay() {
+        Log.d(TAG, "play");
+        /*if (mPlayingQueue == null || mPlayingQueue.isEmpty()) {
+          mSession.setQueue(mPlayingQueue);
+          mSession.setQueueTitle(getString(R.string.random_queue_title));
+          // start playing from the beginning of the queue
+          mCurrentIndexOnQueue = 0;
+        }
+        if (mPlayingQueue != null && !mPlayingQueue.isEmpty()) {
+          handlePlayRequest();
+        }*/
+
+        if(isPlaying){
+          stop();
+        }else{
+          if(currentPlayingURRL!=null){
+            play(currentPlayingURRL);
+          }
+        }
+      }
+
+      @Override
+      public void onPause() {
+        Log.d(TAG, "pause");
+        pause();
+      }
+
+      @Override
+      public void onSkipToNext() {
+        //Will be implemented as an event to the plugin side
+      }
+
+      @Override
+      public void onSkipToPrevious() {
+        //Will be implemented as an event to the plugin side
+      }
+
+      @Override
+      public void onFastForward() {
+        //Will be implemented as an event to the plugin side
+      }
+
+      @Override
+      public void onRewind() {
+        //Will be implemented as an event to the plugin side
+      }
+
+      @Override
+      public void onStop() {
+        Log.d(TAG, "Stop");
+        stop();
+      }
+
+      @Override
+      public void onSeekTo(long pos) {
+        Log.d(TAG, "Seek");
+        seek((double)pos);
+      }
+    });
+    mSession.setFlags(MediaSession.FLAG_HANDLES_MEDIA_BUTTONS |
+            MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS);
+    updatePlaybackState(null);
+    /*mMediaNotification = new MediaNotification(this);*/
+    mSession.setActive(true);
+  }
+
+  @Nullable
+  @Override
+  public BrowserRoot onGetRoot(@NonNull String s, int i, @Nullable Bundle bundle) {
+    return null;
+  }
+
+  @Override
+  public void onLoadChildren(@NonNull String s, @NonNull Result<List<MediaBrowser.MediaItem>> result) {
+
+  }
+  @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+  private void updatePlaybackState(String error) {
+    Log.d(TAG, "updatePlaybackState, setting session playback state to " + mState);
+    long position = PlaybackState.PLAYBACK_POSITION_UNKNOWN;
+    if (mediaPlayer != null && mediaPlayer.isPlaying()) {
+      position = mediaPlayer.getCurrentPosition();
+    }
+    PlaybackState.Builder stateBuilder = new PlaybackState.Builder()
+            .setActions(getAvailableActions());
+    //The following custom action should be implemented as a return to the plugin side to finish the favorite or the thumbsUp
+    /*setCustomAction(stateBuilder);*/
+    // If there is an error message, send it to the playback state:
+    if (error != null) {
+      // Error states are really only supposed to be used for errors that cause playback to
+      // stop unexpectedly and persist until the user takes action to fix it.
+      stateBuilder.setErrorMessage(error);
+      mState = PlaybackState.STATE_ERROR;
+    }
+    stateBuilder.setState(mState, position, 1.0f, SystemClock.elapsedRealtime());
+    mSession.setPlaybackState(stateBuilder.build());
+
+    //The notification part is not going to be implemented right now with this plugin
+    /*if (mState == PlaybackState.STATE_PLAYING || mState == PlaybackState.STATE_PAUSED) {
+      mMediaNotification.startNotification();
+    }*/
+  }
+
+  //Helper Functions to handle audio management
+  //
+
+  /**
+   * Returns the Available actions with each state
+   * @return
+   */
+  private long getAvailableActions() {
+    long actions = PlaybackState.ACTION_PLAY | PlaybackState.ACTION_PLAY_FROM_MEDIA_ID |
+            PlaybackState.ACTION_PLAY_FROM_SEARCH;
+    if (mPlayingQueue == null || mPlayingQueue.isEmpty()) {
+      return actions;
+    }
+    if (mState == PlaybackState.STATE_PLAYING) {
+      actions |= PlaybackState.ACTION_PAUSE;
+    }
+    if (mCurrentIndexOnQueue > 0) {
+      actions |= PlaybackState.ACTION_SKIP_TO_PREVIOUS;
+    }
+    if (mCurrentIndexOnQueue < mPlayingQueue.size() - 1) {
+      actions |= PlaybackState.ACTION_SKIP_TO_NEXT;
+    }
+    return actions;
+  }
+
+  /**
+   * Will handle the playbakc stopping request, releasing session
+   * @param withError
+   */
+  private void handleStopRequest(String withError) {
+    Log.d(TAG, "handleStopRequest: mState=" + mState + " error=" + withError );
+    mState = PlaybackState.STATE_STOPPED;
+    // let go of all resources...
+    relaxResources(true);
+    abandonAudioFocus();
+    updatePlaybackState(withError);
+    //The notification handler is not implemented here
+    /*
+    mMediaNotification.stopNotification();
+    */
+    // service is no longer necessary. Will be started again if needed.
+    stopSelf();
+  }
+
+  private void relaxResources(boolean releaseMediaPlayer) {
+    Log.d(TAG, "relaxResources. releaseMediaPlayer=" + releaseMediaPlayer);
+    // stop being a foreground service
+    stopForeground(true);
+    // stop and release the Media Player, if it's available
+    if (releaseMediaPlayer && mediaPlayer != null) {
+      mediaPlayer.reset();
+      mediaPlayer.release();
+      mediaPlayer = null;
+    }
+    // we can also release the Wifi lock, if we're holding it
+    //We currently do not implement the wifi lock
+    /*if (mWifiLock.isHeld()) {
+      mWifiLock.release();
+    }*/
+  }
 }
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index ea9f091..3f4ee1b 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,7 +34,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.chuongvd.audioplayerExample"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 27
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/example/android/build.gradle b/example/android/build.gradle
index bb8a303..71be3d3 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 7be3d8b..38c8d45 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1,2 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
index 7d6b606..2ade88a 100755
--- a/example/ios/Flutter/flutter_export_environment.sh
+++ b/example/ios/Flutter/flutter_export_environment.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/chuongvd/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/chuongvd/Documents/ws-quangich/flutter/ritc/audioplayer/example"
+export "FLUTTER_ROOT=/Users/kadhem/Downloads/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/kadhem/Documents/flutter_projects/audioplayer/example"
 export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build/ios"
-export "FLUTTER_FRAMEWORK_DIR=/Users/chuongvd/flutter/bin/cache/artifacts/engine/ios"
+export "FLUTTER_FRAMEWORK_DIR=/Users/kadhem/Downloads/flutter/bin/cache/artifacts/engine/ios"
 export "FLUTTER_BUILD_NAME=2.0.0"
 export "FLUTTER_BUILD_NUMBER=2.0.0"
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 4167e70..85edb06 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -198,14 +198,14 @@ class _AudioAppState extends State<AudioApp> {
               icon: new Icon(Icons.stop),
               color: Colors.cyan),
         ]),
-        duration == null
+        /*duration == null
             ? new Container()
             : new Slider(
                 value: position?.inMilliseconds?.toDouble() ?? 0.0,
                 onChanged: (double value) =>
                     audioPlayer.seek((value / 1000).roundToDouble()),
                 min: 0.0,
-                max: duration.inMilliseconds.toDouble()),
+                max: (duration.inMilliseconds+0.1).toDouble()),*/
         new Row(
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: <Widget>[

From 323b2ade3247defaec93c3d480ab3e2fd77e520c Mon Sep 17 00:00:00 2001
From: Med Kadhem <kadhem03@gmail.com>
Date: Wed, 4 Mar 2020 13:30:09 +0100
Subject: [PATCH 3/4] switcin gfrom stop play to pause play

---
 .../src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java b/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java
index 237f1d2..3a1c4bb 100644
--- a/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java
+++ b/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java
@@ -364,7 +364,7 @@ public void onPlay() {
         }*/
 
         if(isPlaying){
-          stop();
+          pause();
         }else{
           if(currentPlayingURRL!=null){
             play(currentPlayingURRL);

From dd75cfc0218af4bea230e52bf82fc48ad9b49ad3 Mon Sep 17 00:00:00 2001
From: Med Kadhem <kadhem03@gmail.com>
Date: Wed, 4 Mar 2020 14:11:35 +0100
Subject: [PATCH 4/4] readMe update

---
 README.md | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5031232..f84e2dd 100644
--- a/README.md
+++ b/README.md
@@ -12,16 +12,27 @@ A Flutter audio plugin (ObjC/Java) to play remote or local audio files
   - [x] onDuration / onCurrentPosition
   - [x] seek
   - [x] mute
-
-![screenshot](https://www.evernote.com/shard/s1/sh/c9e2e0dc-4e1b-4797-b23f-2bdf0f6f3387/d1138680d3b4bdcd/res/1afa2507-2df2-42ef-a840-d7f3519f5cb3/skitch.png?resizeSmall&width=320)
+- [x] Android ONLY
+    - [x] music session with controls (50% done)
+        - [x] music session creation
+        - [x] play, pause, stop, seek controls
+        - [ ] metadata broadcasting*
+        - [ ] next, previous, queue management*
+        - [ ] mediaBrowser for car/wear os library*
+    - [x] audioFocus management
+        - [x] requesting focus
+        - [x] focus loss management
+    
 
 ## Usage
 
-[Example](https://github.com/rxlabz/audioplayer/blob/master/example/lib/main.dart)
+[Example](https://github.com/moda20/audioplayer/blob/master/example/lib/main.dart)
+
+Also used in [TuneIn](https://github.com/moda20/flutter-tunein)
 
 To use this plugin :
 
-- Add the dependency to your [pubspec.yaml](https://github.com/rxlabz/audioplayer/blob/master/example/pubspec.yaml) file.
+- Add the dependency to your [pubspec.yaml](https://github.com/moda20/audioplayer/blob/master/example/pubspec.yaml) file.
 
 ```yaml
   dependencies:
@@ -107,7 +118,7 @@ By default iOS forbids loading from non-https url. To cancel this restriction ed
 ## Troubleshooting
 
 - If you get a MissingPluginException, try to `flutter build apk` on Android, or `flutter build ios`
-- to use the plugin in a ObjC iOS project, add 'use_frameworks!' to your podfile cf. [example](https://github.com/rxlabz/audioplayer/blob/master/example/ios/Podfile)
+- to use the plugin in a ObjC iOS project, add 'use_frameworks!' to your podfile cf. [example](https://github.com/moda20/blob/master/example/ios/Podfile)
 
 ## Getting Started