Move Parcelable

pull/2553/head
Alex Baker 2 years ago
parent 0f37f4859e
commit 4c25b81a4d

@ -5,7 +5,7 @@ import android.os.Parcelable
import androidx.annotation.MenuRes
import com.todoroo.andlib.sql.QueryTemplate
open class Filter : FilterListItem {
open class Filter : FilterListItem, Parcelable {
val valuesForNewTasks: MutableMap<String, Any> = HashMap()
var originalSqlQuery: String? = null
@Deprecated("for astrid manual order") var filterOverride: String? = null

@ -1,10 +1,9 @@
package com.todoroo.astrid.api
import android.os.Parcelable
import androidx.annotation.LayoutRes
import org.tasks.R
interface FilterListItem : Parcelable {
interface FilterListItem {
val itemType: Type
fun areItemsTheSame(other: FilterListItem): Boolean

@ -2,17 +2,13 @@ package org.tasks.filters
import android.content.Intent
import com.todoroo.astrid.api.FilterListItem
import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize
@Parcelize
data class NavigationDrawerAction(
val listingTitle: String,
val icon: Int,
val requestCode: Int,
val intent: Intent? = null,
) : FilterListItem {
@IgnoredOnParcel
override val itemType = FilterListItem.Type.ACTION
override fun areItemsTheSame(other: FilterListItem) = this == other

@ -1,12 +1,8 @@
package org.tasks.filters
import com.todoroo.astrid.api.FilterListItem
import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize
@Parcelize
class NavigationDrawerSeparator : FilterListItem {
@IgnoredOnParcel
override val itemType = FilterListItem.Type.SEPARATOR
override fun areItemsTheSame(other: FilterListItem): Boolean {

@ -2,10 +2,7 @@ package org.tasks.filters
import android.content.Intent
import com.todoroo.astrid.api.FilterListItem
import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize
@Parcelize
data class NavigationDrawerSubheader(
val listingTitle: String?,
val error: Boolean,
@ -23,7 +20,6 @@ data class NavigationDrawerSubheader(
return this == other
}
@IgnoredOnParcel
override val itemType = FilterListItem.Type.SUBHEADER
enum class SubheaderType {

Loading…
Cancel
Save