simplifying alarm sorting handling

app/src/main/kotlin/com/simplemobiletools/clock/dialogs/ChangeAlarmSortDialog.kt

@@ -4,16 +4,17 @@ 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.clock.helpers.SORT_BY_ALARM_TIME
+import com.simplemobiletools.clock.helpers.SORT_BY_CREATION_ORDER
 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) {
+class ChangeAlarmSortDialog(val activity: BaseSimpleActivity, val callback: () -> Unit) {
     private var view: View = activity.layoutInflater.inflate(R.layout.dialog_change_alarm_sort, null).apply {
         val activeRadioButton = when (activity.config.alarmSort) {
-            AlarmSort.CREATED_AT -> sorting_dialog_radio_creation_order
+            SORT_BY_ALARM_TIME -> sorting_dialog_radio_alarm_time
-            AlarmSort.TIME_OF_DAY -> sorting_dialog_radio_alarm_time
+            else -> sorting_dialog_radio_creation_order
         }
         activeRadioButton?.isChecked = true
     }
@@ -29,12 +30,11 @@ class ChangeAlarmSortDialog(val activity: BaseSimpleActivity, val callback: (Ala
 
     private fun dialogConfirmed() {
         val sort = when (view.sorting_dialog_radio_sorting.checkedRadioButtonId) {
-            R.id.sorting_dialog_radio_creation_order -> AlarmSort.CREATED_AT
+            R.id.sorting_dialog_radio_alarm_time -> SORT_BY_ALARM_TIME
-            R.id.sorting_dialog_radio_alarm_time -> AlarmSort.TIME_OF_DAY
+            else -> SORT_BY_CREATION_ORDER
-            else -> AlarmSort.default()
         }
-        activity.config.alarmSort = sort
 
-        callback(sort)
+        activity.config.alarmSort = sort
+        callback()
     }
 }

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

@@ -1,7 +1,9 @@
 package com.simplemobiletools.clock.fragments
 
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.simplemobiletools.clock.R
 import com.simplemobiletools.clock.activities.MainActivity
@@ -10,10 +12,7 @@ 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
+import com.simplemobiletools.clock.helpers.*
-import com.simplemobiletools.clock.helpers.TODAY_BIT
-import com.simplemobiletools.clock.helpers.getCurrentDayMinutes
-import com.simplemobiletools.clock.helpers.getTomorrowBit
 import com.simplemobiletools.clock.interfaces.ToggleAlarmInterface
 import com.simplemobiletools.clock.models.Alarm
 import com.simplemobiletools.commons.extensions.toast
@@ -33,7 +32,6 @@ 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,19 +51,7 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
         storeStateVariables()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, menuInflater: MenuInflater) {
+    fun showSortingDialog() {
-        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()
         }
@@ -90,7 +76,15 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
     }
 
     private fun setupAlarms() {
-        alarms = context?.dbHelper?.getAlarms(context?.config?.alarmSort) ?: return
+        alarms = context?.dbHelper?.getAlarms() ?: return
+        alarms.sortBy {
+            if (requireContext().config.alarmSort == SORT_BY_ALARM_TIME) {
+                it.timeInMinutes
+            } else {
+                it.id
+            }
+        }
+
         if (context?.getNextAlarm()?.isEmpty() == true) {
             alarms.forEach {
                 if (it.days == TODAY_BIT && it.isEnabled && it.timeInMinutes <= getCurrentDayMinutes()) {

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

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

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

@@ -9,7 +9,6 @@ const val SHOW_SECONDS = "show_seconds"
 const val SELECTED_TIME_ZONES = "selected_time_zones"
 const val EDITED_TIME_ZONE_TITLES = "edited_time_zone_titles"
 const val TIMER_SECONDS = "timer_seconds"
-const val TIMER_START_TIMESTAMP = "timer_timetamp"
 const val TIMER_STATE = "timer_state"
 const val TIMER_VIBRATE = "timer_vibrate"
 const val TIMER_SOUND_URI = "timer_sound_uri"
@@ -17,11 +16,11 @@ 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"
 const val INCREASE_VOLUME_GRADUALLY = "increase_volume_gradually"
+const val ALARMS_SORT_BY = "alarms_sort_by"
 
 const val TABS_COUNT = 4
 const val EDITED_TIME_ZONE_SEPARATOR = ":"
@@ -45,10 +44,15 @@ const val TAB_ALARM = 1
 const val TAB_STOPWATCH = 2
 const val TAB_TIMER = 3
 
+// stopwatch sorting
 const val SORT_BY_LAP = 1
 const val SORT_BY_LAP_TIME = 2
 const val SORT_BY_TOTAL_TIME = 4
 
+// alarm sorting
+const val SORT_BY_CREATION_ORDER = 0
+const val SORT_BY_ALARM_TIME = 1
+
 const val TODAY_BIT = -1
 const val TOMORROW_BIT = -2
 

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

@@ -6,7 +6,6 @@ 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
@@ -107,17 +106,12 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
 
     fun getEnabledAlarms() = getAlarms().filter { it.isEnabled }
 
-    fun getAlarms(sort: AlarmSort? = null): ArrayList<Alarm> {
+    fun getAlarms(): 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, orderBy)
+            cursor = mDb.query(ALARMS_TABLE_NAME, cols, null, null, null, null, null)
             if (cursor?.moveToFirst() == true) {
                 do {
                     try {

app/src/main/kotlin/com/simplemobiletools/clock/models/AlarmSort.kt

@@ -1,18 +0,0 @@
-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)
-        }
-    }
-}

app/src/main/res/menu/menu.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/sort"
+        android:icon="@drawable/ic_sort_vector"
+        android:title="@string/sort_by"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/settings"
         android:title="@string/settings"

app/src/main/res/menu/menu_alarm.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/sort"
-        android:icon="@drawable/ic_sort_vector"
-        android:title="@string/sort_by"
-        app:showAsAction="ifRoom"/>
-</menu>