TaskListFragment.kt: Temporarily remove sorting functionality for now (#639)

A custom sorting dialog is in the works -
it will be Compose-based so we will have
to first migrate this entire fragment to
Compose (#582)

* Remove sorting functionality from
  `TasksListViewModel`

Author: EdricChan03

features/tasks/src/main/kotlin/com/edricchan/studybuddy/features/tasks/list/ui/compat/TaskListFragment.kt

@@ -109,13 +109,6 @@ class TaskListFragment : ViewBindingFragment<FragTodoBinding>(FragTodoBinding::i
                             }
                         }
                     }
-                    item(context.getString(R.string.menu_frag_task_sort_by_title)) {
-                        requestDismissOnClick = false
-                        setIcon(R.drawable.ic_sort_24dp)
-                        setItemClickListener {
-                            showSortByOptions()
-                        }
-                    }
                     item(context.getString(CoreResR.string.menu_settings_title)) {
                         setIcon(AppIcons.Compat.Settings.iconRes)
                         setItemClickListener {
@@ -275,56 +268,6 @@ class TaskListFragment : ViewBindingFragment<FragTodoBinding>(FragTodoBinding::i
         }
     }
 
-    // TODO: Use a more appropriate UI, see tracking issue
-    //  https://github.com/EdricChan03/studybuddy-android/issues/639
-    private fun showSortByOptions() {
-        showSingleSelectBottomSheet(
-            headerTitleRes = R.string.task_sort_dialog_header_title,
-            onConfirm = {
-                viewLifecycleOwner.lifecycleScope.launch {
-                    viewModel.updateSort(value = it.id)
-                }
-            }
-        ) {
-            val context = requireContext()
-
-            isSelected = { item, _ ->
-                viewModel.compatQuery.value == item.id
-            }
-
-            addItem(
-                id = TodoSortValues.NONE,
-                title = context.getString(R.string.sort_by_bottomsheet_none_title)
-            ) {
-                iconRes = R.drawable.ic_close_24dp
-            }
-            addItem(
-                id = TodoSortValues.TITLE_ASC,
-                title = context.getString(R.string.sort_by_bottomsheet_title_asc_title)
-            ) {
-                iconRes = R.drawable.ic_sort_ascending_24dp
-            }
-            addItem(
-                id = TodoSortValues.TITLE_DESC,
-                title = context.getString(R.string.sort_by_bottomsheet_title_desc_title)
-            ) {
-                iconRes = R.drawable.ic_sort_descending_24dp
-            }
-            addItem(
-                id = TodoSortValues.DUE_DATE_NEW_TO_OLD,
-                title = context.getString(R.string.sort_by_bottomsheet_due_date_newest_title)
-            ) {
-                iconRes = R.drawable.ic_sort_descending_24dp
-            }
-            addItem(
-                id = TodoSortValues.DUE_DATE_OLD_TO_NEW,
-                title = context.getString(R.string.sort_by_bottomsheet_due_date_oldest_title)
-            ) {
-                iconRes = R.drawable.ic_sort_ascending_24dp
-            }
-        }
-    }
-
     private fun newTaskActivity() {
         navController.navigateToCreateTask()
     }

features/tasks/src/main/kotlin/com/edricchan/studybuddy/features/tasks/vm/TasksListViewModel.kt

@@ -8,11 +8,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.edricchan.studybuddy.data.common.QueryMapper
 import com.edricchan.studybuddy.domain.common.sorting.SortDirection
-import com.edricchan.studybuddy.domain.common.sorting.toFirestoreDirection
 import com.edricchan.studybuddy.exts.common.TAG
 import com.edricchan.studybuddy.features.tasks.constants.sharedprefs.TodoOptionsPrefConstants
 import com.edricchan.studybuddy.features.tasks.constants.sharedprefs.TodoOptionsPrefConstants.TodoSortValues
-import com.edricchan.studybuddy.features.tasks.data.mapper.toDto
 import com.edricchan.studybuddy.features.tasks.data.model.TodoItem
 import com.edricchan.studybuddy.features.tasks.data.repo.TaskRepository
 import com.edricchan.studybuddy.features.tasks.data.repo.toggleCompleted
@@ -33,20 +31,6 @@ class TasksListViewModel @Inject constructor(
     @param:ApplicationContext private val context: Context,
     private val savedState: SavedStateHandle
 ) : ViewModel() {
-    private val taskOptionsPrefs = context.getSharedPreferences(
-        TodoOptionsPrefConstants.FILE_TODO_OPTIONS,
-        Context.MODE_PRIVATE
-    )
-
-    // TODO: Remove when migrated to new UI for sorting preferences
-    private val sortCompatMap = mapOf(
-        TodoSortValues.NONE to null,
-        TodoSortValues.TITLE_ASC to (TaskItem.Field.Title to SortDirection.Ascending),
-        TodoSortValues.TITLE_DESC to (TaskItem.Field.Title to SortDirection.Descending),
-        TodoSortValues.DUE_DATE_NEW_TO_OLD to (TaskItem.Field.DueDate to SortDirection.Descending),
-        TodoSortValues.DUE_DATE_OLD_TO_NEW to (TaskItem.Field.DueDate to SortDirection.Ascending)
-    )
-
     // A MutableStateFlow but without strict equality comparisons
     private val _query =
         MutableSharedFlow<QueryMapper?>(replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
@@ -64,39 +48,6 @@ class TasksListViewModel @Inject constructor(
         setQuery(null)
     }
 
-    /** The (compat) Firestore query to use, in its [TodoSortValues] form. */
-    val compatQuery = savedState.getStateFlow(
-        KEY_COMPAT_QUERY,
-        taskOptionsPrefs.getString(
-            TodoOptionsPrefConstants.PREF_DEFAULT_SORT, TodoSortValues.NONE
-        )
-    )
-
-    /** Updates the current Firestore query with the new sorting option to use. */
-    @Deprecated("For backwards compatibility with existing shared prefs")
-    suspend fun updateSort(value: String) {
-        // Persist updated data
-        taskOptionsPrefs.edit {
-            putString(
-                TodoOptionsPrefConstants.PREF_DEFAULT_SORT,
-                value
-            )
-        }
-        savedState[KEY_COMPAT_QUERY] = value
-
-        // Update the query
-        val sortBy = sortCompatMap[value]
-        setQuery(
-            sortBy?.let { (field, dir) ->
-                { it.orderBy(field.toDto().fieldName, dir.toFirestoreDirection()) }
-            } ?: run {
-                Log.w(TAG, "Unrecognised sort option $value was specified")
-                // Reset the query used
-                null
-            }
-        )
-    }
-
     /** The current list of tasks to be shown. */
     @OptIn(ExperimentalCoroutinesApi::class)
     val tasks = query
@@ -128,15 +79,4 @@ class TasksListViewModel @Inject constructor(
             resetQuery()
         }
     }
-
-    companion object {
-        /**
-         * Saved-state key used to store the current query.
-         *
-         * Its saved-state value represents the compat version as used in the
-         * task settings UI.
-         * @see TodoSortValues
-         */
-        const val KEY_COMPAT_QUERY = "tasks:compatQuery"
-    }
 }