fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-21 06:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

add a new isRepeatable field to listEvent + cleanup

Browse Source
This commit is contained in:
tibbi 2018-06-13 15:18:39 +02:00
parent cbdf90b1f7
commit 83e0006f0f
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt
View File

@ -110,16 +110,15 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList<Event>, r
private fun askConfirmDelete() { private fun askConfirmDelete() {
val eventIds = ArrayList<Int>(selectedPositions.size) val eventIds = ArrayList<Int>(selectedPositions.size)
val timestamps = ArrayList<Int>(selectedPositions.size) val timestamps = ArrayList<Int>(selectedPositions.size)
val eventsToDelete = ArrayList<Event>(selectedPositions.size)
selectedPositions.forEach { selectedPositions.forEach {
eventIds.add(events[it].id) val event = events[it]
timestamps.add(events[it].startTS) eventsToDelete.add(event)
eventIds.add(event.id)
timestamps.add(event.startTS)
} }
DeleteEventDialog(activity, eventIds) { DeleteEventDialog(activity, eventIds) {
val eventsToDelete = ArrayList<Event>(selectedPositions.size)
selectedPositions.sortedDescending().forEach {
eventsToDelete.add(events[it])
}
events.removeAll(eventsToDelete) events.removeAll(eventsToDelete)
when (it) { when (it) {

11
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt
View File

@ -201,22 +201,19 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList<ListIt
private fun askConfirmDelete() { private fun askConfirmDelete() {
val eventIds = ArrayList<Int>(selectedPositions.size) val eventIds = ArrayList<Int>(selectedPositions.size)
val timestamps = ArrayList<Int>(selectedPositions.size) val timestamps = ArrayList<Int>(selectedPositions.size)
val eventsToDelete = ArrayList<ListEvent>(selectedPositions.size)
selectedPositions.forEach { selectedPositions.sortedDescending().forEach {
val item = listItems[it] val item = listItems[it]
if (item is ListEvent) { if (item is ListEvent) {
eventIds.add(item.id) eventIds.add(item.id)
timestamps.add(item.startTS) timestamps.add(item.startTS)
eventsToDelete.add(item)
} }
} }
DeleteEventDialog(activity, eventIds) { DeleteEventDialog(activity, eventIds) {
val listItemsToDelete = ArrayList<ListItem>(selectedPositions.size) listItems.removeAll(eventsToDelete)
selectedPositions.sortedDescending().forEach {
val listItem = listItems[it]
listItemsToDelete.add(listItem)
}
listItems.removeAll(listItemsToDelete)
when (it) { when (it) {
DELETE_SELECTED_OCCURRENCE -> { DELETE_SELECTED_OCCURRENCE -> {

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

@ -153,7 +153,7 @@ class EventListWidgetAdapter(val context: Context) : RemoteViewsService.RemoteVi
prevCode = code prevCode = code
} }
val listEvent = ListEvent(it.id, it.startTS, it.endTS, it.title, it.description, it.getIsAllDay(), it.color, it.location, it.isPastEvent) val listEvent = ListEvent(it.id, it.startTS, it.endTS, it.title, it.description, it.getIsAllDay(), it.color, it.location, it.isPastEvent, it.repeatInterval > 0)
listItems.add(listEvent) listItems.add(listEvent)
} }

2
app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
View File

@ -421,7 +421,7 @@ fun Context.getEventListItems(events: List<Event>): ArrayList<ListItem> {
listItems.add(listSection) listItems.add(listSection)
prevCode = code prevCode = code
} }
val listEvent = ListEvent(it.id, it.startTS, it.endTS, it.title, it.description, it.getIsAllDay(), it.color, it.location, it.isPastEvent) val listEvent = ListEvent(it.id, it.startTS, it.endTS, it.title, it.description, it.getIsAllDay(), it.color, it.location, it.isPastEvent, it.repeatInterval > 0)
listItems.add(listEvent) listItems.add(listEvent)
} }
return listItems return listItems

2
app/src/main/kotlin/com/simplemobiletools/calendar/models/ListEvent.kt
View File

@ -1,4 +1,4 @@
package com.simplemobiletools.calendar.models package com.simplemobiletools.calendar.models
data class ListEvent(var id: Int = 0, var startTS: Int = 0, var endTS: Int = 0, var title: String = "", var description: String = "", data class ListEvent(var id: Int = 0, var startTS: Int = 0, var endTS: Int = 0, var title: String = "", var description: String = "",
var isAllDay: Boolean, var color: Int, var location: String = "", var isPastEvent: Boolean = false) : ListItem() var isAllDay: Boolean, var color: Int, var location: String = "", var isPastEvent: Boolean = false, var isRepeatable: Boolean = false) : ListItem()