fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2024-12-15 01:44:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

disable Today alarms, if no longer valid

Browse Source
This commit is contained in:
tibbi 2020-11-05 12:02:23 +01:00
parent 822044ed0f
commit 5bb05c04c0
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/clock/App.kt
View File

@ -85,7 +85,7 @@ class App : Application(), LifecycleObserver {
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
fun onMessageEvent(event: TimerState.Finish) { fun onMessageEvent(event: TimerState.Finish) {
val pendingIntent = getOpenTimerTabIntent() val pendingIntent = getOpenTimerTabIntent()
val notification = getTimerNotification(pendingIntent, false) //MAYBE IN FUTURE ADD TIME TO NOTIFICATION val notification = getTimerNotification(pendingIntent, false)
val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
notificationManager.notify(TIMER_NOTIF_ID, notification) notificationManager.notify(TIMER_NOTIF_ID, notification)

14
app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt
View File

@ -12,11 +12,14 @@ import com.simplemobiletools.clock.adapters.AlarmsAdapter
import com.simplemobiletools.clock.dialogs.EditAlarmDialog import com.simplemobiletools.clock.dialogs.EditAlarmDialog
import com.simplemobiletools.clock.extensions.* import com.simplemobiletools.clock.extensions.*
import com.simplemobiletools.clock.helpers.DEFAULT_ALARM_MINUTES import com.simplemobiletools.clock.helpers.DEFAULT_ALARM_MINUTES
import com.simplemobiletools.clock.helpers.TODAY_BIT
import com.simplemobiletools.clock.helpers.getCurrentDayMinutes
import com.simplemobiletools.clock.helpers.getTomorrowBit import com.simplemobiletools.clock.helpers.getTomorrowBit
import com.simplemobiletools.clock.interfaces.ToggleAlarmInterface import com.simplemobiletools.clock.interfaces.ToggleAlarmInterface
import com.simplemobiletools.clock.models.Alarm import com.simplemobiletools.clock.models.Alarm
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.AlarmSound import com.simplemobiletools.commons.models.AlarmSound
import kotlinx.android.synthetic.main.fragment_alarm.view.* import kotlinx.android.synthetic.main.fragment_alarm.view.*
import java.util.* import java.util.*
@ -70,6 +73,17 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
private fun setupAlarms() { private fun setupAlarms() {
alarms = context?.dbHelper?.getAlarms() ?: return alarms = context?.dbHelper?.getAlarms() ?: return
if (context?.getNextAlarm()?.isEmpty() == true) {
alarms.forEach {
if (it.days == TODAY_BIT && it.isEnabled && it.timeInMinutes <= getCurrentDayMinutes()) {
it.isEnabled = false
ensureBackgroundThread {
context?.dbHelper?.updateAlarmEnabledState(it.id, false)
}
}
}
}
val currAdapter = view.alarms_list.adapter val currAdapter = view.alarms_list.adapter
if (currAdapter == null) { if (currAdapter == null) {
AlarmsAdapter(activity as SimpleActivity, alarms, this, view.alarms_list) { AlarmsAdapter(activity as SimpleActivity, alarms, this, view.alarms_list) {