imjiten · imjiten · Sep 20, 2018 · Sep 20, 2018 · Sep 20, 2018 · Sep 20, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,18 @@
-.DS_Store
+**/.DS_Store
 .atom/
 .idea
-.packages
-.pub/
-.dart_tool/
-build/
-ios/.generated/
-packages
-pubspec.lock
+**/.packages
+**/.pub/
+**/.dart_tool/
+**/build/
+**/ios/.generated/
+**/packages
+**/pubspec.lock
 
 Podfile
 Podfile.lock
-Pods/
-.symlinks/
+**/Pods/
+**/.symlinks/
 **/Flutter/App.framework/
 **/Flutter/Flutter.framework/
 **/Flutter/Generated.xcconfig
@@ -21,7 +21,7 @@ ServiceDefinitions.json
 xcuserdata/
 
 local.properties
-.gradle/
+**/.gradle/
 gradlew
 gradlew.bat
 gradle-wrapper.jar
@@ -30,4 +30,8 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.h
 GeneratedPluginRegistrant.m
 GeneratedPluginRegistrant.java
-build/
+example/.flutter-plugins-dependencies
+example/ios/Flutter/flutter_export_environment.sh
+
+.flutter-plugins
+.flutter-plugins-dependencies
diff --git a/README.md b/README.md
@@ -1,19 +1,29 @@
+# :warning: DEPRECATED
+
+Check out 
+
+- [audioplayers](https://pub.dev/packages/audioplayers)
+- [just_audio](https://pub.dev/packages/just_audio)
+___ 
 # AudioPlayer
 
-A Flutter audio plugin (ObjC/Java) to play remote or local audio files 
+A Flutter audio plugin (Swift/Java) to play remote or local audio files on iOS / Android / MacOS and Web.
+
+[Online demo](https://rxlabz.github.io/audioplayer/)
 
 ## Features
 
-- [x] Android & iOS
-  - [x] play (remote file)
+- [x] Android / iOS / MacOS / Web
+  - [x] play remote file 
+  - [x] play local file ( not for the web)  
   - [x] stop
   - [x] pause
   - [x] onComplete
   - [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)
+![screenshot](https://rxlabz.github.io/audioplayer/audioplayer.png)
 
 ## Usage
 
@@ -27,38 +37,26 @@ To use this plugin :
   dependencies:
     flutter:
       sdk: flutter
-    audioplayer:
+    audioplayer: 0.8.1
+    audioplayer_web: 0.7.1
 ```
 
 - Instantiate an AudioPlayer instance
 
 ```dart
 //...
-AudioPlayer audioPlugin = new AudioPlayer();
+AudioPlayer audioPlugin = AudioPlayer();
 //...
 ```
 
 ### Player Controls
 
 ```dart
-Future<void> play() async {
-  await audioPlayer.play(kUrl);
-  setState(() => playerState = PlayerState.playing);
-}
-
-Future<void> pause() async {
-  await audioPlayer.pause();
-  setState(() => playerState = PlayerState.paused);
-}
-
-Future<void> stop() async {
-  await audioPlayer.stop();
-  setState(() {
-    playerState = PlayerState.stopped;
-    position = new Duration();
-  });
-}
+audioPlayer.play(url);
+
+audioPlayer.pause();
 
+audioPlayer.stop();
 ```
 
 ### Status and current position
@@ -91,9 +89,10 @@ _audioPlayerStateSubscription = audioPlayer.onPlayerStateChanged.listen((s) {
 
 Do not forget to cancel all the subscriptions when the widget is disposed.
 
+
 ## iOS
 
-## :warning: iOS App Transport Security
+### :warning: iOS App Transport Security
 
 By default iOS forbids loading from non-https url. To cancel this restriction edit your .plist and add :
 
@@ -104,12 +103,26 @@ By default iOS forbids loading from non-https url. To cancel this restriction ed
     <true/>
 </dict>
 ```
+
+### Background mode
+
+cf. [enable background audio](https://developer.apple.com/documentation/avfoundation/media_assets_playback_and_editing/creating_a_basic_video_player_ios_and_tvos/enabling_background_audio)
+
+## MacOS
+
+Add this to entitlements files ( cf. [DebugProfile.entitlements](example/macos/Runner/DebugProfile.entitlements) )
+```xml
+    <key>com.apple.security.network.client</key>
+    <true/>
+```
+
+cf. [Flutter MacOS security](https://github.com/google/flutter-desktop-embedding/blob/master/macOS-Security.md)
+
 ## 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)
 
-## Getting Started
+## Getting Started with Flutter
 
 For help getting started with Flutter, view our online
 [documentation](http://flutter.io/).

diff --git a/android/gradle.properties b/android/gradle.properties
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
diff --git a/audioplayer/.gitignore b/audioplayer/.gitignore
@@ -0,0 +1,9 @@
+.DS_Store
+.dart_tool/
+
+.packages
+.pub/
+
+build/
+
+.metadata
diff --git a/CHANGELOG.md → audioplayer/CHANGELOG.md b/CHANGELOG.md → audioplayer/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.8.1
+- iOS : enable audio output to speakers thanks @mhatout
+- fixes iOS 'timeobservers' typo thanks @athornz
+
+## 0.8.0
+- Android : new FlutterPlugin API & AndroidX migration
+
+## 0.7.0
+- add Web support
+
+## 0.6.0
+- switch to Swift thanks @matteti #114
+- add MacOS support thanks @matteti #115
+
+## 0.5.2
+- fix objC warning
+- updated example
+
+## 0.5.1
+- Allow Dart 2 SDK
+- Fix java lint warnings.
+
 ## 0.5.0
 - BREAKING Change: No more separate handlers for communicating the state of the player. Instead we rely on streams to publish state changes and position updates.
 - Code formatting and flow improvements. Preparation for testing.

diff --git a/LICENSE → audioplayer/LICENSE b/LICENSE → audioplayer/LICENSE
diff --git a/audioplayer/README.md b/audioplayer/README.md
@@ -0,0 +1,123 @@
+# AudioPlayer
+
+A Flutter audio plugin (Swift/Java) to play remote or local audio files on iOS / Android / MacOS / Web.
+
+[Online demo](https://rxlabz.github.io/audioplayer/)
+
+## Features
+
+- [x] Android / iOS / MacOS / Web
+  - [x] play remote file 
+  - [x] play local file ( not for the web)  
+  - [x] stop
+  - [x] pause
+  - [x] onComplete
+  - [x] onDuration / onCurrentPosition
+  - [x] seek
+  - [x] mute
+
+![screenshot](https://rxlabz.github.io/audioplayer/audioplayer.png)
+
+## Usage
+
+[Example](https://github.com/rxlabz/audioplayer/blob/master/example/lib/main.dart)
+
+To use this plugin :
+
+- Add the dependency to your [pubspec.yaml](https://github.com/rxlabz/audioplayer/blob/master/example/pubspec.yaml) file.
+
+```yaml
+  dependencies:
+    flutter:
+      sdk: flutter
+    audioplayer: 0.8.1
+    audioplayer_web: 0.7.1
+```
+
+- Instantiate an AudioPlayer instance
+
+```dart
+//...
+AudioPlayer audioPlugin = AudioPlayer();
+//...
+```
+
+### Player Controls
+
+```dart
+audioPlayer.play(url);
+
+audioPlayer.pause();
+
+audioPlayer.stop();
+```
+
+### Status and current position
+
+The dart part of the plugin listen for platform calls :
+
+```dart
+//...
+_positionSubscription = audioPlayer.onAudioPositionChanged.listen(
+  (p) => setState(() => position = p)
+);
+
+_audioPlayerStateSubscription = audioPlayer.onPlayerStateChanged.listen((s) {
+  if (s == AudioPlayerState.PLAYING) {
+    setState(() => duration = audioPlayer.duration);
+  } else if (s == AudioPlayerState.STOPPED) {
+    onComplete();
+    setState(() {
+      position = duration;
+    });
+  }
+}, onError: (msg) {
+  setState(() {
+    playerState = PlayerState.stopped;
+    duration = new Duration(seconds: 0);
+    position = new Duration(seconds: 0);
+  });
+});
+```
+
+Do not forget to cancel all the subscriptions when the widget is disposed.
+
+
+## iOS
+
+### :warning: iOS App Transport Security
+
+By default iOS forbids loading from non-https url. To cancel this restriction edit your .plist and add :
+
+```xml
+<key>NSAppTransportSecurity</key>
+<dict>
+    <key>NSAllowsArbitraryLoads</key>
+    <true/>
+</dict>
+```
+
+### Background mode
+
+cf. [enable background audio](https://developer.apple.com/documentation/avfoundation/media_assets_playback_and_editing/creating_a_basic_video_player_ios_and_tvos/enabling_background_audio)
+
+## MacOS
+
+Add this to entitlements files ( cf. [DebugProfile.entitlements](example/macos/Runner/DebugProfile.entitlements) )
+```xml
+    <key>com.apple.security.network.client</key>
+    <true/>
+```
+
+cf. [Flutter MacOS security](https://github.com/google/flutter-desktop-embedding/blob/master/macOS-Security.md)
+
+## Troubleshooting
+
+- If you get a MissingPluginException, try to `flutter build apk` on Android, or `flutter build ios`
+
+## Getting Started with Flutter
+
+For help getting started with Flutter, view our online
+[documentation](http://flutter.io/).
+
+For help on editing plugin code, view the [documentation](https://flutter.io/platform-plugins/#edit-code).
diff --git a/android/.gitignore → audioplayer/android/.gitignore b/android/.gitignore → audioplayer/android/.gitignore
@@ -6,7 +6,3 @@
 .DS_Store
 /build
 /captures
-
-/gradle
-/gradlew
-/gradlew.bat
diff --git a/android/build.gradle → audioplayer/android/build.gradle b/android/build.gradle → audioplayer/android/build.gradle
@@ -1,32 +1,37 @@
 group 'bz.rxla.audioplayer'
-version '1.0-SNAPSHOT'
+version '1.0'
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.5.0'
     }
 }
 
-allprojects {
+rootProject.allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 28
 
     defaultConfig {
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        minSdkVersion 16
     }
     lintOptions {
         disable 'InvalidPackage'
     }
 }
+
+dependencies {
+    implementation 'com.android.support:support-annotations:28.0.0'
+}
diff --git a/audioplayer/android/gradle.properties b/audioplayer/android/gradle.properties
@@ -0,0 +1,4 @@
+org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
+android.useAndroidX=true
+android.enableJetifier=true