FatttSnake/oxygen-android
1
0
Fork 0
Code Pull Requests Activity

Feat(UI): Automatically hide app bar

Browse Source 
Automatically hide top and bottom app bars when page scrolls
This commit is contained in:
Fat Snake
2024-04-02 10:22:51 +08:00
parent 0e24b46525
commit e777f832e6
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenApp.kt
View File

@@ -11,6 +11,8 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawing
import androidx.compose.foundation.layout.safeDrawingPadding
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.material3.BottomAppBar
import androidx.compose.material3.BottomAppBarDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -30,6 +32,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavDestination
@@ -73,6 +76,9 @@ fun OxygenApp(appState: OxygenAppState) {
val noConnectMessage = stringResource(R.string.no_connect)
val topAppBarScrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
val bottomAppBarScrollBehavior = BottomAppBarDefaults.exitAlwaysScrollBehavior()
LaunchedEffect(isOffline) {
if (isOffline) {
snackbarHostState.showSnackbar(
@@ -89,12 +95,18 @@ fun OxygenApp(appState: OxygenAppState) {
}
Scaffold(
modifier = Modifier
.nestedScroll(topAppBarScrollBehavior.nestedScrollConnection)
.nestedScroll(bottomAppBarScrollBehavior.nestedScrollConnection),
containerColor = Color.Transparent,
contentColor = MaterialTheme.colorScheme.onBackground,
contentWindowInsets = WindowInsets(0, 0, 0, 0),
snackbarHost = { SnackbarHost(snackbarHostState) },
bottomBar = {
if (appState.shouldShowBottomBar && destination != null) {
BottomAppBar(
scrollBehavior = bottomAppBarScrollBehavior
) {
OxygenBottomBar(
destinations = appState.topLevelDestinations,
onNavigateToDestination = appState::navigateToTopLevelDestination,
@@ -102,6 +114,7 @@ fun OxygenApp(appState: OxygenAppState) {
)
}
}
}
) { padding ->
Row(
Modifier
@@ -128,6 +141,7 @@ fun OxygenApp(appState: OxygenAppState) {
) {
if (destination != null) {
OxygenTopAppBar(
scrollBehavior = topAppBarScrollBehavior,
titleRes = destination.titleTextId,
navigationIcon = OxygenIcons.Search,
navigationIconContentDescription = stringResource(R.string.feature_settings_top_app_bar_navigation_icon_description),

3
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/OxygenTopAppBar.kt
View File

@@ -9,6 +9,7 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarColors
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
@@ -22,6 +23,7 @@ import android.R as androidR
@Composable
fun OxygenTopAppBar(
modifier: Modifier = Modifier,
scrollBehavior: TopAppBarScrollBehavior? = null,
@StringRes titleRes: Int,
navigationIcon: ImageVector,
navigationIconContentDescription: String,
@@ -33,6 +35,7 @@ fun OxygenTopAppBar(
) {
CenterAlignedTopAppBar(
modifier = modifier,
scrollBehavior = scrollBehavior,
title = { Text(stringResource(titleRes)) },
navigationIcon = {
IconButton(onClick = onNavigationClick) {