fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-02-13 02:10:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Alarm volume refactoring

Browse Source
This commit is contained in:
Rawlin C 2023-06-28 00:11:02 +05:30
parent dc4c6358da
commit f8b3119159
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,8 @@ import com.simplemobiletools.commons.helpers.isOreoPlus
import kotlinx.android.synthetic.main.activity_reminder.* import kotlinx.android.synthetic.main.activity_reminder.*
class ReminderActivity : SimpleActivity() { class ReminderActivity : SimpleActivity() {
private val INCREASE_VOLUME_DELAY = 3000L private val INCREASE_VOLUME_DELAY = 300L
private val MAX_VOL = 10f // max volume set to level 10
private val increaseVolumeHandler = Handler() private val increaseVolumeHandler = Handler()
private val maxReminderDurationHandler = Handler() private val maxReminderDurationHandler = Handler()
@ -37,6 +38,7 @@ class ReminderActivity : SimpleActivity() {
private var didVibrate = false private var didVibrate = false
private var wasAlarmSnoozed = false private var wasAlarmSnoozed = false
private var alarm: Alarm? = null private var alarm: Alarm? = null
private var audioManager: AudioManager? = null
private var mediaPlayer: MediaPlayer? = null private var mediaPlayer: MediaPlayer? = null
private var vibrator: Vibrator? = null private var vibrator: Vibrator? = null
private var lastVolumeValue = 0.1f private var lastVolumeValue = 0.1f
@ -168,14 +170,10 @@ class ReminderActivity : SimpleActivity() {
} }
private fun setupEffects() { private fun setupEffects() {
val maxAlarmStreamVolume = try { audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
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 = maxAlarmStreamVolume lastVolumeValue = MAX_VOL
} }
val doVibrate = if (alarm != null) alarm!!.vibrate else config.timerVibrate val doVibrate = if (alarm != null) alarm!!.vibrate else config.timerVibrate
@ -203,7 +201,7 @@ class ReminderActivity : SimpleActivity() {
} }
if (config.increaseVolumeGradually) { if (config.increaseVolumeGradually) {
scheduleVolumeIncrease(maxAlarmStreamVolume) scheduleVolumeIncrease(MAX_VOL)
} }
} catch (e: Exception) { } catch (e: Exception) {
} }
@ -213,7 +211,7 @@ class ReminderActivity : SimpleActivity() {
private fun scheduleVolumeIncrease(maxVolume: Float) { private fun scheduleVolumeIncrease(maxVolume: Float) {
increaseVolumeHandler.postDelayed({ increaseVolumeHandler.postDelayed({
lastVolumeValue = (lastVolumeValue + 0.1f).coerceAtMost(maxVolume) lastVolumeValue = (lastVolumeValue + 0.1f).coerceAtMost(maxVolume)
mediaPlayer?.setVolume(lastVolumeValue, lastVolumeValue) audioManager?.setStreamVolume(AudioManager.STREAM_ALARM, lastVolumeValue.toInt(), 0)
scheduleVolumeIncrease(maxVolume) scheduleVolumeIncrease(maxVolume)
}, INCREASE_VOLUME_DELAY) }, INCREASE_VOLUME_DELAY)
} }