From efbdfd6fda32d3554cc212e3e492c9826d3da6e8 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 3 Jan 2025 04:06:44 -0600 Subject: [PATCH] Remove GOOGLE_TASKS subheader type --- .../com/todoroo/astrid/activity/MainActivity.kt | 13 ------------- .../astrid/activity/MainActivityViewModel.kt | 3 +-- .../todoroo/astrid/adapter/SubheaderClickHandler.kt | 3 --- .../java/org/tasks/dialogs/FilterPickerViewModel.kt | 1 - .../kotlin/org/tasks/filters/FilterProvider.kt | 1 - .../org/tasks/filters/NavigationDrawerSubheader.kt | 1 - 6 files changed, 1 insertion(+), 21 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt index 64eec9691..08491e3f0 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt @@ -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( diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt index 6821c3c11..d67b401e7 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt @@ -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) diff --git a/app/src/main/java/com/todoroo/astrid/adapter/SubheaderClickHandler.kt b/app/src/main/java/com/todoroo/astrid/adapter/SubheaderClickHandler.kt index 856e9df4b..bee3e066e 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/SubheaderClickHandler.kt +++ b/app/src/main/java/com/todoroo/astrid/adapter/SubheaderClickHandler.kt @@ -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( diff --git a/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt b/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt index c49c4ba55..a703d6c65 100644 --- a/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt +++ b/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt @@ -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) diff --git a/kmp/src/commonMain/kotlin/org/tasks/filters/FilterProvider.kt b/kmp/src/commonMain/kotlin/org/tasks/filters/FilterProvider.kt index 775a3697f..893002a6e 100644 --- a/kmp/src/commonMain/kotlin/org/tasks/filters/FilterProvider.kt +++ b/kmp/src/commonMain/kotlin/org/tasks/filters/FilterProvider.kt @@ -221,7 +221,6 @@ class FilterProvider( collapsed, when { account.isTasksOrg -> SubheaderType.TASKS - account.isGoogleTasks -> SubheaderType.GOOGLE_TASKS else -> SubheaderType.CALDAV }, account.id.toString(), diff --git a/kmp/src/commonMain/kotlin/org/tasks/filters/NavigationDrawerSubheader.kt b/kmp/src/commonMain/kotlin/org/tasks/filters/NavigationDrawerSubheader.kt index 99bc9c271..cba2aa78d 100644 --- a/kmp/src/commonMain/kotlin/org/tasks/filters/NavigationDrawerSubheader.kt +++ b/kmp/src/commonMain/kotlin/org/tasks/filters/NavigationDrawerSubheader.kt @@ -16,7 +16,6 @@ data class NavigationDrawerSubheader( enum class SubheaderType { PREFERENCE, - GOOGLE_TASKS, CALDAV, TASKS, }