A fully functional Android app built entirely with Kotlin and Jetpack Compose
Update for you top app bar
Alex Vanyo25f2e39c62aa
diff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/component/TopAppBar.kt b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/component/TopAppBar.ktindex 5a0caa2d2..d0a1e6309 100644--- a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/component/TopAppBar.kt+++ b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/component/TopAppBar.kt@@ -25,6 +25,8 @@ import androidx.compose.material3.Iconimport androidx.compose.material3.IconButtonimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Text+import androidx.compose.material3.TopAppBarColors+import androidx.compose.material3.TopAppBarDefaultsimport androidx.compose.runtime.Composableimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.vector.ImageVector@@ -40,6 +42,7 @@ fun NiaTopAppBar(actionIcon: ImageVector,actionIconContentDescription: String?,modifier: Modifier = Modifier,+ colors: TopAppBarColors = TopAppBarDefaults.centerAlignedTopAppBarColors(),onNavigationClick: () -> Unit = {},onActionClick: () -> Unit = {}) {@@ -63,6 +66,7 @@ fun NiaTopAppBar()}},+ colors = colors,modifier = modifier)}diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktindex b65093d12..1d5634ed0 100644--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt@@ -22,11 +22,13 @@ import androidx.annotation.IntRangeimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.BoxWithConstraints+import androidx.compose.foundation.layout.ExperimentalLayoutApiimport androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.WindowInsetsimport androidx.compose.foundation.layout.WindowInsetsSides+import androidx.compose.foundation.layout.consumedWindowInsetsimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.heightIn@@ -53,8 +55,10 @@ import androidx.compose.material3.ButtonDefaultsimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialTheme+import androidx.compose.material3.Scaffoldimport androidx.compose.material3.Surfaceimport androidx.compose.material3.Text+import androidx.compose.material3.TopAppBarDefaultsimport androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApiimport androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.material3.windowsizeclass.WindowWidthSizeClass@@ -63,6 +67,7 @@ import androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier+import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.platform.LocalDensityimport androidx.compose.ui.res.painterResource@@ -114,6 +119,7 @@ fun ForYouRoute()}+@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)@Composablefun ForYouScreen(windowSizeClass: WindowSizeClass,@@ -126,68 +132,71 @@ fun ForYouScreen(modifier: Modifier = Modifier,) {NiaGradientBackground {- // TODO: Replace with `LazyVerticalGrid` when blocking bugs are fixed:- // https://issuetracker.google.com/issues/230514914- // https://issuetracker.google.com/issues/231320714- BoxWithConstraints(- modifier = modifier- ) {- val numberOfColumns = when (windowSizeClass.widthSizeClass) {- WindowWidthSizeClass.Compact, WindowWidthSizeClass.Medium -> 1- else -> floor(maxWidth / 300.dp).toInt().coerceAtLeast(1)- }-- LazyColumn(modifier = Modifier.fillMaxSize()) {- item {- Spacer(- // TODO: Replace with windowInsetsTopHeight after- // https://issuetracker.google.com/issues/230383055- Modifier.windowInsetsPadding(- WindowInsets.safeDrawing.only(WindowInsetsSides.Top)- )+ Scaffold(+ topBar = {+ NiaTopAppBar(+ titleRes = R.string.top_app_bar_title,+ navigationIcon = Icons.Filled.Search,+ navigationIconContentDescription = stringResource(+ id = R.string.top_app_bar_navigation_button_content_desc+ ),+ actionIcon = Icons.Outlined.AccountCircle,+ actionIconContentDescription = stringResource(+ id = R.string.top_app_bar_navigation_button_content_desc+ ),+ colors = TopAppBarDefaults.centerAlignedTopAppBarColors(+ containerColor = Color.Transparent+ ),+ modifier = Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(WindowInsetsSides.Top))+ )+ },+ containerColor = Color.Transparent+ ) { innerPadding ->+ // TODO: Replace with `LazyVerticalGrid` when blocking bugs are fixed:+ // https://issuetracker.google.com/issues/230514914+ // https://issuetracker.google.com/issues/231320714+ BoxWithConstraints(+ modifier = modifier+ .padding(innerPadding)+ .consumedWindowInsets(innerPadding)+ ) {+ val numberOfColumns = when (windowSizeClass.widthSizeClass) {+ WindowWidthSizeClass.Compact, WindowWidthSizeClass.Medium -> 1+ else -> floor(maxWidth / 300.dp).toInt().coerceAtLeast(1)}- item {- NiaTopAppBar(- titleRes = R.string.top_app_bar_title,- navigationIcon = Icons.Filled.Search,- navigationIconContentDescription = stringResource(- id = R.string.top_app_bar_navigation_button_content_desc- ),- actionIcon = Icons.Outlined.AccountCircle,- actionIconContentDescription = stringResource(- id = R.string.top_app_bar_navigation_button_content_desc- ),+ LazyColumn(+ modifier = Modifier.fillMaxSize(),+ ) {+ InterestsSelection(+ interestsSelectionState = interestsSelectionState,+ showLoadingUIIfLoading = true,+ onAuthorCheckedChanged = onAuthorCheckedChanged,+ onTopicCheckedChanged = onTopicCheckedChanged,+ saveFollowedTopics = saveFollowedTopics)- }-- InterestsSelection(- interestsSelectionState = interestsSelectionState,- showLoadingUIIfLoading = true,- onAuthorCheckedChanged = onAuthorCheckedChanged,- onTopicCheckedChanged = onTopicCheckedChanged,- saveFollowedTopics = saveFollowedTopics- )- Feed(- feedState = feedState,- // Avoid showing a second loading wheel if we already are for the interests- // selection- showLoadingUIIfLoading =- interestsSelectionState !is ForYouInterestsSelectionState.Loading,- numberOfColumns = numberOfColumns,- onNewsResourcesCheckedChanged = onNewsResourcesCheckedChanged- )+ Feed(+ feedState = feedState,+ // Avoid showing a second loading wheel if we already are for the interests+ // selection+ showLoadingUIIfLoading =+ interestsSelectionState !is ForYouInterestsSelectionState.Loading,+ numberOfColumns = numberOfColumns,+ onNewsResourcesCheckedChanged = onNewsResourcesCheckedChanged+ )- item {- Spacer(- // TODO: Replace with windowInsetsBottomHeight after- // https://issuetracker.google.com/issues/230383055- Modifier.windowInsetsPadding(- WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom)+ item {+ Spacer(+ // TODO: Replace with windowInsetsBottomHeight after+ // https://issuetracker.google.com/issues/230383055+ Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom)+ ))- )+ }}}}