|
|
|
|
@ -16,6 +16,7 @@
|
|
|
|
|
|
|
|
|
|
package com.google.samples.apps.nowinandroid.ui
|
|
|
|
|
|
|
|
|
|
import androidx.compose.foundation.layout.Column
|
|
|
|
|
import androidx.compose.foundation.layout.ExperimentalLayoutApi
|
|
|
|
|
import androidx.compose.foundation.layout.Row
|
|
|
|
|
import androidx.compose.foundation.layout.WindowInsets
|
|
|
|
|
@ -49,7 +50,6 @@ import androidx.compose.ui.res.painterResource
|
|
|
|
|
import androidx.compose.ui.res.stringResource
|
|
|
|
|
import androidx.compose.ui.semantics.semantics
|
|
|
|
|
import androidx.compose.ui.semantics.testTagsAsResourceId
|
|
|
|
|
import androidx.compose.ui.zIndex
|
|
|
|
|
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
|
|
|
|
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
|
|
|
|
import androidx.navigation.NavDestination
|
|
|
|
|
@ -66,6 +66,8 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopAp
|
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.DrawableResourceIcon
|
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIcon
|
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
|
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColors
|
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradientColors
|
|
|
|
|
import com.google.samples.apps.nowinandroid.feature.settings.R as settingsR
|
|
|
|
|
import com.google.samples.apps.nowinandroid.feature.settings.SettingsDialog
|
|
|
|
|
import com.google.samples.apps.nowinandroid.navigation.NiaNavHost
|
|
|
|
|
@ -86,68 +88,26 @@ fun NiaApp(
|
|
|
|
|
windowSizeClass = windowSizeClass
|
|
|
|
|
),
|
|
|
|
|
) {
|
|
|
|
|
val background: @Composable (@Composable () -> Unit) -> Unit =
|
|
|
|
|
when (appState.currentTopLevelDestination) {
|
|
|
|
|
TopLevelDestination.FOR_YOU -> {
|
|
|
|
|
content ->
|
|
|
|
|
NiaGradientBackground(content = content)
|
|
|
|
|
}
|
|
|
|
|
else -> { content -> NiaBackground(content = content) }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
background {
|
|
|
|
|
val shouldShowGradientBackground =
|
|
|
|
|
appState.currentTopLevelDestination == TopLevelDestination.FOR_YOU
|
|
|
|
|
|
|
|
|
|
val snackbarHostState = remember { SnackbarHostState() }
|
|
|
|
|
|
|
|
|
|
Scaffold(
|
|
|
|
|
modifier = Modifier.semantics {
|
|
|
|
|
testTagsAsResourceId = true
|
|
|
|
|
},
|
|
|
|
|
containerColor = Color.Transparent,
|
|
|
|
|
contentColor = MaterialTheme.colorScheme.onBackground,
|
|
|
|
|
contentWindowInsets = WindowInsets(0, 0, 0, 0),
|
|
|
|
|
snackbarHost = { SnackbarHost(snackbarHostState) },
|
|
|
|
|
topBar = {
|
|
|
|
|
// Show the top app bar on top level destinations.
|
|
|
|
|
val destination = appState.currentTopLevelDestination
|
|
|
|
|
if (destination != null) {
|
|
|
|
|
NiaTopAppBar(
|
|
|
|
|
// When the nav rail is displayed, the top app bar will, by default
|
|
|
|
|
// overlap it. This means that the top most item in the nav rail
|
|
|
|
|
// won't be tappable. A workaround is to position the top app bar
|
|
|
|
|
// behind the nav rail using zIndex.
|
|
|
|
|
modifier = Modifier.zIndex(-1F),
|
|
|
|
|
titleRes = destination.titleTextId,
|
|
|
|
|
actionIcon = NiaIcons.Settings,
|
|
|
|
|
actionIconContentDescription = stringResource(
|
|
|
|
|
id = settingsR.string.top_app_bar_action_icon_description
|
|
|
|
|
),
|
|
|
|
|
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
|
|
|
|
|
containerColor = Color.Transparent
|
|
|
|
|
),
|
|
|
|
|
onActionClick = { appState.setShowSettingsDialog(true) }
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
NiaBackground {
|
|
|
|
|
NiaGradientBackground(
|
|
|
|
|
gradientColors = if (shouldShowGradientBackground) {
|
|
|
|
|
LocalGradientColors.current
|
|
|
|
|
} else {
|
|
|
|
|
GradientColors()
|
|
|
|
|
},
|
|
|
|
|
bottomBar = {
|
|
|
|
|
if (appState.shouldShowBottomBar) {
|
|
|
|
|
NiaBottomBar(
|
|
|
|
|
destinations = appState.topLevelDestinations,
|
|
|
|
|
onNavigateToDestination = appState::navigateToTopLevelDestination,
|
|
|
|
|
currentDestination = appState.currentDestination,
|
|
|
|
|
modifier = Modifier.testTag("NiaBottomBar")
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
) { padding ->
|
|
|
|
|
) {
|
|
|
|
|
val snackbarHostState = remember { SnackbarHostState() }
|
|
|
|
|
|
|
|
|
|
val isOffline by appState.isOffline.collectAsStateWithLifecycle()
|
|
|
|
|
|
|
|
|
|
// If user is not connected to the internet show a snack bar to inform them.
|
|
|
|
|
val notConnected = stringResource(R.string.not_connected)
|
|
|
|
|
val notConnectedMessage = stringResource(R.string.not_connected)
|
|
|
|
|
LaunchedEffect(isOffline) {
|
|
|
|
|
if (isOffline) snackbarHostState.showSnackbar(
|
|
|
|
|
message = notConnected,
|
|
|
|
|
message = notConnectedMessage,
|
|
|
|
|
duration = Indefinite
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
@ -158,37 +118,73 @@ fun NiaApp(
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Row(
|
|
|
|
|
Modifier
|
|
|
|
|
.fillMaxSize()
|
|
|
|
|
.windowInsetsPadding(
|
|
|
|
|
WindowInsets.safeDrawing.only(
|
|
|
|
|
WindowInsetsSides.Horizontal
|
|
|
|
|
Scaffold(
|
|
|
|
|
modifier = Modifier.semantics {
|
|
|
|
|
testTagsAsResourceId = true
|
|
|
|
|
},
|
|
|
|
|
containerColor = Color.Transparent,
|
|
|
|
|
contentColor = MaterialTheme.colorScheme.onBackground,
|
|
|
|
|
contentWindowInsets = WindowInsets(0, 0, 0, 0),
|
|
|
|
|
snackbarHost = { SnackbarHost(snackbarHostState) },
|
|
|
|
|
bottomBar = {
|
|
|
|
|
if (appState.shouldShowBottomBar) {
|
|
|
|
|
NiaBottomBar(
|
|
|
|
|
destinations = appState.topLevelDestinations,
|
|
|
|
|
onNavigateToDestination = appState::navigateToTopLevelDestination,
|
|
|
|
|
currentDestination = appState.currentDestination,
|
|
|
|
|
modifier = Modifier.testTag("NiaBottomBar")
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
) {
|
|
|
|
|
if (appState.shouldShowNavRail) {
|
|
|
|
|
NiaNavRail(
|
|
|
|
|
destinations = appState.topLevelDestinations,
|
|
|
|
|
onNavigateToDestination = appState::navigateToTopLevelDestination,
|
|
|
|
|
currentDestination = appState.currentDestination,
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
.testTag("NiaNavRail")
|
|
|
|
|
.safeDrawingPadding()
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
NiaNavHost(
|
|
|
|
|
navController = appState.navController,
|
|
|
|
|
onBackClick = appState::onBackClick,
|
|
|
|
|
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
) { padding ->
|
|
|
|
|
Row(
|
|
|
|
|
Modifier
|
|
|
|
|
.fillMaxSize()
|
|
|
|
|
.padding(padding)
|
|
|
|
|
.consumedWindowInsets(padding)
|
|
|
|
|
)
|
|
|
|
|
.windowInsetsPadding(
|
|
|
|
|
WindowInsets.safeDrawing.only(
|
|
|
|
|
WindowInsetsSides.Horizontal
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
) {
|
|
|
|
|
if (appState.shouldShowNavRail) {
|
|
|
|
|
NiaNavRail(
|
|
|
|
|
destinations = appState.topLevelDestinations,
|
|
|
|
|
onNavigateToDestination = appState::navigateToTopLevelDestination,
|
|
|
|
|
currentDestination = appState.currentDestination,
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
.testTag("NiaNavRail")
|
|
|
|
|
.safeDrawingPadding()
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: We may want to add padding or spacer when the snackbar is shown so that
|
|
|
|
|
// content doesn't display behind it.
|
|
|
|
|
Column(Modifier.fillMaxSize()) {
|
|
|
|
|
// Show the top app bar on top level destinations.
|
|
|
|
|
val destination = appState.currentTopLevelDestination
|
|
|
|
|
if (destination != null) {
|
|
|
|
|
NiaTopAppBar(
|
|
|
|
|
titleRes = destination.titleTextId,
|
|
|
|
|
actionIcon = NiaIcons.Settings,
|
|
|
|
|
actionIconContentDescription = stringResource(
|
|
|
|
|
id = settingsR.string.top_app_bar_action_icon_description
|
|
|
|
|
),
|
|
|
|
|
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
|
|
|
|
|
containerColor = Color.Transparent
|
|
|
|
|
),
|
|
|
|
|
onActionClick = { appState.setShowSettingsDialog(true) }
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
NiaNavHost(
|
|
|
|
|
navController = appState.navController,
|
|
|
|
|
onBackClick = appState::onBackClick
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: We may want to add padding or spacer when the snackbar is shown so that
|
|
|
|
|
// content doesn't display behind it.
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Don Turner
2 years ago