caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Small improvements in option to gradually increase alarm volume

Browse source
This commit is contained in:
Bart Sopers 2020-08-29 05:52:36 +02:00
parent e5b6cf7231
commit 3115f32e31
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
View file

@ -41,7 +41,7 @@ class AlarmSoundService : DaggerService() {
} }
private val handler = Handler() private val increaseVolumeHandler = Handler()
private var currentVolumeLevel = 0 private var currentVolumeLevel = 0
override fun onBind(intent: Intent): IBinder? = null override fun onBind(intent: Intent): IBinder? = null
@ -70,7 +70,7 @@ class AlarmSoundService : DaggerService() {
if (sp.getBoolean(R.string.key_gradually_increase_notification_volume, false)) { if (sp.getBoolean(R.string.key_gradually_increase_notification_volume, false)) {
currentVolumeLevel = 0; currentVolumeLevel = 0;
player?.setVolume(0f, 0f) player?.setVolume(0f, 0f)
handler.postDelayed(volumeUpdater, VOLUME_INCREASE_INITIAL_SILENT_TIME_MILLIS) increaseVolumeHandler.postDelayed(volumeUpdater, VOLUME_INCREASE_INITIAL_SILENT_TIME_MILLIS)
} else { } else {
player?.setVolume(1f, 1f) player?.setVolume(1f, 1f)
} }
@ -84,7 +84,7 @@ class AlarmSoundService : DaggerService() {
} }
override fun onDestroy() { override fun onDestroy() {
handler.removeCallbacks(volumeUpdater) increaseVolumeHandler.removeCallbacks(volumeUpdater)
player?.stop() player?.stop()
player?.release() player?.release()
aapsLogger.debug(LTag.CORE, "onDestroy") aapsLogger.debug(LTag.CORE, "onDestroy")
@ -97,24 +97,21 @@ class AlarmSoundService : DaggerService() {
// TODO replace with VolumeShaper when min API level >= 26 // TODO replace with VolumeShaper when min API level >= 26
private val volumeUpdater = object : Runnable { private val volumeUpdater = object : Runnable {
override fun run() { override fun run() {
if (player?.isPlaying == true) { currentVolumeLevel++;
currentVolumeLevel++;
val volumePercentage = 100.0.coerceAtMost(currentVolumeLevel / VOLUME_INCREASE_STEPS.toDouble() * 100) val volumePercentage = 100.0.coerceAtMost(currentVolumeLevel / VOLUME_INCREASE_STEPS.toDouble() * 100)
val volume = 1 - (ln(1.0.coerceAtLeast(100.0 - volumePercentage)) / ln(100.0)) val volume = (1 - (ln(1.0.coerceAtLeast(100.0 - volumePercentage)) / ln(100.0))).toFloat()
aapsLogger.debug(LTag.CORE, "Setting notification volume to {} ({} %)", volume, volumePercentage) aapsLogger.debug(LTag.CORE, "Setting notification volume to {} ({} %)", volume, volumePercentage)
val floatVolume = volume.toFloat() player?.setVolume(volume, volume)
player?.setVolume(floatVolume, floatVolume)
if (currentVolumeLevel < VOLUME_INCREASE_STEPS) { if (currentVolumeLevel < VOLUME_INCREASE_STEPS) {
// Increase volume faster as time goes by // Increase volume faster as time goes by
val delay = VOLUME_INCREASE_MIN_DELAY_MILLIS.coerceAtLeast(VOLUME_INCREASE_BASE_DELAY_MILLIS - val delay = VOLUME_INCREASE_MIN_DELAY_MILLIS.coerceAtLeast(VOLUME_INCREASE_BASE_DELAY_MILLIS -
((currentVolumeLevel - 1).toDouble().pow(VOLUME_INCREASE_DELAY_DECREMENT_EXPONENT) * 1000).toLong()) ((currentVolumeLevel - 1).toDouble().pow(VOLUME_INCREASE_DELAY_DECREMENT_EXPONENT) * 1000).toLong())
aapsLogger.debug(LTag.CORE, "Next notification volume increment in {}ms", delay) aapsLogger.debug(LTag.CORE, "Next notification volume increment in {}ms", delay)
handler.postDelayed(this, delay); increaseVolumeHandler.postDelayed(this, delay);
}
} }
} }
} }