fix(sound): change call to sound player

MyWatcher · Apr 27, 2024 · 12aab1d · 12aab1d
1 parent 8407063
commit 12aab1d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
     <uses-feature android:name="android.hardware.type.watch" />
 

diff --git a/app/src/main/java/com/eipsaferoad/owl/presentation/home/Home.kt b/app/src/main/java/com/eipsaferoad/owl/presentation/home/Home.kt
@@ -66,7 +66,7 @@ import kotlinx.coroutines.delay
 @Composable
 fun Home(currentHeartRate: MutableState<String>, context: Context, navController: NavHostController, alarms: MutableState<Alarm>, mVibrator: Vibrator) {
     if (alarms.value.isAlarmActivate && currentHeartRate.value.toInt() < 50 && currentHeartRate.value.toInt() != 0) {
-        Alarm(currentHeartRate, alarms, mVibrator)
+        Alarm(context, currentHeartRate, alarms, mVibrator)
     } else {
         NoAlarm(currentHeartRate.value, context, navController)
     }
@@ -202,10 +202,7 @@ fun borderBrushMultiColor(colors: List<Color>): Brush {
 }
 
 @Composable
-fun Alarm(currentHeartRate: MutableState<String>, alarms: MutableState<Alarm>, mVibrator: Vibrator) {
-    if (alarms.value.isAlarmActivate && alarms.value.sound.isActivate) {
-        soundPlayer(LocalContext.current, alarms.value.sound.actual, fileId = R.raw.default_alarm, loop = true)
-    }
+fun Alarm(context: Context, currentHeartRate: MutableState<String>, alarms: MutableState<Alarm>, mVibrator: Vibrator) {
     var vibrationEffectSingle by remember {
         mutableStateOf(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE))
     }
@@ -220,6 +217,15 @@ fun Alarm(currentHeartRate: MutableState<String>, alarms: MutableState<Alarm>, m
         }
     }
 
+    LaunchedEffect(Unit) {
+        while(true) {
+            if (alarms.value.isAlarmActivate && alarms.value.sound.isActivate) {
+                soundPlayer(context, alarms.value.sound.actual, fileId = R.raw.alarm_test)
+            }
+            delay(15000)
+        }
+    }
+
     Box(
         modifier = Modifier.fillMaxSize(),
         contentAlignment = Alignment.Center