From 9552f55b8262ccbd6905ca80a4d4acc80aeb4586 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 10 Sep 2017 18:31:29 +0200 Subject: [PATCH] fix #198, show past events in the list widget too, if set so in settings --- .../adapters/EventListWidgetAdapter.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt index 85360556e..c2a510dc3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt @@ -21,14 +21,14 @@ import org.joda.time.DateTime import java.util.* class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsService.RemoteViewsFactory { - val ITEM_EVENT = 0 - val ITEM_HEADER = 1 + private val ITEM_EVENT = 0 + private val ITEM_HEADER = 1 - var events = ArrayList() - val textColor = context.config.widgetTextColor - var mediumFontSize = context.config.getFontSize() - var todayDate = "" - val allDayString = context.resources.getString(R.string.all_day) + private val allDayString = context.resources.getString(R.string.all_day) + private var events = ArrayList() + private val textColor = context.config.widgetTextColor + private var mediumFontSize = context.config.getFontSize() + private var todayDate = "" override fun getViewAt(position: Int): RemoteViews? { val type = getItemViewType(position) @@ -90,7 +90,7 @@ class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteV return remoteView } - fun getItemViewType(position: Int) = if (events[position] is ListEvent) ITEM_EVENT else ITEM_HEADER + private fun getItemViewType(position: Int) = if (events[position] is ListEvent) ITEM_EVENT else ITEM_HEADER override fun getLoadingView() = null @@ -106,7 +106,7 @@ class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteV override fun onDataSetChanged() { mediumFontSize = context.config.getFontSize() - val fromTS = DateTime().seconds() + val fromTS = DateTime().seconds() - context.config.displayPastEvents * 60 val toTS = DateTime().plusYears(1).seconds() context.dbHelper.getEventsInBackground(fromTS, toTS) { val listItems = ArrayList(it.size)