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

style: 优化代码样式

Browse source
This commit is contained in:
Super12138 2025-07-04 14:55:11 +08:00
parent 4bcf1ac959
commit d133670cc5
3 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -35,7 +35,7 @@ android {
applicationId = "cn.super12138.todo" applicationId = "cn.super12138.todo"
minSdk = 24 minSdk = 24
targetSdk = 36 targetSdk = 36
versionCode = 748 versionCode = 753
versionName = "2.1.2" versionName = "2.1.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

5
app/src/main/kotlin/cn/super12138/todo/logic/model/SortingMethod.kt
View file

@ -6,19 +6,14 @@ import cn.super12138.todo.R
enum class SortingMethod(val id: Int) { enum class SortingMethod(val id: Int) {
// 按添加先后顺序 // 按添加先后顺序
Sequential(1), Sequential(1),
// 按学科 // 按学科
Category(2), Category(2),
// 按优先级 // 按优先级
Priority(3), Priority(3),
// 按完成情况 // 按完成情况
Completion(4), Completion(4),
// 按字母升序 // 按字母升序
AlphabeticalAscending(5), AlphabeticalAscending(5),
// 按字母降序 // 按字母降序
AlphabeticalDescending(6); AlphabeticalDescending(6);

29
app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt
View file

@ -50,36 +50,19 @@ fun MainPage(
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
val toDos = viewModel.sortedTodos.collectAsState(initial = emptyList()) val toDos = viewModel.sortedTodos.collectAsState(initial = emptyList())
val listState = rememberLazyListState()
/*val isExpanded by remember {
derivedStateOf {
listState.firstVisibleItemIndex == 0
}
}*/
val selectedTodos = viewModel.selectedTodoIds.collectAsState() val selectedTodos = viewModel.selectedTodoIds.collectAsState()
var showDeleteConfirmDialog by rememberSaveable { mutableStateOf(false) } val showCompleted by DataStoreManager.showCompletedFlow.collectAsState(initial = Constants.PREF_SHOW_COMPLETED_DEFAULT)
val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
val selectedTodoIds by remember { val listState = rememberLazyListState()
derivedStateOf { selectedTodos.value } var showDeleteConfirmDialog by rememberSaveable { mutableStateOf(false) }
}
val isSelectedIdsEmpty by remember {
derivedStateOf {
selectedTodoIds.isEmpty()
}
}
val selectedTodoIds by remember { derivedStateOf { selectedTodos.value } }
val isSelectedIdsEmpty by remember { derivedStateOf { selectedTodoIds.isEmpty() } }
val toDoList by remember { derivedStateOf { toDos.value } } val toDoList by remember { derivedStateOf { toDos.value } }
// Theme
val showCompleted by DataStoreManager.showCompletedFlow.collectAsState(initial = Constants.PREF_SHOW_COMPLETED_DEFAULT)
val filteredTodoList =
if (showCompleted) toDoList else toDoList.filter { item -> !item.isCompleted }
val totalTasks by remember { derivedStateOf { toDoList.size } } val totalTasks by remember { derivedStateOf { toDoList.size } }
val completedTasks by remember { derivedStateOf { toDoList.count { it.isCompleted } } } val completedTasks by remember { derivedStateOf { toDoList.count { it.isCompleted } } }
val filteredTodoList = if (showCompleted) toDoList else toDoList.filter { item -> !item.isCompleted }
BackHandler(enabled = !isSelectedIdsEmpty) { BackHandler(enabled = !isSelectedIdsEmpty) {
// 当按下返回键（或进行返回操作）时清空选择 // 当按下返回键（或进行返回操作）时清空选择