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

Merge pull request #500 from fatihergin/fix/ISSUE-493-alarms-messed-up-global-alarm-volume

Browse Source 
reset device alarm volume to initial after alarm ends
This commit is contained in:
Tibor Kaputa 2023-08-22 10:03:28 +02:00 committed by GitHub
commit a85ad5cef9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,13 @@ import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.helpers.*
class ReminderActivity : SimpleActivity() { class ReminderActivity : SimpleActivity() {
private val INCREASE_VOLUME_DELAY = 300L companion object {
private const val MIN_ALARM_VOLUME_FOR_INCREASING_ALARMS = 1
private const val INCREASE_VOLUME_DELAY = 300L
}
private val increaseVolumeHandler = Handler() private val increaseVolumeHandler = Handler(Looper.getMainLooper())
private val maxReminderDurationHandler = Handler() private val maxReminderDurationHandler = Handler(Looper.getMainLooper())
private val swipeGuideFadeHandler = Handler() private val swipeGuideFadeHandler = Handler()
private val vibrationHandler = Handler(Looper.getMainLooper()) private val vibrationHandler = Handler(Looper.getMainLooper())
private var isAlarmReminder = false private var isAlarmReminder = false
@ -33,7 +36,7 @@ class ReminderActivity : SimpleActivity() {
private var audioManager: AudioManager? = 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 initialAlarmVolume: Int? = null
private var dragDownX = 0f private var dragDownX = 0f
private val binding: ActivityReminderBinding by viewBinding(ActivityReminderBinding::inflate) private val binding: ActivityReminderBinding by viewBinding(ActivityReminderBinding::inflate)
@ -166,10 +169,7 @@ class ReminderActivity : SimpleActivity() {
private fun setupEffects() { private fun setupEffects() {
audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
val maxVol = audioManager?.getStreamMaxVolume(AudioManager.STREAM_ALARM)?.toFloat() ?: 10f initialAlarmVolume = audioManager?.getStreamVolume(AudioManager.STREAM_ALARM) ?: 7
if (!isAlarmReminder || !config.increaseVolumeGradually) {
lastVolumeValue = maxVol
}
val doVibrate = alarm?.vibrate ?: config.timerVibrate val doVibrate = alarm?.vibrate ?: config.timerVibrate
if (doVibrate && isOreoPlus()) { if (doVibrate && isOreoPlus()) {
@ -191,26 +191,31 @@ class ReminderActivity : SimpleActivity() {
mediaPlayer = MediaPlayer().apply { mediaPlayer = MediaPlayer().apply {
setAudioStreamType(AudioManager.STREAM_ALARM) setAudioStreamType(AudioManager.STREAM_ALARM)
setDataSource(this@ReminderActivity, Uri.parse(soundUri)) setDataSource(this@ReminderActivity, Uri.parse(soundUri))
setVolume(lastVolumeValue, lastVolumeValue)
isLooping = true isLooping = true
prepare() prepare()
start() start()
} }
if (config.increaseVolumeGradually) { if (config.increaseVolumeGradually) {
scheduleVolumeIncrease(maxVol) scheduleVolumeIncrease(MIN_ALARM_VOLUME_FOR_INCREASING_ALARMS.toFloat(), initialAlarmVolume!!.toFloat(), 0)
} }
} catch (e: Exception) { } catch (e: Exception) {
} }
} }
} }
private fun scheduleVolumeIncrease(maxVolume: Float) { private fun scheduleVolumeIncrease(lastVolume: Float, maxVolume: Float, delay: Long) {
increaseVolumeHandler.postDelayed({ increaseVolumeHandler.postDelayed({
lastVolumeValue = (lastVolumeValue + 0.1f).coerceAtMost(maxVolume) val newLastVolume = (lastVolume + 0.1f).coerceAtMost(maxVolume)
audioManager?.setStreamVolume(AudioManager.STREAM_ALARM, lastVolumeValue.toInt(), 0) audioManager?.setStreamVolume(AudioManager.STREAM_ALARM, newLastVolume.toInt(), 0)
scheduleVolumeIncrease(maxVolume) scheduleVolumeIncrease(newLastVolume, maxVolume, INCREASE_VOLUME_DELAY)
}, INCREASE_VOLUME_DELAY) }, delay)
}
private fun resetVolumeToInitialValue() {
initialAlarmVolume?.apply {
audioManager?.setStreamVolume(AudioManager.STREAM_ALARM, this, 0)
}
} }
override fun onNewIntent(intent: Intent?) { override fun onNewIntent(intent: Intent?) {
@ -228,6 +233,10 @@ class ReminderActivity : SimpleActivity() {
} }
private fun destroyEffects() { private fun destroyEffects() {
if (config.increaseVolumeGradually) {
resetVolumeToInitialValue()
}
mediaPlayer?.stop() mediaPlayer?.stop()
mediaPlayer?.release() mediaPlayer?.release()
mediaPlayer = null mediaPlayer = null