From 12aab1d259ab259bddcc031eb1fb41d9f337dba9 Mon Sep 17 00:00:00 2001 From: TheRealPad Date: Sat, 27 Apr 2024 13:55:13 -0700 Subject: [PATCH] fix(sound): change call to sound player --- app/src/main/AndroidManifest.xml | 1 + .../eipsaferoad/owl/presentation/home/Home.kt | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 687e95f..188b496 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,6 +7,7 @@ + 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 index 4988176..f4b97e9 100644 --- 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, context: Context, navController: NavHostController, alarms: MutableState, 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): Brush { } @Composable -fun Alarm(currentHeartRate: MutableState, alarms: MutableState, 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, alarms: MutableState, mVibrator: Vibrator) { var vibrationEffectSingle by remember { mutableStateOf(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE)) } @@ -220,6 +217,15 @@ fun Alarm(currentHeartRate: MutableState, alarms: MutableState, 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