diff --git a/app/src/main/kotlin/cn/super12138/todo/logic/model/SortingMethod.kt b/app/src/main/kotlin/cn/super12138/todo/logic/model/SortingMethod.kt index 9f31dbd..036a2b9 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/model/SortingMethod.kt +++ b/app/src/main/kotlin/cn/super12138/todo/logic/model/SortingMethod.kt @@ -5,14 +5,16 @@ import cn.super12138.todo.R enum class SortingMethod(val id: Int) { Date(1), - Priority(2), - Completion(3), - AlphabeticalAscending(4), - AlphabeticalDescending(5); + Subject(2), + Priority(3), + Completion(4), + AlphabeticalAscending(5), + AlphabeticalDescending(6); fun getDisplayName(context: Context): String { val resId = when (this) { Date -> R.string.sorting_date + Subject -> R.string.sorting_subject Priority -> R.string.sorting_priority Completion -> R.string.sorting_completion AlphabeticalAscending -> R.string.sorting_alphabetical_ascending diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/viewmodels/MainViewModel.kt b/app/src/main/kotlin/cn/super12138/todo/ui/viewmodels/MainViewModel.kt index db49080..6001e8a 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/viewmodels/MainViewModel.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/viewmodels/MainViewModel.kt @@ -26,6 +26,7 @@ class MainViewModel : ViewModel() { val sortedTodos: Flow> = toDos.map { list -> when (appSortingMethod) { SortingMethod.Date -> list.sortedBy { it.id } + SortingMethod.Subject -> list.sortedBy { it.subject } SortingMethod.Priority -> list.sortedByDescending { it.priority } // 优先级高的在前 SortingMethod.Completion -> list.sortedBy { it.isCompleted } // 未完成的在前 SortingMethod.AlphabeticalAscending -> list.sortedBy { it.content } @@ -37,7 +38,7 @@ class MainViewModel : ViewModel() { private set var showCompletedTodos by mutableStateOf(GlobalValues.showCompleted) - // 深色模式 + // 主题颜色 var appDarkMode by mutableStateOf(DarkMode.fromId(GlobalValues.darkMode)) private set var appContrastLevel by mutableStateOf(ContrastLevel.fromFloat(GlobalValues.contrastLevel)) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 34c11fa..28d2cbf 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -83,6 +83,7 @@ 查看源代码、提交错误报告和改进建议 退出编辑后将无法找回你修改过的数据。确定退出编辑吗? 日期 + 学科 优先级 完成状态 首字母(升序) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ef1cd49..4b8eb74 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -84,6 +84,7 @@ View source code, submit bug reports, and improvement suggestions After exiting edit mode, you will not be able to retrieve the data you have modified. Are you sure you want to exit editing? Date + Subject Priority Completion Alphabetical (Ascending)