Upgrade the flutter version (SimformSolutionsPvtLtd#278)

Update flutter version

android/src/main/kotlin/com/simform/audio_waveforms/AudioPlayer.kt

@@ -24,16 +24,18 @@ class AudioPlayer(
     private var isPlayerPrepared: Boolean = false
     private var finishMode = FinishMode.Stop
     private var key = playerKey
-    private var updateFrequency = UpdateFrequency.Low
+    private var updateFrequency:Long = 200
 
     fun preparePlayer(
         result: MethodChannel.Result,
         path: String?,
         volume: Float?,
-        frequency: UpdateFrequency,
+        frequency: Long?,
     ) {
         if (path != null) {
-            updateFrequency = frequency
+            frequency?.let {
+                updateFrequency = it
+            }
             val uri = Uri.parse(path)
             val mediaItem = MediaItem.fromUri(uri)
             player = ExoPlayer.Builder(appContext).build()
@@ -191,7 +193,7 @@ class AudioPlayer(
                     args[Constants.current] = currentPosition
                     args[Constants.playerKey] = key
                     methodChannel.invokeMethod(Constants.onCurrentDuration, args)
-                    handler.postDelayed(this, updateFrequency.value)
+                    handler.postDelayed(this, updateFrequency)
                 } else {
                     result.error(Constants.LOG_TAG, "Can't get current Position of player", "")
                 }

android/src/main/kotlin/com/simform/audio_waveforms/AudioWaveformsPlugin.kt

@@ -77,10 +77,10 @@ class AudioWaveformsPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
                 if (key != null) {
                     initPlayer(key)
                     audioPlayers[key]?.preparePlayer(
-                        result,
-                        audioPath,
-                        volume?.toFloat(),
-                        getUpdateFrequency(frequency),
+                            result,
+                            audioPath,
+                            volume?.toFloat(),
+                            frequency?.toLong(),
                     )
                 } else {
                     result.error(Constants.LOG_TAG, "Player key can't be null", "")
@@ -246,15 +246,6 @@ class AudioWaveformsPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
         return
     }
 
-    private fun getUpdateFrequency(frequency: Int?): UpdateFrequency {
-        if (frequency == 2) {
-            return UpdateFrequency.High
-        } else if (frequency == 1) {
-            return UpdateFrequency.Medium
-        }
-        return UpdateFrequency.Low
-    }
-
     private fun createOrUpdateExtractor(
         playerKey: String,
         noOfSamples: Int,

android/src/main/kotlin/com/simform/audio_waveforms/Utils.kt

@@ -74,12 +74,6 @@ enum class FinishMode(val value:Int) {
     Stop(2)
 }
 
-enum class UpdateFrequency(val value:Long) {
-    High(50),
-    Medium(100),
-    Low(200),
-}
-
 fun interface RequestPermissionsSuccessCallback {
     fun onSuccess(results: Boolean?)
 }

example/pubspec.yaml

@@ -6,7 +6,7 @@ description: Demonstrates how to use the audio_waveforms plugin.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=3.1.0 <4.0.0"
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions

ios/Classes/AudioPlayer.swift

@@ -8,7 +8,7 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
     private var timer: Timer?
     private var player: AVAudioPlayer?
     private var finishMode: FinishMode = FinishMode.stop
-    private var updateFrequency = UpdateFrequency.low
+    private var updateFrequency = 200
     var plugin: SwiftAudioWaveformsPlugin
     var playerKey: String
     var flutterChannel: FlutterMethodChannel
@@ -20,9 +20,9 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         flutterChannel = channel
     }
 
-    func preparePlayer(path: String?, volume: Double?, updateFrequency: UpdateFrequency,result: @escaping FlutterResult) {
+    func preparePlayer(path: String?, volume: Double?, updateFrequency: Int?,result: @escaping FlutterResult) {
         if(!(path ?? "").isEmpty) {
-            self.updateFrequency = updateFrequency
+            self.updateFrequency = updateFrequency ?? 200
             let audioUrl = URL.init(string: path!)
             if(audioUrl == nil){
                 result(FlutterError(code: Constants.audioWaveforms, message: "Failed to initialise Url from provided audio file", details: "If path contains `file://` try removing it"))
@@ -128,7 +128,7 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
 
     func startListening() {
         if #available(iOS 10.0, *) {
-            timer = Timer.scheduledTimer(withTimeInterval: (updateFrequency.rawValue / 1000), repeats: true, block: { _ in
+            timer = Timer.scheduledTimer(withTimeInterval: (Double(updateFrequency) / 1000), repeats: true, block: { _ in
                 let ms = (self.player?.currentTime ?? 0) * 1000
                 self.flutterChannel.invokeMethod(Constants.onCurrentDuration, arguments: [Constants.current: Int(ms), Constants.playerKey: self.playerKey])
             })

ios/Classes/SwiftAudioWaveformsPlugin.swift

@@ -50,7 +50,7 @@ public class SwiftAudioWaveformsPlugin: NSObject, FlutterPlugin {
                 initPlayer(playerKey: key!)
                 audioPlayers[key!]?.preparePlayer(path: args?[Constants.path] as? String,
                                                   volume: args?[Constants.volume] as? Double,
-                                                  updateFrequency: getUpdateFrequency(freq: args?[Constants.updateFrequency] as? Int) ,
+                                                  updateFrequency: args?[Constants.updateFrequency] as? Int,
                                                   result: result)
             } else {
                 result(FlutterError(code: Constants.audioWaveforms, message: "Can not prepare player", details: "Player key is null"))
@@ -145,14 +145,6 @@ public class SwiftAudioWaveformsPlugin: NSObject, FlutterPlugin {
         }
     }
 
-    func getUpdateFrequency(freq: Int?) -> UpdateFrequency{
-        if(freq == 2){
-            return UpdateFrequency.high
-        } else if(freq == 1){
-            return UpdateFrequency.medium
-        }
-        return UpdateFrequency.low
-    }
 
     func initPlayer(playerKey: String) {
         if audioPlayers[playerKey] == nil {

ios/Classes/Utils.swift

@@ -68,11 +68,6 @@ enum FinishMode : Int{
     case stop = 2
 }
 
-enum UpdateFrequency : Double{
-    case high = 50.0
-    case medium = 100.0
-    case low = 200.0
-}
 /// Creates an 2D array of floats
 public typealias FloatChannelData = [[Float]]
 

lib/src/audio_waveforms.dart

@@ -204,9 +204,6 @@ class _AudioWaveformsState extends State<AudioWaveforms> {
       _totalBackDistance = Offset.zero;
       _dragOffset = Offset.zero;
     }
-    ambiguate(WidgetsBinding.instance)?.addPostFrameCallback((_) {
-      setState(() {});
-    });
   }
 
   void _recorderControllerListener() {

lib/src/base/utils.dart

@@ -139,9 +139,6 @@ enum FinishMode {
   stop
 }
 
-// TODO: remove this function if we remove support for flutter 2.x
-T? ambiguate<T>(T? object) => object;
-
 /// An enum to decide which type of waveform to show.
 enum WaveformType {
   /// Fits Waveform in provided width. Audio can be seeked with
@@ -190,11 +187,14 @@ extension RecorderStateExtension on RecorderState {
 /// Rate of updating the reported current duration.
 enum UpdateFrequency {
   /// Reports duration at every 50 milliseconds.
-  high,
+  high(50),
 
   /// Reports duration at every 100 milliseconds.
-  medium,
+  medium(100),
 
   /// Reports duration at every 200 milliseconds.
-  low
+  low(200);
+
+  const UpdateFrequency(this.value);
+  final int value;
 }

lib/src/controllers/player_controller.dart

@@ -122,7 +122,7 @@ class PlayerController extends ChangeNotifier {
     final isPrepared = await AudioWaveformsInterface.instance.preparePlayer(
       path: path,
       key: playerKey,
-      frequency: _getFrequency(),
+      frequency: updateFrequency.value,
       volume: volume,
     );
     if (isPrepared) {
@@ -310,18 +310,6 @@ class PlayerController extends ChangeNotifier {
     notifyListeners();
   }
 
-  // TODO: Replace this with enhanced enum when we drop support for dart 2.17 earlier versions
-  int _getFrequency() {
-    switch (updateFrequency) {
-      case UpdateFrequency.high:
-        return 2;
-      case UpdateFrequency.medium:
-        return 1;
-      case UpdateFrequency.low:
-        return 0;
-    }
-  }
-
   @override
   void notifyListeners() {
     if (_isDisposed) return;

lib/src/controllers/recorder_controller.dart

@@ -321,7 +321,7 @@ class RecorderController extends ChangeNotifier {
 
   /// Sets [shouldClearLabels] flag to false.
   void revertClearLabelCall() {
-    ambiguate(WidgetsBinding.instance)?.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       shouldClearLabels = false;
       notifyListeners();
     });

pubspec.yaml

@@ -5,8 +5,8 @@ homepage: https://github.com/SimformSolutionsPvtLtd/audio_waveforms
 issue_tracker: https://github.com/SimformSolutionsPvtLtd/audio_waveforms/issues
 
 environment:
-  sdk: ">=2.12.0 <4.0.0"
-  flutter: ">=1.20.0"
+  sdk: ">=3.1.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
   flutter: