fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-06-05 22:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Setting max alarm volume to max volume of STREAM_ALARM instead of 1f

Browse Source
This commit is contained in:
Rawlin C
2023-06-24 18:31:43 +05:30
parent b233443850
commit dc4c6358da
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
View File

@ -168,8 +168,14 @@ class ReminderActivity : SimpleActivity() {
} }
private fun setupEffects() { private fun setupEffects() {
val maxAlarmStreamVolume = try {
val audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
audioManager.getStreamMaxVolume(AudioManager.STREAM_ALARM).toFloat().div(100)
} catch (t: Throwable) {
1f
}
if (!isAlarmReminder || !config.increaseVolumeGradually) { if (!isAlarmReminder || !config.increaseVolumeGradually) {
lastVolumeValue = 1f lastVolumeValue = maxAlarmStreamVolume
} }
val doVibrate = if (alarm != null) alarm!!.vibrate else config.timerVibrate val doVibrate = if (alarm != null) alarm!!.vibrate else config.timerVibrate
@ -197,18 +203,18 @@ class ReminderActivity : SimpleActivity() {
} }
if (config.increaseVolumeGradually) { if (config.increaseVolumeGradually) {
scheduleVolumeIncrease() scheduleVolumeIncrease(maxAlarmStreamVolume)
} }
} catch (e: Exception) { } catch (e: Exception) {
} }
} }
} }
private fun scheduleVolumeIncrease() { private fun scheduleVolumeIncrease(maxVolume: Float) {
increaseVolumeHandler.postDelayed({ increaseVolumeHandler.postDelayed({
lastVolumeValue = Math.min(lastVolumeValue + 0.1f, 1f) lastVolumeValue = (lastVolumeValue + 0.1f).coerceAtMost(maxVolume)
mediaPlayer?.setVolume(lastVolumeValue, lastVolumeValue) mediaPlayer?.setVolume(lastVolumeValue, lastVolumeValue)
scheduleVolumeIncrease() scheduleVolumeIncrease(maxVolume)
}, INCREASE_VOLUME_DELAY) }, INCREASE_VOLUME_DELAY)
} }