Fix BPM zero (#5)

This fixes a bug, where the user could set the BPM to zero and cause an ArythmeticException (division by zero)
Kwasow · Aug 26, 2023 · c9b6c3c · c9b6c3c
1 parent 0accff1
commit c9b6c3c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 50 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/src/main/java/com/kwasow/musekit/fragments/MetronomeFragment.kt b/app/src/main/java/com/kwasow/musekit/fragments/MetronomeFragment.kt
@@ -29,7 +29,7 @@ class MetronomeFragment : Fragment() {
             isBound = true
             metronomeService.connectTicker(binding.sliderBeat)
 
-            updateBpmText()
+            updateBpm()
             setupSoundPicker()
         }
 
@@ -85,51 +85,20 @@ class MetronomeFragment : Fragment() {
             }
         }
 
-        binding.buttonPlus5.setOnClickListener {
-            if (isBound) {
-                metronomeService.bpm += 5
-                updateBpmText()
-            }
-        }
-
-        binding.buttonPlus2.setOnClickListener {
-            if (isBound) {
-                metronomeService.bpm += 2
-                updateBpmText()
-            }
-        }
-
-        binding.buttonPlus1.setOnClickListener {
-            if (isBound) {
-                metronomeService.bpm += 1
-                updateBpmText()
-            }
-        }
-
-        binding.buttonMinus5.setOnClickListener {
-            if (isBound) {
-                metronomeService.bpm -= 5
-                updateBpmText()
-            }
-        }
-
-        binding.buttonMinus2.setOnClickListener {
-            if (isBound) {
-                metronomeService.bpm -= 2
-                updateBpmText()
-            }
-        }
+        binding.buttonPlus5.setOnClickListener { updateBpm(5) }
+        binding.buttonPlus2.setOnClickListener { updateBpm(2) }
+        binding.buttonPlus1.setOnClickListener { updateBpm(1) }
 
-        binding.buttonMinus1.setOnClickListener {
-            if (isBound) {
-                metronomeService.bpm -= 1
-                updateBpmText()
-            }
-        }
+        binding.buttonMinus5.setOnClickListener { updateBpm(-5) }
+        binding.buttonMinus2.setOnClickListener { updateBpm(-2) }
+        binding.buttonMinus1.setOnClickListener { updateBpm(-1) }
     }
 
-    private fun updateBpmText() {
-        if (isBound) binding.textBpm.text = metronomeService.bpm.toString()
+    private fun updateBpm(by: Int = 0) {
+        if (isBound) {
+            metronomeService.bpm += by
+            binding.textBpm.text = metronomeService.bpm.toString()
+        }
     }
 
     private fun setupSoundPicker() {

diff --git a/app/src/main/java/com/kwasow/musekit/services/MetronomeService.kt b/app/src/main/java/com/kwasow/musekit/services/MetronomeService.kt
@@ -36,7 +36,7 @@ class MetronomeService : Service(), Runnable {
         }
     var bpm = 60
         set(value) {
-            field = value.coerceAtMost(300)
+            field = value.coerceIn(30..300)
         }
 
     private var soundId by Delegates.notNull<Int>()