From 84c77b976f2e37914742aacc5628e57800248399 Mon Sep 17 00:00:00 2001 From: Gautier de Lataillade <32983806+gdelataillade@users.noreply.github.com> Date: Tue, 3 Oct 2023 21:12:25 +0200 Subject: [PATCH] Fix android fadeDuration cast error --- lib/model/alarm_settings.dart | 9 ++------- lib/src/android_alarm.dart | 7 ++++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/model/alarm_settings.dart b/lib/model/alarm_settings.dart index cfb61eb4..1c30d4a2 100644 --- a/lib/model/alarm_settings.dart +++ b/lib/model/alarm_settings.dart @@ -8,12 +8,7 @@ class AlarmSettings { /// Path to audio asset to be used as the alarm ringtone. Accepted formats: /// /// * Project asset: `assets/your_audio.mp3`. - /// /// * Local asset: `/path/to/your/audio.mp3`, which is your `File.path`. - /// - /// For iOS, you need to drag and drop your asset(s) to your `Runner` folder - /// in Xcode and make sure 'Copy items if needed' is checked. - /// Check out README.md for more informations. final String assetAudioPath; /// If true, [assetAudioPath] will repeat indefinitely until alarm is stopped. @@ -95,8 +90,8 @@ class AlarmSettings { dateTime: DateTime.fromMicrosecondsSinceEpoch(json['dateTime'] as int), assetAudioPath: json['assetAudioPath'] as String, loopAudio: json['loopAudio'] as bool, - vibrate: json['vibrate'] != null ? json['vibrate'] as bool : true, - volumeMax: json['volumeMax'] != null ? json['volumeMax'] as bool : true, + vibrate: json['vibrate'] as bool, + volumeMax: json['volumeMax'] as bool, fadeDuration: json['fadeDuration'] as double, notificationTitle: json['notificationTitle'] as String?, notificationBody: json['notificationBody'] as String?, diff --git a/lib/src/android_alarm.dart b/lib/src/android_alarm.dart index 0a561370..94a3ac06 100644 --- a/lib/src/android_alarm.dart +++ b/lib/src/android_alarm.dart @@ -74,7 +74,7 @@ class AndroidAlarm { await playAlarm(id, { "assetAudioPath": settings.assetAudioPath, "loopAudio": settings.loopAudio, - "fadeDuration": settings.fadeDuration.toInt(), + "fadeDuration": settings.fadeDuration, }); return true; } @@ -147,12 +147,13 @@ class AndroidAlarm { send.send('vibrate-${audioDuration?.inSeconds}'); - final loopAudio = data['loopAudio']; + final loopAudio = data['loopAudio'] as bool; if (loopAudio) audioPlayer.setLoopMode(LoopMode.all); send.send('Alarm data received in isolate: $data'); - final fadeDuration = (data['fadeDuration'] as int).toDouble(); + final fadeDuration = data['fadeDuration']; + send.send('Alarm fadeDuration: $fadeDuration seconds'); if (fadeDuration > 0.0) {