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

prevent Event Type remove animation if it wasnt deleted

This commit is contained in:
tibbi 2018-01-19 20:20:56 +01:00
parent 9e7d99b822
commit fff3f05a99
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/calendar/activities/ManageEventTypesActivity.kt
View File

@ -54,9 +54,12 @@ class ManageEventTypesActivity : SimpleActivity(), DeleteEventTypesListener {
return true return true
} }
override fun deleteEventTypes(eventTypes: ArrayList<EventType>, deleteEvents: Boolean) { override fun deleteEventTypes(eventTypes: ArrayList<EventType>, deleteEvents: Boolean): Boolean {
if (eventTypes.any { it.caldavCalendarId != 0 }) { if (eventTypes.any { it.caldavCalendarId != 0 }) {
toast(R.string.unsync_caldav_calendar) toast(R.string.unsync_caldav_calendar)
if (eventTypes.size == 1) {
return false
}
} }
dbHelper.deleteEventTypes(eventTypes, deleteEvents) { dbHelper.deleteEventTypes(eventTypes, deleteEvents) {
@ -64,5 +67,6 @@ class ManageEventTypesActivity : SimpleActivity(), DeleteEventTypesListener {
toast(R.string.unknown_error_occurred) toast(R.string.unknown_error_occurred)
} }
} }
return true
} }
} }

3
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt
View File

@ -101,7 +101,8 @@ class ManageEventTypesAdapter(activity: SimpleActivity, val eventTypes: ArrayLis
} }
eventTypes.removeAll(eventTypesToDelete) eventTypes.removeAll(eventTypesToDelete)
listener?.deleteEventTypes(eventTypesToDelete, deleteEvents) if (listener?.deleteEventTypes(eventTypesToDelete, deleteEvents) == true) {
removeSelectedItems() removeSelectedItems()
} }
} }
}

2
app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/DeleteEventTypesListener.kt
View File

@ -4,5 +4,5 @@ import com.simplemobiletools.calendar.models.EventType
import java.util.* import java.util.*
interface DeleteEventTypesListener { interface DeleteEventTypesListener {
fun deleteEventTypes(eventTypes: ArrayList<EventType>, deleteEvents: Boolean) fun deleteEventTypes(eventTypes: ArrayList<EventType>, deleteEvents: Boolean): Boolean
} }