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

adding a couple more alarm toggling related fixes

Browse Source
This commit is contained in:
tibbi
2020-11-05 11:21:29 +01:00
parent 5ac5bf8a0c
commit b0652399ea
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/kotlin/com/simplemobiletools/clock/adapters/AlarmsAdapter.kt
View File

@ -6,10 +6,10 @@ import android.view.ViewGroup
import android.widget.RelativeLayout import android.widget.RelativeLayout
import com.simplemobiletools.clock.R import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.activities.SimpleActivity import com.simplemobiletools.clock.activities.SimpleActivity
import com.simplemobiletools.clock.extensions.config import com.simplemobiletools.clock.extensions.*
import com.simplemobiletools.clock.extensions.dbHelper import com.simplemobiletools.clock.helpers.TODAY_BIT
import com.simplemobiletools.clock.extensions.getAlarmSelectedDaysString import com.simplemobiletools.clock.helpers.TOMORROW_BIT
import com.simplemobiletools.clock.extensions.getFormattedTime import com.simplemobiletools.clock.helpers.getCurrentDayMinutes
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.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
@ -17,6 +17,7 @@ import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.isVisible import com.simplemobiletools.commons.extensions.isVisible
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.helpers.mydebug
import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.commons.views.MyRecyclerView
import kotlinx.android.synthetic.main.item_alarm.view.* import kotlinx.android.synthetic.main.item_alarm.view.*
import java.util.* import java.util.*
@ -112,9 +113,21 @@ class AlarmsAdapter(activity: SimpleActivity, var alarms: ArrayList<Alarm>, val
toggleAlarmInterface.alarmToggled(alarm.id, alarm_switch.isChecked) toggleAlarmInterface.alarmToggled(alarm.id, alarm_switch.isChecked)
} }
} }
} else { } else if (alarm.days == TODAY_BIT) {
if (alarm.timeInMinutes <= getCurrentDayMinutes()) {
alarm.days = TOMORROW_BIT
alarm_days.text = resources.getString(R.string.tomorrow)
}
activity.dbHelper.updateAlarm(alarm)
context.scheduleNextAlarm(alarm, true)
toggleAlarmInterface.alarmToggled(alarm.id, alarm_switch.isChecked)
} else if (alarm.days == TOMORROW_BIT) {
toggleAlarmInterface.alarmToggled(alarm.id, alarm_switch.isChecked)
} else if (alarm_switch.isChecked) {
activity.toast(R.string.no_days_selected) activity.toast(R.string.no_days_selected)
alarm_switch.isChecked = false alarm_switch.isChecked = false
} else {
toggleAlarmInterface.alarmToggled(alarm.id, alarm_switch.isChecked)
} }
} }

3
app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
View File

@ -244,6 +244,9 @@ fun Context.showAlarmNotification(alarm: Alarm) {
if (alarm.days > 0) { if (alarm.days > 0) {
scheduleNextAlarm(alarm, false) scheduleNextAlarm(alarm, false)
} else {
dbHelper.updateAlarmEnabledState(alarm.id, false)
updateWidgets()
} }
} }