fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #198, show past events in the list widget too, if set so in settings

This commit is contained in:
tibbi 2017-09-10 18:31:29 +02:00
parent 530a6749f6
commit 9552f55b82
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt
View File

@ -21,14 +21,14 @@ import org.joda.time.DateTime
import java.util.* import java.util.*
class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsService.RemoteViewsFactory { class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsService.RemoteViewsFactory {
val ITEM_EVENT = 0 private val ITEM_EVENT = 0
val ITEM_HEADER = 1 private val ITEM_HEADER = 1
var events = ArrayList<ListItem>() private val allDayString = context.resources.getString(R.string.all_day)
val textColor = context.config.widgetTextColor private var events = ArrayList<ListItem>()
var mediumFontSize = context.config.getFontSize() private val textColor = context.config.widgetTextColor
var todayDate = "" private var mediumFontSize = context.config.getFontSize()
val allDayString = context.resources.getString(R.string.all_day) private var todayDate = ""
override fun getViewAt(position: Int): RemoteViews? { override fun getViewAt(position: Int): RemoteViews? {
val type = getItemViewType(position) val type = getItemViewType(position)
@ -90,7 +90,7 @@ class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteV
return remoteView 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 override fun getLoadingView() = null
@ -106,7 +106,7 @@ class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteV
override fun onDataSetChanged() { override fun onDataSetChanged() {
mediumFontSize = context.config.getFontSize() mediumFontSize = context.config.getFontSize()
val fromTS = DateTime().seconds() val fromTS = DateTime().seconds() - context.config.displayPastEvents * 60
val toTS = DateTime().plusYears(1).seconds() val toTS = DateTime().plusYears(1).seconds()
context.dbHelper.getEventsInBackground(fromTS, toTS) { context.dbHelper.getEventsInBackground(fromTS, toTS) {
val listItems = ArrayList<ListItem>(it.size) val listItems = ArrayList<ListItem>(it.size)