From a51886870e97fbf199cfd91a8c1be49dc418ea74 Mon Sep 17 00:00:00 2001 From: fatih ergin Date: Mon, 21 Aug 2023 22:57:28 +0300 Subject: [PATCH 1/4] adjust initial alarm volume before media player starts playing. --- .../clock/activities/ReminderActivity.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt index 530a4a1d..3380bbce 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt @@ -22,8 +22,8 @@ import com.simplemobiletools.commons.helpers.* class ReminderActivity : SimpleActivity() { private val INCREASE_VOLUME_DELAY = 300L - private val increaseVolumeHandler = Handler() - private val maxReminderDurationHandler = Handler() + private val increaseVolumeHandler = Handler(Looper.getMainLooper()) + private val maxReminderDurationHandler = Handler(Looper.getMainLooper()) private val swipeGuideFadeHandler = Handler() private val vibrationHandler = Handler(Looper.getMainLooper()) private var isAlarmReminder = false @@ -198,19 +198,19 @@ class ReminderActivity : SimpleActivity() { } if (config.increaseVolumeGradually) { - scheduleVolumeIncrease(maxVol) + scheduleVolumeIncrease(maxVol, 0) } } catch (e: Exception) { } } } - private fun scheduleVolumeIncrease(maxVolume: Float) { + private fun scheduleVolumeIncrease(maxVolume: Float, delay: Long) { increaseVolumeHandler.postDelayed({ lastVolumeValue = (lastVolumeValue + 0.1f).coerceAtMost(maxVolume) audioManager?.setStreamVolume(AudioManager.STREAM_ALARM, lastVolumeValue.toInt(), 0) - scheduleVolumeIncrease(maxVolume) - }, INCREASE_VOLUME_DELAY) + scheduleVolumeIncrease(maxVolume, INCREASE_VOLUME_DELAY) + }, delay) } override fun onNewIntent(intent: Intent?) { From c2d1a08d1da482d9e367ed48c02c79eb9b8c9a65 Mon Sep 17 00:00:00 2001 From: fatih ergin Date: Mon, 21 Aug 2023 22:58:49 +0300 Subject: [PATCH 2/4] preserve initial device alarm volume --- .../clock/activities/ReminderActivity.kt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt index 3380bbce..f66a738e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt @@ -20,7 +20,9 @@ import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* class ReminderActivity : SimpleActivity() { - private val INCREASE_VOLUME_DELAY = 300L + companion object { + private const val INCREASE_VOLUME_DELAY = 300L + } private val increaseVolumeHandler = Handler(Looper.getMainLooper()) private val maxReminderDurationHandler = Handler(Looper.getMainLooper()) @@ -33,6 +35,7 @@ class ReminderActivity : SimpleActivity() { private var audioManager: AudioManager? = null private var mediaPlayer: MediaPlayer? = null private var vibrator: Vibrator? = null + private var initialAlarmVolume: Int? = null private var lastVolumeValue = 0.1f private var dragDownX = 0f private val binding: ActivityReminderBinding by viewBinding(ActivityReminderBinding::inflate) @@ -198,6 +201,7 @@ class ReminderActivity : SimpleActivity() { } if (config.increaseVolumeGradually) { + initialAlarmVolume = audioManager?.getStreamVolume(AudioManager.STREAM_ALARM) scheduleVolumeIncrease(maxVol, 0) } } catch (e: Exception) { @@ -213,6 +217,12 @@ class ReminderActivity : SimpleActivity() { }, delay) } + private fun resetVolumeToInitialValue() { + initialAlarmVolume?.apply { + audioManager?.setStreamVolume(AudioManager.STREAM_ALARM, this, 0) + } + } + override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) finishActivity() @@ -228,6 +238,10 @@ class ReminderActivity : SimpleActivity() { } private fun destroyEffects() { + if (config.increaseVolumeGradually) { + resetVolumeToInitialValue() + } + mediaPlayer?.stop() mediaPlayer?.release() mediaPlayer = null From 09ff33ab84df8f162571a57d9e7b06b12d68998e Mon Sep 17 00:00:00 2001 From: fatih ergin Date: Mon, 21 Aug 2023 23:00:28 +0300 Subject: [PATCH 3/4] remove misused and unnecessary media player method setVolume. it just break alarm volume level in a wrong way. --- .../com/simplemobiletools/clock/activities/ReminderActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt index f66a738e..df6bee02 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt @@ -194,7 +194,6 @@ class ReminderActivity : SimpleActivity() { mediaPlayer = MediaPlayer().apply { setAudioStreamType(AudioManager.STREAM_ALARM) setDataSource(this@ReminderActivity, Uri.parse(soundUri)) - setVolume(lastVolumeValue, lastVolumeValue) isLooping = true prepare() start() From fef105d98622e8c9f365444e7ef6b0247afc6a74 Mon Sep 17 00:00:00 2001 From: fatih ergin Date: Mon, 21 Aug 2023 23:02:09 +0300 Subject: [PATCH 4/4] respects to user defined alarm volume while increasing it gradually --- .../clock/activities/ReminderActivity.kt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt index df6bee02..8e09c79e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt @@ -21,6 +21,7 @@ import com.simplemobiletools.commons.helpers.* class ReminderActivity : SimpleActivity() { companion object { + private const val MIN_ALARM_VOLUME_FOR_INCREASING_ALARMS = 1 private const val INCREASE_VOLUME_DELAY = 300L } @@ -36,7 +37,6 @@ class ReminderActivity : SimpleActivity() { private var mediaPlayer: MediaPlayer? = null private var vibrator: Vibrator? = null private var initialAlarmVolume: Int? = null - private var lastVolumeValue = 0.1f private var dragDownX = 0f private val binding: ActivityReminderBinding by viewBinding(ActivityReminderBinding::inflate) @@ -169,10 +169,7 @@ class ReminderActivity : SimpleActivity() { private fun setupEffects() { audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager - val maxVol = audioManager?.getStreamMaxVolume(AudioManager.STREAM_ALARM)?.toFloat() ?: 10f - if (!isAlarmReminder || !config.increaseVolumeGradually) { - lastVolumeValue = maxVol - } + initialAlarmVolume = audioManager?.getStreamVolume(AudioManager.STREAM_ALARM) ?: 7 val doVibrate = alarm?.vibrate ?: config.timerVibrate if (doVibrate && isOreoPlus()) { @@ -200,19 +197,18 @@ class ReminderActivity : SimpleActivity() { } if (config.increaseVolumeGradually) { - initialAlarmVolume = audioManager?.getStreamVolume(AudioManager.STREAM_ALARM) - scheduleVolumeIncrease(maxVol, 0) + scheduleVolumeIncrease(MIN_ALARM_VOLUME_FOR_INCREASING_ALARMS.toFloat(), initialAlarmVolume!!.toFloat(), 0) } } catch (e: Exception) { } } } - private fun scheduleVolumeIncrease(maxVolume: Float, delay: Long) { + private fun scheduleVolumeIncrease(lastVolume: Float, maxVolume: Float, delay: Long) { increaseVolumeHandler.postDelayed({ - lastVolumeValue = (lastVolumeValue + 0.1f).coerceAtMost(maxVolume) - audioManager?.setStreamVolume(AudioManager.STREAM_ALARM, lastVolumeValue.toInt(), 0) - scheduleVolumeIncrease(maxVolume, INCREASE_VOLUME_DELAY) + val newLastVolume = (lastVolume + 0.1f).coerceAtMost(maxVolume) + audioManager?.setStreamVolume(AudioManager.STREAM_ALARM, newLastVolume.toInt(), 0) + scheduleVolumeIncrease(newLastVolume, maxVolume, INCREASE_VOLUME_DELAY) }, delay) }