Fix bug where sound can be set to value with no mp4 file

a-mabe · Dec 22, 2024 · 852291a · 852291a
1 parent ff69f6a
commit 852291a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/pages/set_sounds/constants/sounds.dart b/lib/pages/set_sounds/constants/sounds.dart
@@ -13,13 +13,13 @@ const List<String> soundsList = <String>[
   'ding',
   'ding-sequence',
   'thunk',
-  'none',
+  '',
 ];
 
 const List<String> countdownSounds = <String>[
   'countdown-beep',
   'short-rest-beep',
-  'none',
+  '',
 ];
 
 var soundNames = {
@@ -38,5 +38,5 @@ var soundNames = {
   "short-rest-beep": "Beep",
   "short-whistle": "Short whistle",
   "thunk": "Thunk",
-  "none": "None"
+  "": "None"
 };
diff --git a/lib/pages/set_sounds/set_sounds.dart b/lib/pages/set_sounds/set_sounds.dart
@@ -116,7 +116,7 @@ class _SetSoundsState extends State<SetSounds> {
                               pool: pool,
                               soundsList: soundsList,
                               onFinished: (value) async {
-                                if (value != 'none') {
+                                if (value != '') {
                                   await pool.play(await soundIdMap[value]);
                                 }
                                 widget.timer.soundSettings.workSound = value!;
@@ -129,7 +129,7 @@ class _SetSoundsState extends State<SetSounds> {
                               pool: pool,
                               soundsList: soundsList,
                               onFinished: (value) async {
-                                if (value != 'none') {
+                                if (value != '') {
                                   await pool.play(await soundIdMap[value]);
                                 }
                                 widget.timer.soundSettings.restSound = value!;
@@ -142,7 +142,7 @@ class _SetSoundsState extends State<SetSounds> {
                               pool: pool,
                               soundsList: soundsList,
                               onFinished: (value) async {
-                                if (value != 'none') {
+                                if (value != '') {
                                   await pool.play(await soundIdMap[value]);
                                 }
                                 widget.timer.soundSettings.halfwaySound =
@@ -156,7 +156,7 @@ class _SetSoundsState extends State<SetSounds> {
                               pool: pool,
                               soundsList: countdownSounds,
                               onFinished: (value) async {
-                                if (value != 'none') {
+                                if (value != '') {
                                   await pool.play(await soundIdMap[value]);
                                 }
                                 widget.timer.soundSettings.countdownSound =
@@ -170,7 +170,7 @@ class _SetSoundsState extends State<SetSounds> {
                               pool: pool,
                               soundsList: soundsList,
                               onFinished: (value) async {
-                                if (value != 'none') {
+                                if (value != '') {
                                   await pool.play(await soundIdMap[value]);
                                 }
                                 widget.timer.soundSettings.endSound = value!;
@@ -190,7 +190,7 @@ class _SetSoundsState extends State<SetSounds> {
   }
 
   static Future<int> loadSound(String sound, Soundpool pool) async {
-    if (sound != "none") {
+    if (sound != "") {
       return await rootBundle
           .load("packages/background_hiit_timer/lib/assets/audio/$sound.mp3")
           .then((ByteData soundData) {