[closes #65] update to flutter 2.0

Author: jeromexiong

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.1
+- update to flutter 2.0
+- fix to null safety
+
 ## 0.7.3
 - fix ios replay
 - support web

example/ios/Runner.xcodeproj/project.pbxproj

@@ -263,13 +263,11 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../Flutter/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/audio_manager/audio_manager.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/audio_manager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
 			);

lib/audio_manager.dart

@@ -9,19 +9,20 @@ export 'package:audio_manager/src/AudioInfo.dart';
 export 'package:audio_manager/src/AudioType.dart';
 
 class AudioManager {
-  static late AudioManager _instance;
-
+  static AudioManager? _instance;
   static AudioManager get instance => _getInstance();
 
   static _getInstance() {
-    _instance = new AudioManager._();
+    if (_instance == null) {
+      _instance = new AudioManager._();
+    }
     return _instance;
   }
 
-  static MethodChannel? _channel;
+  static MethodChannel _channel = const MethodChannel('audio_manager');
 
   AudioManager._() {
-    _channel = const MethodChannel('audio_manager')..setMethodCallHandler(_handler);
+    _channel.setMethodCallHandler(_handler);
     getCurrentVolume();
   }
 
@@ -52,7 +53,7 @@ class AudioManager {
   double _volume = 0;
 
   /// If there are errors, return details
-  String get error => _error!;
+  String? get error => _error;
   String? _error;
 
   /// list of playback. Used to record playlists
@@ -83,7 +84,7 @@ class AudioManager {
   bool _auto = true;
 
   /// Playback info
-  AudioInfo get info => _info!;
+  AudioInfo? get info => _info;
   AudioInfo? _info;
 
   Future<dynamic> _handler(MethodCall call) {
@@ -95,7 +96,8 @@ class AudioManager {
         break;
       case "seekComplete":
         _position = Duration(milliseconds: call.arguments ?? 0);
-        if (_duration.inMilliseconds != 0) _onEvents(AudioManagerEvents.seekComplete, _position);
+        if (_duration.inMilliseconds != 0)
+          _onEvents(AudioManagerEvents.seekComplete, _position);
         break;
       case "buffering":
         _onEvents(AudioManagerEvents.buffering, call.arguments);
@@ -104,15 +106,18 @@ class AudioManager {
         _setPlaying(call.arguments ?? false);
         break;
       case "timeupdate":
+        _error = null;
         _position = Duration(milliseconds: call.arguments["position"] ?? 0);
         _duration = Duration(milliseconds: call.arguments["duration"] ?? 0);
         if (!_playing) _setPlaying(true);
-        if (_position.inMilliseconds < 0 || _duration.inMilliseconds <= 0) break;
+        if (_position.inMilliseconds < 0 || _duration.inMilliseconds <= 0)
+          break;
         if (_position > _duration) {
           _position = _duration;
           _setPlaying(false);
         }
-        _onEvents(AudioManagerEvents.timeupdate, {"position": _position, "duration": _duration});
+        _onEvents(AudioManagerEvents.timeupdate,
+            {"position": _position, "duration": _duration});
         break;
       case "error":
         _error = call.arguments;
@@ -147,7 +152,7 @@ class AudioManager {
 
   String _preprocessing() {
     var errMsg = "";
-    if (_info != null) errMsg = "you must invoke the [start] method first";
+    if (_info == null) errMsg = "you must invoke the [start] method first";
     if (_error != null) errMsg = _error!;
     if (_isLoading) errMsg = "audio resource loading....";
 
@@ -156,22 +161,20 @@ class AudioManager {
   }
 
   Events? _events;
-  late bool _initialize;
+  bool _initialize = false;
 
   /// callback events
   void onEvents(Events events) {
     _events = events;
   }
 
   void _onEvents(AudioManagerEvents events, args) {
-    if (_events == null) {
-      return;
-    }
+    if (_events == null) return;
     _events!(events, args);
   }
 
   Future<String> get platformVersion async {
-    final String version = await _channel!.invokeMethod('getPlatformVersion');
+    final String version = await _channel.invokeMethod('getPlatformVersion');
     return version;
   }
 
@@ -192,25 +195,28 @@ class AudioManager {
 
     _info = AudioInfo(url, title: title, desc: desc, coverUrl: cover);
     _audioList.insert(0, _info!);
-    return await play(index: 0, auto: auto!);
+    return await play(index: 0, auto: auto);
   }
 
   /// This will load the file from the file-URI given by:
   /// `'file://${file.path}'`.
   Future<String> file(File file, String title,
       {required String desc, required String cover, required bool auto}) async {
-    return await start("file://${file.path}", title, desc: desc, cover: cover, auto: auto);
+    return await start("file://${file.path}", title,
+        desc: desc, cover: cover, auto: auto);
   }
 
   Future<String> startInfo(AudioInfo audio, {required bool auto}) async {
-    return await start(audio.url, audio.title, desc: audio.desc, cover: audio.coverUrl);
+    return await start(audio.url, audio.title,
+        desc: audio.desc, cover: audio.coverUrl);
   }
 
   /// Play specified subscript audio if you want
   Future<String> play({int? index, bool? auto}) async {
-    if ((index! < 0 || index >= _audioList.length)) throw "invalid index";
+    if (index != null && (index < 0 || index >= _audioList.length))
+      throw "invalid index";
     _auto = auto ?? true;
-    _curIndex = index;
+    _curIndex = index ?? _curIndex;
     final random = _initRandom();
     // Do not replay the same url
     if (_info!.url != random.url) {
@@ -222,7 +228,7 @@ class AudioManager {
     _onEvents(AudioManagerEvents.start, _info);
 
     final regx = new RegExp(r'^(http|https|file):\/\/\/?([\w.]+\/?)\S*');
-    final result = await _channel!.invokeMethod('start', {
+    final result = await _channel.invokeMethod('start', {
       "url": _info!.url,
       "title": _info!.title,
       "desc": _info!.desc,
@@ -245,23 +251,23 @@ class AudioManager {
     if (_initialize == false && _playing == false) {
       play(index: _curIndex, auto: true);
     }
-    bool playing = await _channel!.invokeMethod("playOrPause");
+    bool playing = await _channel.invokeMethod("playOrPause");
     _setPlaying(playing);
     return playing;
   }
 
   /// to play status
   Future<bool> toPlay() async {
     if (_preprocessing().isNotEmpty) return false;
-    bool playing = await _channel!.invokeMethod("play");
+    bool playing = await _channel.invokeMethod("play");
     _setPlaying(playing);
     return playing;
   }
 
   /// to pause status
   Future<bool> toPause() async {
     if (_preprocessing().isNotEmpty) return false;
-    bool playing = await _channel!.invokeMethod("pause");
+    bool playing = await _channel.invokeMethod("pause");
     _setPlaying(playing);
     return playing;
   }
@@ -271,9 +277,11 @@ class AudioManager {
   /// ⚠️ You must after [AudioManagerEvents.ready] event invoked before you can change the playback progress
   Future<String> seekTo(Duration position) async {
     if (_preprocessing().isNotEmpty) return _preprocessing();
-    if (position.inMilliseconds < 0 || position.inMilliseconds > duration.inMilliseconds)
+    if (position.inMilliseconds < 0 ||
+        position.inMilliseconds > duration.inMilliseconds)
       return "[position] must be greater than 0 and less than the total duration";
-    return await _channel!.invokeMethod("seekTo", {"position": position.inMilliseconds});
+    return await _channel
+        .invokeMethod("seekTo", {"position": position.inMilliseconds});
   }
 
   /// `rate` Play rate, default [AudioRate.rate100] is 1.0
@@ -282,40 +290,41 @@ class AudioManager {
     const _rates = [0.5, 0.75, 1, 1.5, 1.75, 2];
     rate = rate;
     double _rate = _rates[rate.index].toDouble();
-    return await _channel!.invokeMethod("rate", {"rate": _rate});
+    return await _channel.invokeMethod("rate", {"rate": _rate});
   }
 
   /// stop play
   stop() {
     _reset();
     _initialize = false;
-    _channel!.invokeMethod("stop");
+    _channel.invokeMethod("stop");
   }
 
   _reset() {
     if (_isLoading) return;
     _duration = Duration(milliseconds: 0);
     _position = Duration(milliseconds: 0);
     _setPlaying(false);
-    _onEvents(AudioManagerEvents.timeupdate, {"position": _position, "duration": _duration});
+    _onEvents(AudioManagerEvents.timeupdate,
+        {"position": _position, "duration": _duration});
   }
 
   /// release all resource
   release() {
     _reset();
-    _channel!.invokeListMethod("release");
+    _channel.invokeListMethod("release");
   }
 
   /// Update play details
   updateLrc(String lrc) {
     if (_preprocessing().isNotEmpty) return _preprocessing();
-    _channel!.invokeMethod("updateLrc", {"lrc": lrc});
+    _channel.invokeMethod("updateLrc", {"lrc": lrc});
   }
 
   /// Switch playback mode. `Playmode` priority is greater than `index`
   PlayMode nextMode({PlayMode? playMode, int? index}) {
-    int mode = index!;
-    mode = playMode!.index;
+    int mode = index ?? (_playMode.index + 1) % 3;
+    if (playMode != null) mode = playMode.index;
     switch (mode) {
       case 0:
         _playMode = PlayMode.sequence;
@@ -355,35 +364,31 @@ class AudioManager {
     if (playMode != PlayMode.single) {
       _curIndex = (_curIndex + 1) % _audioList.length;
     }
-    return await play(index: 0);
+    return await play();
   }
 
   /// play previous audio
   Future<String> previous() async {
     if (playMode != PlayMode.single) {
-      num index = _curIndex - 1;
-      if (index < 0) {
-        _curIndex = _audioList.length - 1;
-      } else {
-        _curIndex = index.toInt();
-      }
+      int index = _curIndex - 1;
+      _curIndex = index < 0 ? _audioList.length - 1 : index;
     }
-    return await play(index: _curIndex);
+    return await play();
   }
 
   /// set volume range(0~1). `showVolume`: show volume view or not and this is only in iOS
   /// ⚠️ IOS simulator is invalid, please use real machine
   Future<String> setVolume(double value, {bool showVolume = false}) async {
     var volume = min(value, 1);
     value = max(value, 0);
-    final result =
-        await _channel!.invokeMethod("setVolume", {"value": volume, "showVolume": showVolume});
+    final result = await _channel
+        .invokeMethod("setVolume", {"value": volume, "showVolume": showVolume});
     return result;
   }
 
   /// get current volume
   Future<double> getCurrentVolume() async {
-    _volume = await _channel!.invokeMethod("currentVolume");
+    _volume = await _channel.invokeMethod("currentVolume");
     return _volume;
   }
 }

lib/src/AudioInfo.dart

@@ -4,7 +4,8 @@ class AudioInfo {
   String desc;
   String coverUrl;
 
-  AudioInfo(this.url, {required this.title, required this.desc, required this.coverUrl});
+  AudioInfo(this.url,
+      {required this.title, required this.desc, required this.coverUrl});
 
   AudioInfo.fromJson(Map<String, dynamic> json)
       : url = json['url'],

pubspec.yaml

@@ -1,11 +1,11 @@
 name: audio_manager
 description: A flutter plugin for music playback, including notification handling.
-version: 0.7.3
+version: 0.8.1
 homepage: https://github.com/jeromexiong/audio_manager
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.12.0 <2.0.0"
+  flutter: ">=1.20.0"
 
 dependencies:
   flutter: