danvics/VerveDo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(data): 简化优先级的存储值

Browse source
This commit is contained in:
Super12138 2025-02-08 20:54:51 +08:00
parent 426c15dac5
commit 9f9485f274
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/kotlin/cn/super12138/todo/logic/model/Priority.kt
View file

@ -4,11 +4,11 @@ import android.content.Context
import cn.super12138.todo.R import cn.super12138.todo.R
enum class Priority(val value: Float) { enum class Priority(val value: Float) {
Urgent(10f), Urgent(2f),
Important(5f), Important(1f),
Default(0f), Default(0f),
NotImportant(-5f), NotImportant(-1f),
NotUrgent(-10f); NotUrgent(-2f);
fun getDisplayName(context: Context): String { fun getDisplayName(context: Context): String {
val resId = when (this) { val resId = when (this) {

3
app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt
View file

@ -19,6 +19,7 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import cn.super12138.todo.R import cn.super12138.todo.R
import cn.super12138.todo.logic.database.TodoEntity import cn.super12138.todo.logic.database.TodoEntity
import cn.super12138.todo.logic.model.Priority
import cn.super12138.todo.logic.model.Subjects import cn.super12138.todo.logic.model.Subjects
import cn.super12138.todo.ui.TodoDefaults import cn.super12138.todo.ui.TodoDefaults
import cn.super12138.todo.ui.pages.main.components.TodoCard import cn.super12138.todo.ui.pages.main.components.TodoCard
@ -71,7 +72,7 @@ fun ManagerFragment(
content = item.content, content = item.content,
subject = Subjects.fromId(item.subject).getDisplayName(context), subject = Subjects.fromId(item.subject).getDisplayName(context),
completed = item.isCompleted, completed = item.isCompleted,
priority = item.priority, priority = Priority.fromFloat(item.priority),
selected = selectedTodoIds.contains(item.id), selected = selectedTodoIds.contains(item.id),
onCardClick = { onItemClick(item) }, onCardClick = { onItemClick(item) },
onCardLongClick = { onItemLongClick(item) }, onCardLongClick = { onItemLongClick(item) },

15
app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/TodoCard.kt
View file

@ -51,7 +51,7 @@ fun TodoCard(
content: String, content: String,
subject: String, subject: String,
completed: Boolean, completed: Boolean,
priority: Float, priority: Priority,
selected: Boolean, selected: Boolean,
onCardClick: () -> Unit = {}, onCardClick: () -> Unit = {},
onCardLongClick: () -> Unit = {}, onCardLongClick: () -> Unit = {},
@ -112,16 +112,15 @@ fun TodoCard(
badge = { badge = {
Badge( Badge(
containerColor = when (priority) { containerColor = when (priority) {
-10f -> MaterialTheme.colorScheme.surfaceContainerHighest Priority.NotUrgent -> MaterialTheme.colorScheme.surfaceContainerHighest
-5f -> MaterialTheme.colorScheme.surfaceContainerHighest Priority.NotImportant -> MaterialTheme.colorScheme.surfaceContainerHighest
0f -> MaterialTheme.colorScheme.secondary Priority.Default -> MaterialTheme.colorScheme.secondary
5f -> MaterialTheme.colorScheme.tertiary Priority.Important -> MaterialTheme.colorScheme.tertiary
10f -> MaterialTheme.colorScheme.error Priority.Urgent -> MaterialTheme.colorScheme.error
else -> MaterialTheme.colorScheme.secondary
}, },
modifier = Modifier.padding(start = 5.dp) modifier = Modifier.padding(start = 5.dp)
) { ) {
Text(Priority.fromFloat(priority).getDisplayName(context)) Text(priority.getDisplayName(context))
} }
} }
) { ) {