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

feat: Add option to sort alarms

Browse Source
This commit is contained in:
jkemming
2020-12-26 14:09:14 +01:00
committed by jkemming
parent 6c91e072cc
commit 12ee706b4e
37 changed files with 198 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/kotlin/com/simplemobiletools/clock/dialogs/ChangeAlarmSortDialog.kt Normal file
View File

@ -0,0 +1,42 @@
package com.simplemobiletools.clock.dialogs
import android.view.View
import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.extensions.config
import com.simplemobiletools.clock.models.AlarmSort
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.extensions.setupDialogStuff
import kotlinx.android.synthetic.main.dialog_change_alarm_sort.view.*
class ChangeAlarmSortDialog(val activity: BaseSimpleActivity, val callback: (AlarmSort) -> Unit) {
private var view: View
init {
view = activity.layoutInflater.inflate(R.layout.dialog_change_alarm_sort, null).apply {
val activeRadioButton = when (activity.config.alarmSort) {
AlarmSort.CREATED_AT -> sorting_dialog_radio_created_at
AlarmSort.TIME_OF_DAY -> sorting_dialog_radio_time_of_day
}
activeRadioButton?.isChecked = true
}
AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok) { _, _ -> dialogConfirmed() }
.setNegativeButton(R.string.cancel, null)
.create().apply {
activity.setupDialogStuff(view, this, R.string.sort_by)
}
}
private fun dialogConfirmed() {
val sort = when (view.sorting_dialog_radio_sorting.checkedRadioButtonId) {
R.id.sorting_dialog_radio_created_at -> AlarmSort.CREATED_AT
R.id.sorting_dialog_radio_time_of_day -> AlarmSort.TIME_OF_DAY
else -> AlarmSort.default()
}
activity.config.alarmSort = sort
callback(sort)
}
}

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

@ -1,14 +1,13 @@
package com.simplemobiletools.clock.fragments
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.*
import androidx.fragment.app.Fragment
import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.activities.MainActivity
import com.simplemobiletools.clock.activities.SimpleActivity
import com.simplemobiletools.clock.adapters.AlarmsAdapter
import com.simplemobiletools.clock.dialogs.ChangeAlarmSortDialog
import com.simplemobiletools.clock.dialogs.EditAlarmDialog
import com.simplemobiletools.clock.extensions.*
import com.simplemobiletools.clock.helpers.DEFAULT_ALARM_MINUTES
@ -34,6 +33,7 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
storeStateVariables()
setHasOptionsMenu(true)
view = inflater.inflate(R.layout.fragment_alarm, container, false) as ViewGroup
return view
}
@ -53,6 +53,24 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
storeStateVariables()
}
override fun onCreateOptionsMenu(menu: Menu, menuInflater: MenuInflater) {
menuInflater.inflate(R.menu.menu_alarm, menu)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.sort -> showSortingDialog()
else -> return super.onOptionsItemSelected(item)
}
return true
}
private fun showSortingDialog() {
ChangeAlarmSortDialog(activity as SimpleActivity) {
setupAlarms()
}
}
private fun storeStateVariables() {
storedTextColor = requireContext().config.textColor
}
@ -72,7 +90,7 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
}
private fun setupAlarms() {
alarms = context?.dbHelper?.getAlarms() ?: return
alarms = context?.dbHelper?.getAlarms(context?.config?.alarmSort) ?: return
if (context?.getNextAlarm()?.isEmpty() == true) {
alarms.forEach {
if (it.days == TODAY_BIT && it.isEnabled && it.timeInMinutes <= getCurrentDayMinutes()) {

6
app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt
View File

@ -1,6 +1,7 @@
package com.simplemobiletools.clock.helpers
import android.content.Context
import com.simplemobiletools.clock.models.AlarmSort
import com.simplemobiletools.clock.extensions.gson.gson
import com.simplemobiletools.clock.models.Alarm
import com.simplemobiletools.clock.models.StateWrapper
@ -57,6 +58,11 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getString(TIMER_LABEL, null)
set(label) = prefs.edit().putString(TIMER_LABEL, label).apply()
var alarmSort: AlarmSort
get() = AlarmSort.valueOf(prefs.getInt(ALARM_SORT, AlarmSort.default().value))
?: AlarmSort.default()
set(alarmSort) = prefs.edit().putInt(ALARM_SORT, alarmSort.value).apply()
var alarmMaxReminderSecs: Int
get() = prefs.getInt(ALARM_MAX_REMINDER_SECS, DEFAULT_MAX_ALARM_REMINDER_SECS)
set(alarmMaxReminderSecs) = prefs.edit().putInt(ALARM_MAX_REMINDER_SECS, alarmMaxReminderSecs).apply()

1
app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
View File

@ -17,6 +17,7 @@ const val TIMER_SOUND_TITLE = "timer_sound_title"
const val TIMER_CHANNEL_ID = "timer_channel_id"
const val TIMER_LABEL = "timer_label"
const val TIMER_MAX_REMINDER_SECS = "timer_max_reminder_secs"
const val ALARM_SORT = "alarm_sort"
const val ALARM_MAX_REMINDER_SECS = "alarm_max_reminder_secs"
const val ALARM_LAST_CONFIG = "alarm_last_config"
const val USE_TEXT_SHADOW = "use_text_shadow"

10
app/src/main/kotlin/com/simplemobiletools/clock/helpers/DBHelper.kt
View File

@ -6,6 +6,7 @@ import android.database.Cursor
import android.database.sqlite.SQLiteDatabase
import android.database.sqlite.SQLiteOpenHelper
import android.text.TextUtils
import com.simplemobiletools.clock.models.AlarmSort
import com.simplemobiletools.clock.extensions.cancelAlarmClock
import com.simplemobiletools.clock.extensions.createNewAlarm
import com.simplemobiletools.clock.models.Alarm
@ -106,12 +107,17 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
fun getEnabledAlarms() = getAlarms().filter { it.isEnabled }
fun getAlarms(): ArrayList<Alarm> {
fun getAlarms(sort: AlarmSort? = null): ArrayList<Alarm> {
val alarms = ArrayList<Alarm>()
val cols = arrayOf(COL_ID, COL_TIME_IN_MINUTES, COL_DAYS, COL_IS_ENABLED, COL_VIBRATE, COL_SOUND_TITLE, COL_SOUND_URI, COL_LABEL)
val orderBy = when (sort) {
AlarmSort.CREATED_AT -> "$COL_ID ASC"
AlarmSort.TIME_OF_DAY -> "$COL_TIME_IN_MINUTES ASC"
else -> null
}
var cursor: Cursor? = null
try {
cursor = mDb.query(ALARMS_TABLE_NAME, cols, null, null, null, null, null)
cursor = mDb.query(ALARMS_TABLE_NAME, cols, null, null, null, null, orderBy)
if (cursor?.moveToFirst() == true) {
do {
try {

18
app/src/main/kotlin/com/simplemobiletools/clock/models/AlarmSort.kt Normal file
View File

@ -0,0 +1,18 @@
package com.simplemobiletools.clock.models
enum class AlarmSort(open val value: Int) {
CREATED_AT(0),
TIME_OF_DAY(1);
companion object {
fun default(): AlarmSort {
return CREATED_AT
}
fun valueOf(value: Int): AlarmSort? {
return AlarmSort.values()
.filter { it.value == value }
.getOrNull(0)
}
}
}