diff --git a/app/src/main/kotlin/cn/super12138/todo/logic/model/Priority.kt b/app/src/main/kotlin/cn/super12138/todo/logic/model/Priority.kt index 859c3f7..92abf72 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/model/Priority.kt +++ b/app/src/main/kotlin/cn/super12138/todo/logic/model/Priority.kt @@ -4,11 +4,11 @@ import android.content.Context import cn.super12138.todo.R enum class Priority(val value: Float) { - Urgent(10f), - Important(5f), + Urgent(2f), + Important(1f), Default(0f), - NotImportant(-5f), - NotUrgent(-10f); + NotImportant(-1f), + NotUrgent(-2f); fun getDisplayName(context: Context): String { val resId = when (this) { diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt index 038afe2..91cdd07 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt @@ -19,6 +19,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import cn.super12138.todo.R 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.ui.TodoDefaults import cn.super12138.todo.ui.pages.main.components.TodoCard @@ -71,7 +72,7 @@ fun ManagerFragment( content = item.content, subject = Subjects.fromId(item.subject).getDisplayName(context), completed = item.isCompleted, - priority = item.priority, + priority = Priority.fromFloat(item.priority), selected = selectedTodoIds.contains(item.id), onCardClick = { onItemClick(item) }, onCardLongClick = { onItemLongClick(item) }, diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/TodoCard.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/TodoCard.kt index c50d641..14820e7 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/TodoCard.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/TodoCard.kt @@ -51,7 +51,7 @@ fun TodoCard( content: String, subject: String, completed: Boolean, - priority: Float, + priority: Priority, selected: Boolean, onCardClick: () -> Unit = {}, onCardLongClick: () -> Unit = {}, @@ -112,16 +112,15 @@ fun TodoCard( badge = { Badge( containerColor = when (priority) { - -10f -> MaterialTheme.colorScheme.surfaceContainerHighest - -5f -> MaterialTheme.colorScheme.surfaceContainerHighest - 0f -> MaterialTheme.colorScheme.secondary - 5f -> MaterialTheme.colorScheme.tertiary - 10f -> MaterialTheme.colorScheme.error - else -> MaterialTheme.colorScheme.secondary + Priority.NotUrgent -> MaterialTheme.colorScheme.surfaceContainerHighest + Priority.NotImportant -> MaterialTheme.colorScheme.surfaceContainerHighest + Priority.Default -> MaterialTheme.colorScheme.secondary + Priority.Important -> MaterialTheme.colorScheme.tertiary + Priority.Urgent -> MaterialTheme.colorScheme.error }, modifier = Modifier.padding(start = 5.dp) ) { - Text(Priority.fromFloat(priority).getDisplayName(context)) + Text(priority.getDisplayName(context)) } } ) {