Fix widget list chip for google task lists

pull/2251/head
Alex Baker 1 year ago
parent cc370557df
commit 09a1e5bc4f

@ -5,6 +5,7 @@ import android.widget.RemoteViews
import com.todoroo.andlib.utility.DateUtilities import com.todoroo.andlib.utility.DateUtilities
import com.todoroo.astrid.api.CaldavFilter import com.todoroo.astrid.api.CaldavFilter
import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.Filter
import com.todoroo.astrid.api.GtasksFilter
import com.todoroo.astrid.api.TagFilter import com.todoroo.astrid.api.TagFilter
import com.todoroo.astrid.data.Task import com.todoroo.astrid.data.Task
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
@ -73,11 +74,15 @@ class ChipProvider @Inject constructor(
} }
fun getListChip(filter: Filter?, task: TaskContainer): RemoteViews? { fun getListChip(filter: Filter?, task: TaskContainer): RemoteViews? {
task.caldav return task.caldav
?.takeIf { filter !is CaldavFilter } ?.takeIf { filter !is CaldavFilter && filter !is GtasksFilter }
?.let { newChip(CaldavFilter(chipListCache.getCaldavList(it)), R.drawable.ic_list_24px) } ?.let { chipListCache.getCaldavList(it) }
?.let { return it } ?.let {
return null newChip(
filter = if (task.isGoogleTask) GtasksFilter(it) else CaldavFilter(it),
defaultIcon = R.drawable.ic_list_24px
)
}
} }
fun getPlaceChip(filter: Filter?, task: TaskContainer): RemoteViews? { fun getPlaceChip(filter: Filter?, task: TaskContainer): RemoteViews? {

Loading…
Cancel
Save