A fully functional Android app built entirely with Kotlin and Jetpack Compose
Remove Scaffold from top level screens
Don Turner828242dbaddf
diff --git a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.ktindex d7d092a26..dfc45f280 100644--- a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt+++ b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt@@ -21,6 +21,7 @@ import androidx.compose.ui.test.assertIsOnimport androidx.compose.ui.test.assertIsSelectedimport androidx.compose.ui.test.junit4.createAndroidComposeRuleimport androidx.compose.ui.test.onAllNodesWithText+import androidx.compose.ui.test.onLastimport androidx.compose.ui.test.onNodeWithContentDescriptionimport androidx.compose.ui.test.onNodeWithTextimport androidx.compose.ui.test.performClick@@ -168,13 +169,13 @@ class NavigationTest {// Verify that the top bar contains the app name on the first screen.onNodeWithText(appName).assertExists()- // Go to the bookmarks tab, verify that the top bar contains the app name.+ // Go to the saved tab, verify that the top bar contains "saved". This means+ // we'll have 2 elements with the text "saved" on screen. One in the top bar, and+ // one in the bottom navigation.onNodeWithText(saved).performClick()- onNodeWithText(appName).assertExists()+ onAllNodesWithText(saved).assertCountEquals(2)- // Go to the interests tab, verify that the top bar contains "Interests". This means- // we'll have 2 elements with the text "Interests" on screen. One in the top bar, and- // one in the bottom navigation.+ // As above but for the interests tab.onNodeWithText(interests).performClick()onAllNodesWithText(interests).assertCountEquals(2)}@@ -214,7 +215,7 @@ class NavigationTest {onNodeWithText(ok).performClick()// Check that the saved screen is still visible and selected.- onNodeWithText(saved).assertIsSelected()+ onAllNodesWithText(saved).onLast().assertIsSelected()}}diff --git a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.ktindex f6361d844..ce8f1aa00 100644--- a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt+++ b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt@@ -30,9 +30,19 @@ import androidx.navigation.compose.ComposeNavigatorimport androidx.navigation.compose.composableimport androidx.navigation.createGraphimport androidx.navigation.testing.TestNavHostController+import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule+import com.google.samples.apps.nowinandroid.core.testing.util.TestNetworkMonitor+import kotlinx.coroutines.cancel+import kotlinx.coroutines.flow.collect+import kotlinx.coroutines.launch+import kotlinx.coroutines.test.TestScope+import kotlinx.coroutines.test.UnconfinedTestDispatcher+import kotlinx.coroutines.test.runTest+import org.junit.Afterimport org.junit.Assert.assertEqualsimport org.junit.Assert.assertFalseimport org.junit.Assert.assertTrue+import org.junit.Beforeimport org.junit.Ruleimport org.junit.Test@@ -45,13 +55,33 @@ import org.junit.Test@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)class NiaAppStateTest {+ @get:Rule+ val mainDispatcherRule = MainDispatcherRule()+@get:Ruleval composeTestRule = createComposeRule()+ // Create the test dependencies.+ private lateinit var testScope: TestScope+ private val networkMonitor = TestNetworkMonitor()++ // Subject under test.private lateinit var state: NiaAppState+ @Before+ fun setup() {+ // We use the Unconfined dispatcher to ensure that coroutines are executed sequentially in+ // tests.+ testScope = TestScope(UnconfinedTestDispatcher())+ }++ @After+ fun cleanup() {+ testScope.cancel()+ }+@Test- fun niaAppState_currentDestination() {+ fun niaAppState_currentDestination() = runTest {var currentDestination: String? = nullcomposeTestRule.setContent {@@ -59,7 +89,9 @@ class NiaAppStateTest {state = remember(navController) {NiaAppState(windowSizeClass = getCompactWindowClass(),- navController = navController+ navController = navController,+ networkMonitor = networkMonitor,+ coroutineScope = testScope)}@@ -76,9 +108,12 @@ class NiaAppStateTest {}@Test- fun niaAppState_destinations() {+ fun niaAppState_destinations() = runTest {composeTestRule.setContent {- state = rememberNiaAppState(getCompactWindowClass())+ state = rememberNiaAppState(+ windowSizeClass = getCompactWindowClass(),+ networkMonitor = networkMonitor+ )}assertEquals(3, state.topLevelDestinations.size)@@ -93,7 +128,8 @@ class NiaAppStateTest {val navController = rememberTestNavController()state = rememberNiaAppState(windowSizeClass = getCompactWindowClass(),- navController = navController+ navController = navController,+ networkMonitor = networkMonitor)// Do nothing - we should already be@@ -101,11 +137,13 @@ class NiaAppStateTest {}@Test- fun niaAppState_showBottomBar_compact() {+ fun niaAppState_showBottomBar_compact() = runTest {composeTestRule.setContent {state = NiaAppState(windowSizeClass = getCompactWindowClass(),- navController = NavHostController(LocalContext.current)+ navController = NavHostController(LocalContext.current),+ networkMonitor = networkMonitor,+ coroutineScope = testScope)}@@ -114,11 +152,13 @@ class NiaAppStateTest {}@Test- fun niaAppState_showNavRail_medium() {+ fun niaAppState_showNavRail_medium() = runTest {composeTestRule.setContent {state = NiaAppState(windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(800.dp, 800.dp)),- navController = NavHostController(LocalContext.current)+ navController = NavHostController(LocalContext.current),+ networkMonitor = networkMonitor,+ coroutineScope = testScope)}@@ -127,11 +167,14 @@ class NiaAppStateTest {}@Test- fun niaAppState_showNavRail_large() {+ fun niaAppState_showNavRail_large() = runTest {+composeTestRule.setContent {state = NiaAppState(windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),- navController = NavHostController(LocalContext.current)+ navController = NavHostController(LocalContext.current),+ networkMonitor = networkMonitor,+ coroutineScope = testScope)}@@ -139,6 +182,30 @@ class NiaAppStateTest {assertFalse(state.shouldShowBottomBar)}+ @Test+ fun stateIsOfflineWhenNetworkMonitorIsOffline() = runTest {++ composeTestRule.setContent {+ state = NiaAppState(+ windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),+ navController = NavHostController(LocalContext.current),+ networkMonitor = networkMonitor,+ coroutineScope = testScope+ )+ }++ val collectJob = testScope.launch { state.isOffline.collect() }++ networkMonitor.setConnected(false)++ assertEquals(+ true,+ state.isOffline.value+ )++ collectJob.cancel()+ }+private fun getCompactWindowClass() = WindowSizeClass.calculateFromSize(DpSize(500.dp, 300.dp))}diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.ktindex 2f69cdc37..60a865fbb 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.kt@@ -37,6 +37,7 @@ import androidx.metrics.performance.JankStatsimport com.google.accompanist.systemuicontroller.rememberSystemUiControllerimport com.google.samples.apps.nowinandroid.MainActivityUiState.Loadingimport com.google.samples.apps.nowinandroid.MainActivityUiState.Success+import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitorimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfigimport com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand@@ -57,6 +58,9 @@ class MainActivity : ComponentActivity() {@Injectlateinit var lazyStats: dagger.Lazy<JankStats>+ @Inject+ lateinit var networkMonitor: NetworkMonitor+val viewModel: MainActivityViewModel by viewModels()override fun onCreate(savedInstanceState: Bundle?) {@@ -105,6 +109,7 @@ class MainActivity : ComponentActivity() {androidTheme = shouldUseAndroidTheme(uiState)) {NiaApp(+ networkMonitor = networkMonitor,windowSizeClass = calculateWindowSizeClass(this),)}diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex f28824c5a..ef545c70b 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt@@ -31,10 +31,16 @@ import androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Scaffold+import androidx.compose.material3.SnackbarDuration.Indefinite+import androidx.compose.material3.SnackbarHost+import androidx.compose.material3.SnackbarHostStateimport androidx.compose.material3.Textimport androidx.compose.material3.TopAppBarDefaultsimport androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.runtime.Composable+import androidx.compose.runtime.LaunchedEffect+import androidx.compose.runtime.getValue+import androidx.compose.runtime.rememberimport androidx.compose.ui.ExperimentalComposeUiApiimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.Color@@ -42,8 +48,11 @@ import androidx.compose.ui.res.painterResourceimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.semantics.semanticsimport androidx.compose.ui.semantics.testTagsAsResourceId+import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.navigation.NavDestinationimport androidx.navigation.NavDestination.Companion.hierarchy+import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitorimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackgroundimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaGradientBackgroundimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar@@ -61,12 +70,16 @@ import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination@OptIn(ExperimentalMaterial3Api::class,ExperimentalLayoutApi::class,- ExperimentalComposeUiApi::class+ ExperimentalComposeUiApi::class, ExperimentalLifecycleComposeApi::class)@Composablefun NiaApp(windowSizeClass: WindowSizeClass,- appState: NiaAppState = rememberNiaAppState(windowSizeClass)+ networkMonitor: NetworkMonitor,+ appState: NiaAppState = rememberNiaAppState(+ networkMonitor = networkMonitor,+ windowSizeClass = windowSizeClass+ ),) {val background: @Composable (@Composable () -> Unit) -> Unit =when (appState.currentDestination?.route) {@@ -75,6 +88,9 @@ fun NiaApp(}background {++ val snackbarHostState = remember { SnackbarHostState() }+Scaffold(modifier = Modifier.semantics {testTagsAsResourceId = true@@ -82,11 +98,14 @@ fun NiaApp(containerColor = Color.Transparent,contentColor = MaterialTheme.colorScheme.onBackground,contentWindowInsets = WindowInsets(0, 0, 0, 0),+ snackbarHost = { SnackbarHost(snackbarHostState) },topBar = {- val destination = appState.topLevelDestinations[appState.currentDestination?.route]- if (appState.shouldShowTopBar && destination != null) {+ // Show the top app bar on top level destinations.+ val topLevelDestination =+ appState.topLevelDestinations[appState.currentDestination?.route]+ if (topLevelDestination != null) {NiaTopAppBar(- titleRes = destination.titleTextId,+ titleRes = topLevelDestination.titleTextId,actionIcon = NiaIcons.Settings,actionIconContentDescription = stringResource(id = settingsR.string.top_app_bar_action_icon_description@@ -94,7 +113,7 @@ fun NiaApp(colors = TopAppBarDefaults.centerAlignedTopAppBarColors(containerColor = Color.Transparent),- onActionClick = { /*openAccountDialog = true*/ }+ onActionClick = { appState.toggleSettingsDialog(true) })}},@@ -108,6 +127,24 @@ fun NiaApp(}}) { padding ->++ 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.for_you_not_connected)+ LaunchedEffect(isOffline) {+ if (isOffline) snackbarHostState.showSnackbar(+ message = notConnected,+ duration = Indefinite+ )+ }++ if (appState.shouldShowSettingsDialog) {+ SettingsDialog(+ onDismiss = { appState.toggleSettingsDialog(false) }+ )+ }+Row(Modifier.fillMaxSize()@@ -134,6 +171,9 @@ fun NiaApp(.padding(padding).consumedWindowInsets(padding))++ // TODO: We may want to add padding or spacer when the snackbar is shown so that+ // content doesn't display behind it.}}}diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.ktindex 250bdf5d1..19bc5366d 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt@@ -21,7 +21,11 @@ import androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.material3.windowsizeclass.WindowWidthSizeClassimport androidx.compose.runtime.Composableimport androidx.compose.runtime.Stable+import androidx.compose.runtime.getValue+import androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.remember+import androidx.compose.runtime.rememberCoroutineScope+import androidx.compose.runtime.setValueimport androidx.navigation.NavControllerimport androidx.navigation.NavDestinationimport androidx.navigation.NavGraph.Companion.findStartDestination@@ -30,6 +34,11 @@ import androidx.navigation.compose.currentBackStackEntryAsStateimport androidx.navigation.compose.rememberNavControllerimport androidx.navigation.navOptionsimport androidx.tracing.trace+import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor+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.navigation.NiaNavigationDestinationimport com.google.samples.apps.nowinandroid.core.ui.TrackDisposableJankimport com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.navigateToBookmarksimport com.google.samples.apps.nowinandroid.feature.foryou.navigation.navigateToForYou@@ -38,29 +47,37 @@ import com.google.samples.apps.nowinandroid.navigation.TopLevelDestinationimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.BOOKMARKSimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.FOR_YOUimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.INTERESTS+import kotlinx.coroutines.CoroutineScope+import kotlinx.coroutines.flow.SharingStarted+import kotlinx.coroutines.flow.map+import kotlinx.coroutines.flow.stateIn@Composablefun rememberNiaAppState(windowSizeClass: WindowSizeClass,+ networkMonitor: NetworkMonitor,+ coroutineScope: CoroutineScope = rememberCoroutineScope(),navController: NavHostController = rememberNavController()): NiaAppState {NavigationTrackingSideEffect(navController)- return remember(navController, windowSizeClass) {- NiaAppState(navController, windowSizeClass)+ return remember(navController, coroutineScope, windowSizeClass, networkMonitor) {+ NiaAppState(navController, coroutineScope, windowSizeClass, networkMonitor)}}@Stableclass NiaAppState(val navController: NavHostController,- val windowSizeClass: WindowSizeClass+ val coroutineScope: CoroutineScope,+ val windowSizeClass: WindowSizeClass,+ networkMonitor: NetworkMonitor,) {val currentDestination: NavDestination?@Composable get() = navController.currentBackStackEntryAsState().value?.destination- val shouldShowTopBar: Boolean- @Composable get() = (currentDestination?.route in topLevelDestinations)+ private var _shouldShowSettingsDialog by mutableStateOf(false)+ val shouldShowSettingsDialog = _shouldShowSettingsDialogval shouldShowBottomBar: Booleanget() = windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact ||@@ -69,6 +86,14 @@ class NiaAppState(val shouldShowNavRail: Booleanget() = !shouldShowBottomBar+ val isOffline = networkMonitor.isOnline+ .map(Boolean::not)+ .stateIn(+ scope = coroutineScope,+ started = SharingStarted.WhileSubscribed(5_000),+ initialValue = false+ )+/*** Map of top level destinations to be used in the TopBar, BottomBar and NavRail. The key is the* route.@@ -109,6 +134,10 @@ class NiaAppState(fun onBackClick() {navController.popBackStack()}++ fun toggleSettingsDialog(shouldShow: Boolean) {+ _shouldShowSettingsDialog = shouldShow+ }}/**diff --git a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.ktindex 672213492..6c45c4314 100644--- a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt+++ b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt@@ -21,10 +21,8 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApiimport androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.WindowInsets-import androidx.compose.foundation.layout.consumedWindowInsetsimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.safeDrawingimport androidx.compose.foundation.layout.windowInsetsBottomHeightimport androidx.compose.foundation.layout.wrapContentSize@@ -33,11 +31,9 @@ import androidx.compose.foundation.lazy.grid.GridItemSpanimport androidx.compose.foundation.lazy.grid.LazyVerticalGridimport androidx.compose.foundation.lazy.grid.rememberLazyGridStateimport androidx.compose.material3.ExperimentalMaterial3Api-import androidx.compose.material3.Scaffoldimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValueimport androidx.compose.ui.Modifier-import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.platform.testTagimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.unit.dpdiff --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 c15263d3b..75320caea 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,21 +22,14 @@ import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.BoxWithConstraintsimport androidx.compose.foundation.layout.Column-import androidx.compose.foundation.layout.ExperimentalLayoutApiimport androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Row-import androidx.compose.foundation.layout.Spacer-import androidx.compose.foundation.layout.WindowInsets-import androidx.compose.foundation.layout.consumedWindowInsetsimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.heightInimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.layout.safeDrawingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.width-import androidx.compose.foundation.layout.windowInsetsBottomHeightimport androidx.compose.foundation.lazy.LazyListScopeimport androidx.compose.foundation.lazy.grid.GridCellsimport androidx.compose.foundation.lazy.grid.GridCells.Adaptive@@ -51,19 +44,13 @@ import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialTheme-import androidx.compose.material3.Scaffold-import androidx.compose.material3.SnackbarDuration.Indefinite-import androidx.compose.material3.SnackbarHost-import androidx.compose.material3.SnackbarHostStateimport androidx.compose.material3.Surfaceimport androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValue-import androidx.compose.runtime.rememberimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier-import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.layout.layoutimport androidx.compose.ui.platform.LocalDensityimport androidx.compose.ui.platform.LocalView@@ -104,11 +91,9 @@ internal fun ForYouRoute() {val interestsSelectionState by viewModel.interestsSelectionUiState.collectAsStateWithLifecycle()val feedState by viewModel.feedState.collectAsStateWithLifecycle()- val isOffline by viewModel.isOffline.collectAsStateWithLifecycle()val isSyncing by viewModel.isSyncing.collectAsStateWithLifecycle()ForYouScreen(- isOffline = isOffline,isSyncing = isSyncing,interestsSelectionState = interestsSelectionState,feedState = feedState,@@ -120,7 +105,6 @@ internal fun ForYouRoute()}-@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)@Composableinternal fun ForYouScreen(isOffline: Boolean,@@ -133,107 +117,88 @@ internal fun ForYouScreen(onNewsResourcesCheckedChanged: (String, Boolean) -> Unit,modifier: Modifier = Modifier,) {- val snackbarHostState = remember { SnackbarHostState() }- Scaffold(- snackbarHost = { SnackbarHost(snackbarHostState) },- containerColor = Color.Transparent,- contentWindowInsets = WindowInsets(0, 0, 0, 0)- ) { innerPadding ->- // Workaround to call Activity.reportFullyDrawn from Jetpack Compose.- // This code should be called when the UI is ready for use- // and relates to Time To Full Display.- val interestsLoaded =- interestsSelectionState !is ForYouInterestsSelectionUiState.Loading- val feedLoaded = feedState !is NewsFeedUiState.Loading+ // Workaround to call Activity.reportFullyDrawn from Jetpack Compose.+ // This code should be called when the UI is ready for use+ // and relates to Time To Full Display.+ val interestsLoaded =+ interestsSelectionState !is ForYouInterestsSelectionUiState.Loading+ val feedLoaded = feedState !is NewsFeedUiState.Loading- if (interestsLoaded && feedLoaded) {- val localView = LocalView.current- // We use Unit to call reportFullyDrawn only on the first recomposition,- // however it will be called again if this composable goes out of scope.- // Activity.reportFullyDrawn() has its own check for this- // and is safe to call multiple times though.- LaunchedEffect(Unit) {- // We're leveraging the fact, that the current view is directly set as content of Activity.- val activity = localView.context as? Activity ?: return@LaunchedEffect- // To be sure not to call in the middle of a frame draw.- localView.doOnPreDraw { activity.reportFullyDrawn() }- }+ if (interestsLoaded && feedLoaded) {+ val localView = LocalView.current+ // We use Unit to call reportFullyDrawn only on the first recomposition,+ // however it will be called again if this composable goes out of scope.+ // Activity.reportFullyDrawn() has its own check for this+ // and is safe to call multiple times though.+ LaunchedEffect(Unit) {+ // We're leveraging the fact, that the current view is directly set as content of Activity.+ val activity = localView.context as? Activity ?: return@LaunchedEffect+ // To be sure not to call in the middle of a frame draw.+ localView.doOnPreDraw { activity.reportFullyDrawn() }}+ }- val state = rememberLazyGridState()- TrackScrollJank(scrollableState = state, stateName = "forYou:feed")-- val notConnected = stringResource(R.string.for_you_not_connected)- LaunchedEffect(isOffline) {- if (isOffline) snackbarHostState.showSnackbar(- message = notConnected,- duration = Indefinite- )- }+ val state = rememberLazyGridState()+ TrackScrollJank(scrollableState = state, stateName = "forYou:feed")- LazyVerticalGrid(- columns = Adaptive(300.dp),- contentPadding = PaddingValues(16.dp),- horizontalArrangement = Arrangement.spacedBy(16.dp),- verticalArrangement = Arrangement.spacedBy(24.dp),- modifier = modifier- .padding(innerPadding)- .consumedWindowInsets(innerPadding)- .fillMaxSize()- .testTag("forYou:feed"),- state = state- ) {- interestsSelection(- interestsSelectionState = interestsSelectionState,- onAuthorCheckedChanged = onAuthorCheckedChanged,- onTopicCheckedChanged = onTopicCheckedChanged,- saveFollowedTopics = saveFollowedTopics,- // Custom LayoutModifier to remove the enforced parent 16.dp contentPadding- // from the LazyVerticalGrid and enable edge-to-edge scrolling for this section- interestsItemModifier = Modifier.layout { measurable, constraints ->- val placeable = measurable.measure(- constraints.copy(- maxWidth = constraints.maxWidth + 32.dp.roundToPx()- )+ LazyVerticalGrid(+ columns = Adaptive(300.dp),+ contentPadding = PaddingValues(16.dp),+ horizontalArrangement = Arrangement.spacedBy(16.dp),+ verticalArrangement = Arrangement.spacedBy(24.dp),+ modifier = modifier+ .fillMaxSize()+ .testTag("forYou:feed"),+ state = state+ ) {+ interestsSelection(+ interestsSelectionState = interestsSelectionState,+ onAuthorCheckedChanged = onAuthorCheckedChanged,+ onTopicCheckedChanged = onTopicCheckedChanged,+ saveFollowedTopics = saveFollowedTopics,+ // Custom LayoutModifier to remove the enforced parent 16.dp contentPadding+ // from the LazyVerticalGrid and enable edge-to-edge scrolling for this section+ interestsItemModifier = Modifier.layout { measurable, constraints ->+ val placeable = measurable.measure(+ constraints.copy(+ maxWidth = constraints.maxWidth + 32.dp.roundToPx())- layout(placeable.width, placeable.height) {- placeable.place(0, 0)- }+ )+ layout(placeable.width, placeable.height) {+ placeable.place(0, 0)}- )+ }+ )- newsFeed(- feedState = feedState,- onNewsResourcesCheckedChanged = onNewsResourcesCheckedChanged,- )+ newsFeed(+ feedState = feedState,+ onNewsResourcesCheckedChanged = onNewsResourcesCheckedChanged,+ )- item(span = { GridItemSpan(maxLineSpan) }) {+ /*item(span = { GridItemSpan(maxLineSpan) }) {Column {Spacer(modifier = Modifier.height(8.dp))// Add space for the content to clear the "offline" snackbar.+ // TODO: Check that the Scaffold handles this correctly in NiaAppif (isOffline) Spacer(modifier = Modifier.height(48.dp))Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.safeDrawing))}- }- }- AnimatedVisibility(- visible = isSyncing ||- feedState is NewsFeedUiState.Loading ||- interestsSelectionState is ForYouInterestsSelectionUiState.Loading+ }*/+ }+ AnimatedVisibility(+ visible = isSyncing ||+ feedState is NewsFeedUiState.Loading ||+ interestsSelectionState is ForYouInterestsSelectionUiState.Loading+ ) {+ val loadingContentDescription = stringResource(id = R.string.for_you_loading)+ Box(+ modifier = Modifier.fillMaxWidth()) {- val loadingContentDescription = stringResource(id = R.string.for_you_loading)- Box(- modifier = Modifier- .padding(innerPadding)- .consumedWindowInsets(innerPadding)- .fillMaxWidth()- ) {- NiaOverlayLoadingWheel(- modifier = Modifier.align(Alignment.Center),- contentDesc = loadingContentDescription- )- }+ NiaOverlayLoadingWheel(+ modifier = Modifier.align(Alignment.Center),+ contentDesc = loadingContentDescription+ )}}}@@ -426,7 +391,6 @@ fun ForYouScreenPopulatedFeed() {BoxWithConstraints {NiaTheme {ForYouScreen(- isOffline = false,isSyncing = false,interestsSelectionState = ForYouInterestsSelectionUiState.NoInterestsSelection,feedState = NewsFeedUiState.Success(@@ -449,7 +413,6 @@ fun ForYouScreenOfflinePopulatedFeed() {BoxWithConstraints {NiaTheme {ForYouScreen(- isOffline = true,isSyncing = false,interestsSelectionState = ForYouInterestsSelectionUiState.NoInterestsSelection,feedState = NewsFeedUiState.Success(@@ -472,7 +435,6 @@ fun ForYouScreenTopicSelection() {BoxWithConstraints {NiaTheme {ForYouScreen(- isOffline = false,isSyncing = false,interestsSelectionState = ForYouInterestsSelectionUiState.WithInterestsSelection(topics = previewTopics.map { FollowableTopic(it, false) },@@ -498,7 +460,6 @@ fun ForYouScreenLoading() {BoxWithConstraints {NiaTheme {ForYouScreen(- isOffline = false,isSyncing = false,interestsSelectionState = ForYouInterestsSelectionUiState.Loading,feedState = NewsFeedUiState.Loading,@@ -517,7 +478,6 @@ fun ForYouScreenPopulatedAndLoading() {BoxWithConstraints {NiaTheme {ForYouScreen(- isOffline = false,isSyncing = true,interestsSelectionState = ForYouInterestsSelectionUiState.Loading,feedState = NewsFeedUiState.Success(diff --git a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.ktindex 8cbf39c31..8eedf40f0 100644--- a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt+++ b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt@@ -94,14 +94,6 @@ class ForYouViewModel @Inject constructor(mutableStateOf<Set<String>>(emptySet())}- val isOffline = networkMonitor.isOnline- .map(Boolean::not)- .stateIn(- scope = viewModelScope,- started = SharingStarted.WhileSubscribed(5_000),- initialValue = false- )-val isSyncing = syncStatusMonitor.isSyncing.stateIn(scope = viewModelScope,diff --git a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.ktindex 7919dda9e..9549ecb90 100644--- a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt+++ b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt@@ -1404,21 +1404,6 @@ class ForYouViewModelTest {collectJob1.cancel()collectJob2.cancel()}-- @Test- fun stateIsOfflineWhenNetworkMonitorIsOffline() = runTest {- val collectJob =- launch(UnconfinedTestDispatcher()) { viewModel.isOffline.collect() }-- networkMonitor.setConnected(false)-- assertEquals(- true,- viewModel.isOffline.value- )-- collectJob.cancel()- }}private val sampleAuthors = listOf(diff --git a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.ktindex b51c5b6e7..11297d5c5 100644--- a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt+++ b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt@@ -61,9 +61,9 @@ import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Suc@ExperimentalLifecycleComposeApi@Composable-internal fun SettingsDialog(- viewModel: SettingsViewModel = hiltViewModel(),- onDismiss: () -> Unit+fun SettingsDialog(+ onDismiss: () -> Unit,+ viewModel: SettingsViewModel = hiltViewModel()) {val settingsUiState by viewModel.settingsUiState.collectAsStateWithLifecycle()SettingsDialog(@@ -132,7 +132,7 @@ private fun SettingsPanel(onChangeDarkThemeConfig: (darkThemeConfig: DarkThemeConfig) -> Unit) {SettingsDialogSectionTitle(text = stringResource(R.string.theme))- Column {+ Column(Modifier.selectableGroup()) {SettingsDialogThemeChooserRow(text = stringResource(R.string.brand_default),selected = settings.brand == DEFAULT,diff --git a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.kt b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.ktindex be2927546..da72f8beb 100644--- a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.kt+++ b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.kt@@ -47,7 +47,12 @@ class SettingsViewModel @Inject constructor(}.stateIn(scope = viewModelScope,- started = SharingStarted.WhileSubscribed(5_000),+ // Starting eagerly means the user data is ready when the SettingsDialog is laid out+ // for the first time. Without this the layout is done using the "Loading" text,+ // then replaced with the user editable fields once loaded, however, the layout+ // height doesn't change meaning all the fields are squashed into a small+ // scrollable column.+ started = SharingStarted.Eagerly,initialValue = Loading)