Default Past events filter changed to "Ended two hours ago"

Author: yvolk

app/src/main/kotlin/org/andstatus/todoagenda/prefs/EndedSomeTimeAgo.kt

@@ -1,77 +1,59 @@
 package org.andstatus.todoagenda.prefs
 
+import org.andstatus.todoagenda.prefs.EndedSomeTimeAgo.entries
 import org.andstatus.todoagenda.util.MyClock
 import org.joda.time.DateTime
 
-enum class EndedSomeTimeAgo(private val value: String, private val hoursAgo: Int) {
+enum class EndedSomeTimeAgo(
+    private val value: String,
+    private val hoursAgo: Int,
+) {
     NONE("NONE", 0),
     ONE_HOUR("ONE_HOUR", 1),
     TWO_HOURS("TWO_HOURS", 2),
     FOUR_HOURS("FOUR_HOURS", 4),
     TODAY("TODAY", 0) {
-        override fun endedAt(clock: MyClock): DateTime? {
-            return clock.startOfToday()
-        }
+        override fun endedAt(clock: MyClock): DateTime? = clock.startOfToday()
     },
     YESTERDAY("YESTERDAY", 0) {
-        override fun endedAt(clock: MyClock): DateTime? {
-            return clock.startOfToday().minusDays(1)
-        }
+        override fun endedAt(clock: MyClock): DateTime? = clock.startOfToday().minusDays(1)
     },
     ONE_WEEK("ONE_WEEK", 0) {
-        override fun endedAt(clock: MyClock): DateTime? {
-            return clock.startOfToday().minusDays(7)
-        }
+        override fun endedAt(clock: MyClock): DateTime? = clock.startOfToday().minusDays(7)
     },
     TWO_WEEKS("TWO_WEEKS", 0) {
-        override fun endedAt(clock: MyClock): DateTime? {
-            return clock.startOfToday().minusDays(14)
-        }
+        override fun endedAt(clock: MyClock): DateTime? = clock.startOfToday().minusDays(14)
     },
     ONE_MONTH("ONE_MONTH", 0) {
-        override fun endedAt(clock: MyClock): DateTime? {
-            return clock.startOfToday().minusMonths(1)
-        }
+        override fun endedAt(clock: MyClock): DateTime? = clock.startOfToday().minusMonths(1)
     },
     TWO_MONTHS("TWO_MONTHS", 0) {
-        override fun endedAt(clock: MyClock): DateTime? {
-            return clock.startOfToday().minusMonths(2)
-        }
+        override fun endedAt(clock: MyClock): DateTime? = clock.startOfToday().minusMonths(2)
     },
     THREE_MONTHS("THREE_MONTHS", 0) {
-        override fun endedAt(clock: MyClock): DateTime? {
-            return clock.startOfToday().minusMonths(3)
-        }
+        override fun endedAt(clock: MyClock): DateTime? = clock.startOfToday().minusMonths(3)
     },
     SIX_MONTHS("SIX_MONTHS", 0) {
-        override fun endedAt(clock: MyClock): DateTime? {
-            return clock.startOfToday().minusMonths(6)
-        }
+        override fun endedAt(clock: MyClock): DateTime? = clock.startOfToday().minusMonths(6)
     },
     ONE_YEAR("ONE_YEAR", 0) {
-        override fun endedAt(clock: MyClock): DateTime? {
-            return clock.startOfToday().minusYears(1)
-        }
-    };
+        override fun endedAt(clock: MyClock): DateTime? = clock.startOfToday().minusYears(1)
+    }, ;
 
-    open fun endedAt(clock: MyClock): DateTime? {
-        return clock.now().minusHours(hoursAgo)
-    }
+    open fun endedAt(clock: MyClock): DateTime? = clock.now().minusHours(hoursAgo)
 
-    fun save(): String {
-        return value
-    }
+    fun save(): String = value
 
     companion object {
+        val defaultValue = TWO_HOURS
+
         fun fromValue(valueIn: String?): EndedSomeTimeAgo {
-            var ended = NONE
             for (item in entries) {
                 if (item.value == valueIn) {
-                    ended = item
-                    break
+                    return item
                 }
             }
-            return ended
+            return defaultValue
         }
     }
 }

app/src/main/kotlin/org/andstatus/todoagenda/prefs/InstanceSettings.kt

@@ -29,7 +29,6 @@ import org.json.JSONObject
 import java.io.IOException
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.stream.Collectors
-import kotlin.Int
 import kotlin.math.abs
 
 /**
@@ -88,7 +87,7 @@ data class InstanceSettings(
     //
     // ----------------------------------------------------------------------------------
     // Event filters
-    val eventsEnded: EndedSomeTimeAgo = EndedSomeTimeAgo.NONE,
+    val eventsEnded: EndedSomeTimeAgo = EndedSomeTimeAgo.defaultValue,
     val showPastEventsWithDefaultColor: Boolean = false,
     val eventRange: Int = PREF_EVENT_RANGE_DEFAULT.toInt(),
     val hideBasedOnKeywords: String? = "",
@@ -350,7 +349,7 @@ data class InstanceSettings(
     fun noPastEvents(): Boolean =
         filterMode != FilterMode.NO_FILTERING &&
             !showPastEventsWithDefaultColor &&
-            eventsEnded === EndedSomeTimeAgo.NONE &&
+            eventsEnded == EndedSomeTimeAgo.NONE &&
             noTaskSources()
 
     fun noTaskSources(): Boolean {