diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cca1d33..5d60bfe 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -38,7 +38,7 @@ android { applicationId = "cn.super12138.todo" minSdk = 24 targetSdk = 36 - versionCode = 992 + versionCode = 995 versionName = "2.3.3" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" 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 1eaa213..70506fe 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 @@ -25,7 +25,7 @@ enum class SortingMethod( // 按字母降序 AlphabeticalDescending(id = 6, nameRes = R.string.sorting_alphabetical_descending), - DueDate(id = 7, nameRes = R.string.sorting_alphabetical_descending); + DueDate(id = 7, nameRes = R.string.sorting_due_date); companion object { fun fromId(id: Int) = entries.find { it.id == id } ?: Sequential diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/state/EditorState.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/state/EditorState.kt index d5a2ade..6219903 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/state/EditorState.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/state/EditorState.kt @@ -61,6 +61,7 @@ class EditorState(val initialTodo: TodoEntity? = null) { * 检查待办是否被编辑修改 */ fun isModified(): Boolean { + // Log.d("EditorState", "Initial: content='${initialTodo?.content ?: ""}', category='${initialTodo?.category ?: ""}', priority=${initialTodo?.priority ?: 0f}, isCompleted=${initialTodo?.isCompleted == true}, dueDate=${initialTodo?.dueDate} ; Now: content='$toDoContent', category='$categoryContent', priority=$priorityState, isCompleted=$isCompleted, dueDate=$dueDateState") var isModified = false if ((initialTodo?.content ?: "") != toDoContent) isModified = true if ((initialTodo?.category ?: "") != categoryContent) isModified = true @@ -76,7 +77,7 @@ class EditorState(val initialTodo: TodoEntity? = null) { object Saver : androidx.compose.runtime.saveable.Saver { override fun SaverScope.save(value: EditorState): Any { return listOf( - value.initialTodo?.id ?: 0, + value.initialTodo, value.toDoContent, value.isErrorContent, value.selectedCategoryIndex,