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

refactor: 组件化顶部应用栏

Browse source
This commit is contained in:
Super12138 2025-01-15 16:55:54 +08:00
parent 366f19ca06
commit 0f27eab03b
2 changed files with 105 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,7 @@ import androidx.window.core.layout.WindowWidthSizeClass
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.ui.pages.main.components.TodoFAB import cn.super12138.todo.ui.pages.main.components.TodoFAB
import cn.super12138.todo.ui.pages.main.components.TodoTopAppBar
import cn.super12138.todo.ui.viewmodels.MainViewModel import cn.super12138.todo.ui.viewmodels.MainViewModel
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -71,10 +72,6 @@ fun MainPage(viewModel: MainViewModel, modifier: Modifier = Modifier) {
} }
} }
val animatedTopAppBarColors by animateColorAsState(
targetValue = if (isSelectedIdsEmpty) MaterialTheme.colorScheme.surface else MaterialTheme.colorScheme.surfaceContainerHighest
)
BackHandler(enabled = !isSelectedIdsEmpty) { BackHandler(enabled = !isSelectedIdsEmpty) {
// 当按下返回键（或进行返回操作）时清空选择 // 当按下返回键（或进行返回操作）时清空选择
viewModel.clearAllTodoSelection() viewModel.clearAllTodoSelection()
@ -82,62 +79,13 @@ fun MainPage(viewModel: MainViewModel, modifier: Modifier = Modifier) {
Scaffold( Scaffold(
topBar = { topBar = {
TopAppBar( TodoTopAppBar(
navigationIcon = { selectedTodoIds = selectedTodoIds.value,
AnimatedVisibility(!isSelectedIdsEmpty) { selectedMode = !isSelectedIdsEmpty,
IconButton(onClick = { viewModel.clearAllTodoSelection() }) { onCancelSelect = { viewModel.clearAllTodoSelection() },
Icon( onSelectAll = { viewModel.toggleAllSelected() },
imageVector = Icons.Outlined.Close, onDeleteSelectedTodo = { viewModel.deleteSelectedTodo() },
contentDescription = stringResource(R.string.tip_clear_selected_items) toSettingsPage = {}
)
}
}
},
title = {
Text(
text = if (isSelectedIdsEmpty) {
stringResource(R.string.app_name)
} else {
stringResource(
R.string.title_selected_count,
selectedTodoIds.value.size
)
}
)
},
actions = {
AnimatedContent(isSelectedIdsEmpty) { isEmpty ->
if (isEmpty) {
IconButton(
onClick = {}
) {
Icon(
imageVector = Icons.Outlined.Settings,
contentDescription = stringResource(R.string.page_settings)
)
}
} else {
Row {
IconButton(onClick = { viewModel.toggleAllSelected() }) {
Icon(
imageVector = Icons.Outlined.SelectAll,
contentDescription = stringResource(R.string.tip_select_all)
)
}
IconButton(onClick = { viewModel.deleteSelectedTodo() }) {
Icon(
imageVector = Icons.Outlined.Delete,
contentDescription = stringResource(R.string.action_delete)
)
}
}
}
}
},
colors = TopAppBarDefaults.largeTopAppBarColors().copy(
containerColor = animatedTopAppBarColors
)
) )
}, },
floatingActionButton = { floatingActionButton = {

97
app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/TodoTopAppBar.kt Normal file
View file

@ -0,0 +1,97 @@
package cn.super12138.todo.ui.pages.main.components
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.foundation.layout.Row
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Close
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material.icons.outlined.SelectAll
import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import cn.super12138.todo.R
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun TodoTopAppBar(
selectedTodoIds: List<Int>,
selectedMode: Boolean,
onCancelSelect: () -> Unit,
onSelectAll: () -> Unit,
onDeleteSelectedTodo: () -> Unit,
toSettingsPage: () -> Unit,
modifier: Modifier = Modifier
) {
val animatedTopAppBarColors by animateColorAsState(
targetValue = if (selectedMode) MaterialTheme.colorScheme.surfaceContainerHighest else MaterialTheme.colorScheme.surface
)
TopAppBar(
navigationIcon = {
AnimatedVisibility(selectedMode) {
IconButton(onClick = onCancelSelect) {
Icon(
imageVector = Icons.Outlined.Close,
contentDescription = stringResource(R.string.tip_clear_selected_items)
)
}
}
},
title = {
Text(
text = if (!selectedMode) {
stringResource(R.string.app_name)
} else {
stringResource(
R.string.title_selected_count,
selectedTodoIds.size
)
}
)
},
actions = {
AnimatedContent(selectedMode) { inSelectedMode ->
if (!inSelectedMode) {
IconButton(
onClick = toSettingsPage
) {
Icon(
imageVector = Icons.Outlined.Settings,
contentDescription = stringResource(R.string.page_settings)
)
}
} else {
Row {
IconButton(onClick = onSelectAll) {
Icon(
imageVector = Icons.Outlined.SelectAll,
contentDescription = stringResource(R.string.tip_select_all)
)
}
IconButton(onClick = onDeleteSelectedTodo) {
Icon(
imageVector = Icons.Outlined.Delete,
contentDescription = stringResource(R.string.action_delete)
)
}
}
}
}
},
colors = TopAppBarDefaults.largeTopAppBarColors().copy(
containerColor = animatedTopAppBarColors
)
)
}