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

Merge pull request #505 from pudup/master

Browse Source 
Fix #502
This commit is contained in:
Tibor Kaputa
2023-09-05 11:28:16 +02:00
committed by GitHub
parent 35132e7074 a75dce80f1
commit 149c072713
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.databinding.ActivityReminderBinding import com.simplemobiletools.clock.databinding.ActivityReminderBinding
import com.simplemobiletools.clock.extensions.* import com.simplemobiletools.clock.extensions.*
import com.simplemobiletools.clock.helpers.ALARM_ID import com.simplemobiletools.clock.helpers.ALARM_ID
import com.simplemobiletools.clock.helpers.ALARM_NOTIF_ID
import com.simplemobiletools.clock.helpers.getPassedSeconds import com.simplemobiletools.clock.helpers.getPassedSeconds
import com.simplemobiletools.clock.models.Alarm import com.simplemobiletools.clock.models.Alarm
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
@ -40,6 +41,7 @@ class ReminderActivity : SimpleActivity() {
private var initialAlarmVolume: Int? = null 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)
private var finished = false
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true isMaterialActivity = true
@ -239,8 +241,13 @@ class ReminderActivity : SimpleActivity() {
maxReminderDurationHandler.removeCallbacksAndMessages(null) maxReminderDurationHandler.removeCallbacksAndMessages(null)
swipeGuideFadeHandler.removeCallbacksAndMessages(null) swipeGuideFadeHandler.removeCallbacksAndMessages(null)
vibrationHandler.removeCallbacksAndMessages(null) vibrationHandler.removeCallbacksAndMessages(null)
if (!finished) {
finishActivity()
notificationManager.cancel(ALARM_NOTIF_ID)
} else {
destroyEffects() destroyEffects()
} }
}
private fun destroyEffects() { private fun destroyEffects() {
if (config.increaseVolumeGradually) { if (config.increaseVolumeGradually) {
@ -291,6 +298,7 @@ class ReminderActivity : SimpleActivity() {
} }
} }
finished = true
destroyEffects() destroyEffects()
finish() finish()
overridePendingTransition(0, 0) overridePendingTransition(0, 0)