Remove GOOGLE_TASKS subheader type

pull/3221/head
Alex Baker 12 months ago
parent dd06decc40
commit efbdfd6fda

@ -205,19 +205,6 @@ class MainActivity : AppCompatActivity() {
val account =
caldavDao.getAccount(it.header.id.toLong()) ?: return@launch
when (it.header.subheaderType) {
NavigationDrawerSubheader.SubheaderType.GOOGLE_TASKS ->
startActivityForResult(
Intent(
this@MainActivity,
GoogleTaskListSettingsActivity::class.java
)
.putExtra(
EXTRA_CALDAV_ACCOUNT,
account
),
REQUEST_NEW_LIST
)
NavigationDrawerSubheader.SubheaderType.CALDAV,
NavigationDrawerSubheader.SubheaderType.TASKS ->
startActivityForResult(

@ -33,8 +33,8 @@ import org.tasks.filters.Filter
import org.tasks.filters.FilterProvider
import org.tasks.filters.NavigationDrawerSubheader
import org.tasks.filters.getIcon
import org.tasks.preferences.TasksPreferences
import org.tasks.preferences.DefaultFilterProvider
import org.tasks.preferences.TasksPreferences
import org.tasks.themes.ColorProvider
import timber.log.Timber
import javax.inject.Inject
@ -197,7 +197,6 @@ class MainActivityViewModel @Inject constructor(
tasksPreferences.set(booleanPreferencesKey(subheader.id), collapsed)
localBroadcastManager.broadcastRefreshList()
}
NavigationDrawerSubheader.SubheaderType.GOOGLE_TASKS,
NavigationDrawerSubheader.SubheaderType.CALDAV,
NavigationDrawerSubheader.SubheaderType.TASKS -> {
caldavDao.setCollapsed(subheader.id, collapsed)

@ -18,7 +18,6 @@ import org.tasks.filters.FilterProvider.Companion.REQUEST_NEW_PLACE
import org.tasks.filters.FilterProvider.Companion.REQUEST_NEW_TAGS
import org.tasks.filters.NavigationDrawerSubheader
import org.tasks.filters.NavigationDrawerSubheader.SubheaderType.CALDAV
import org.tasks.filters.NavigationDrawerSubheader.SubheaderType.GOOGLE_TASKS
import org.tasks.filters.NavigationDrawerSubheader.SubheaderType.PREFERENCE
import org.tasks.filters.NavigationDrawerSubheader.SubheaderType.TASKS
import org.tasks.location.LocationPickerActivity
@ -38,7 +37,6 @@ class SubheaderClickHandler @Inject constructor(
val collapsed = !subheader.isCollapsed
when (subheader.subheaderType) {
PREFERENCE -> tasksPreferences.set(booleanPreferencesKey(subheader.id), collapsed)
GOOGLE_TASKS,
CALDAV,
TASKS -> caldavDao.setCollapsed(subheader.id, collapsed)
}
@ -67,7 +65,6 @@ class SubheaderClickHandler @Inject constructor(
(activity as AppCompatActivity).lifecycleScope.launch {
val account = caldavDao.getAccount(subheader.id.toLong()) ?: return@launch
when (subheader.subheaderType) {
NavigationDrawerSubheader.SubheaderType.GOOGLE_TASKS,
NavigationDrawerSubheader.SubheaderType.CALDAV,
NavigationDrawerSubheader.SubheaderType.TASKS ->
activity.startActivityForResult(

@ -80,7 +80,6 @@ class FilterPickerViewModel @Inject constructor(
when (subheader.subheaderType) {
NavigationDrawerSubheader.SubheaderType.PREFERENCE ->
tasksPreferences.set(booleanPreferencesKey(subheader.id), collapsed)
NavigationDrawerSubheader.SubheaderType.GOOGLE_TASKS,
NavigationDrawerSubheader.SubheaderType.CALDAV,
NavigationDrawerSubheader.SubheaderType.TASKS ->
caldavDao.setCollapsed(subheader.id, collapsed)

@ -221,7 +221,6 @@ class FilterProvider(
collapsed,
when {
account.isTasksOrg -> SubheaderType.TASKS
account.isGoogleTasks -> SubheaderType.GOOGLE_TASKS
else -> SubheaderType.CALDAV
},
account.id.toString(),

@ -16,7 +16,6 @@ data class NavigationDrawerSubheader(
enum class SubheaderType {
PREFERENCE,
GOOGLE_TASKS,
CALDAV,
TASKS,
}

Loading…
Cancel
Save