style: 优化代码样式
This commit is contained in:
parent
4bcf1ac959
commit
d133670cc5
3 changed files with 7 additions and 29 deletions
|
|
@ -35,7 +35,7 @@ android {
|
|||
applicationId = "cn.super12138.todo"
|
||||
minSdk = 24
|
||||
targetSdk = 36
|
||||
versionCode = 748
|
||||
versionCode = 753
|
||||
versionName = "2.1.2"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
|
|
|||
|
|
@ -6,19 +6,14 @@ import cn.super12138.todo.R
|
|||
enum class SortingMethod(val id: Int) {
|
||||
// 按添加先后顺序
|
||||
Sequential(1),
|
||||
|
||||
// 按学科
|
||||
Category(2),
|
||||
|
||||
// 按优先级
|
||||
Priority(3),
|
||||
|
||||
// 按完成情况
|
||||
Completion(4),
|
||||
|
||||
// 按字母升序
|
||||
AlphabeticalAscending(5),
|
||||
|
||||
// 按字母降序
|
||||
AlphabeticalDescending(6);
|
||||
|
||||
|
|
|
|||
|
|
@ -50,36 +50,19 @@ fun MainPage(
|
|||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val toDos = viewModel.sortedTodos.collectAsState(initial = emptyList())
|
||||
val listState = rememberLazyListState()
|
||||
/*val isExpanded by remember {
|
||||
derivedStateOf {
|
||||
listState.firstVisibleItemIndex == 0
|
||||
}
|
||||
}*/
|
||||
|
||||
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 selectedTodoIds by remember {
|
||||
derivedStateOf { selectedTodos.value }
|
||||
}
|
||||
val isSelectedIdsEmpty by remember {
|
||||
derivedStateOf {
|
||||
selectedTodoIds.isEmpty()
|
||||
}
|
||||
}
|
||||
val listState = rememberLazyListState()
|
||||
var showDeleteConfirmDialog by rememberSaveable { mutableStateOf(false) }
|
||||
|
||||
val selectedTodoIds by remember { derivedStateOf { selectedTodos.value } }
|
||||
val isSelectedIdsEmpty by remember { derivedStateOf { selectedTodoIds.isEmpty() } }
|
||||
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 completedTasks by remember { derivedStateOf { toDoList.count { it.isCompleted } } }
|
||||
val filteredTodoList = if (showCompleted) toDoList else toDoList.filter { item -> !item.isCompleted }
|
||||
|
||||
BackHandler(enabled = !isSelectedIdsEmpty) {
|
||||
// 当按下返回键(或进行返回操作)时清空选择
|
||||
|
|
|
|||
Loading…
Reference in a new issue