|
|
|
@ -25,19 +25,16 @@ import androidx.compose.foundation.layout.PaddingValues
|
|
|
|
import androidx.compose.foundation.layout.Row
|
|
|
|
import androidx.compose.foundation.layout.Row
|
|
|
|
import androidx.compose.foundation.layout.Spacer
|
|
|
|
import androidx.compose.foundation.layout.Spacer
|
|
|
|
import androidx.compose.foundation.layout.WindowInsets
|
|
|
|
import androidx.compose.foundation.layout.WindowInsets
|
|
|
|
import androidx.compose.foundation.layout.WindowInsetsSides
|
|
|
|
|
|
|
|
import androidx.compose.foundation.layout.consumedWindowInsets
|
|
|
|
import androidx.compose.foundation.layout.consumedWindowInsets
|
|
|
|
import androidx.compose.foundation.layout.fillMaxSize
|
|
|
|
import androidx.compose.foundation.layout.fillMaxSize
|
|
|
|
import androidx.compose.foundation.layout.fillMaxWidth
|
|
|
|
import androidx.compose.foundation.layout.fillMaxWidth
|
|
|
|
import androidx.compose.foundation.layout.height
|
|
|
|
import androidx.compose.foundation.layout.height
|
|
|
|
import androidx.compose.foundation.layout.heightIn
|
|
|
|
import androidx.compose.foundation.layout.heightIn
|
|
|
|
import androidx.compose.foundation.layout.only
|
|
|
|
|
|
|
|
import androidx.compose.foundation.layout.padding
|
|
|
|
import androidx.compose.foundation.layout.padding
|
|
|
|
import androidx.compose.foundation.layout.safeDrawing
|
|
|
|
import androidx.compose.foundation.layout.safeDrawing
|
|
|
|
import androidx.compose.foundation.layout.size
|
|
|
|
import androidx.compose.foundation.layout.size
|
|
|
|
import androidx.compose.foundation.layout.width
|
|
|
|
import androidx.compose.foundation.layout.width
|
|
|
|
import androidx.compose.foundation.layout.windowInsetsBottomHeight
|
|
|
|
import androidx.compose.foundation.layout.windowInsetsBottomHeight
|
|
|
|
import androidx.compose.foundation.layout.windowInsetsPadding
|
|
|
|
|
|
|
|
import androidx.compose.foundation.layout.wrapContentSize
|
|
|
|
import androidx.compose.foundation.layout.wrapContentSize
|
|
|
|
import androidx.compose.foundation.lazy.LazyListScope
|
|
|
|
import androidx.compose.foundation.lazy.LazyListScope
|
|
|
|
import androidx.compose.foundation.lazy.grid.GridCells
|
|
|
|
import androidx.compose.foundation.lazy.grid.GridCells
|
|
|
|
@ -80,7 +77,6 @@ import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
|
|
|
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
|
|
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
|
|
|
import coil.compose.AsyncImage
|
|
|
|
import coil.compose.AsyncImage
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilledButton
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilledButton
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaGradientBackground
|
|
|
|
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaToggleButton
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaToggleButton
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopAppBar
|
|
|
|
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopAppBar
|
|
|
|
@ -127,97 +123,93 @@ fun ForYouScreen(
|
|
|
|
onNewsResourcesCheckedChanged: (String, Boolean) -> Unit,
|
|
|
|
onNewsResourcesCheckedChanged: (String, Boolean) -> Unit,
|
|
|
|
modifier: Modifier = Modifier,
|
|
|
|
modifier: Modifier = Modifier,
|
|
|
|
) {
|
|
|
|
) {
|
|
|
|
NiaGradientBackground {
|
|
|
|
Scaffold(
|
|
|
|
Scaffold(
|
|
|
|
topBar = {
|
|
|
|
topBar = {
|
|
|
|
NiaTopAppBar(
|
|
|
|
NiaTopAppBar(
|
|
|
|
titleRes = R.string.top_app_bar_title,
|
|
|
|
titleRes = R.string.top_app_bar_title,
|
|
|
|
actionIcon = NiaIcons.AccountCircle,
|
|
|
|
actionIcon = NiaIcons.AccountCircle,
|
|
|
|
actionIconContentDescription = stringResource(
|
|
|
|
actionIconContentDescription = stringResource(
|
|
|
|
id = R.string.for_you_top_app_bar_action_my_account
|
|
|
|
id = R.string.for_you_top_app_bar_action_my_account
|
|
|
|
),
|
|
|
|
),
|
|
|
|
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
|
|
|
|
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
|
|
|
|
containerColor = Color.Transparent
|
|
|
|
containerColor = Color.Transparent
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
modifier = Modifier.windowInsetsPadding(
|
|
|
|
|
|
|
|
WindowInsets.safeDrawing.only(WindowInsetsSides.Top)
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
},
|
|
|
|
)
|
|
|
|
containerColor = Color.Transparent
|
|
|
|
},
|
|
|
|
) { innerPadding ->
|
|
|
|
containerColor = Color.Transparent,
|
|
|
|
// Workaround to call Activity.reportFullyDrawn from Jetpack Compose.
|
|
|
|
contentWindowInsets = WindowInsets(0, 0, 0, 0)
|
|
|
|
// This code should be called when the UI is ready for use
|
|
|
|
) { innerPadding ->
|
|
|
|
// and relates to Time To Full Display.
|
|
|
|
// Workaround to call Activity.reportFullyDrawn from Jetpack Compose.
|
|
|
|
val interestsLoaded =
|
|
|
|
// This code should be called when the UI is ready for use
|
|
|
|
interestsSelectionState !is ForYouInterestsSelectionUiState.Loading
|
|
|
|
// and relates to Time To Full Display.
|
|
|
|
val feedLoaded = feedState !is NewsFeedUiState.Loading
|
|
|
|
val interestsLoaded =
|
|
|
|
|
|
|
|
interestsSelectionState !is ForYouInterestsSelectionUiState.Loading
|
|
|
|
|
|
|
|
val feedLoaded = feedState !is NewsFeedUiState.Loading
|
|
|
|
|
|
|
|
|
|
|
|
if (interestsLoaded && feedLoaded) {
|
|
|
|
if (interestsLoaded && feedLoaded) {
|
|
|
|
val localView = LocalView.current
|
|
|
|
val localView = LocalView.current
|
|
|
|
// We use Unit to call reportFullyDrawn only on the first recomposition,
|
|
|
|
// We use Unit to call reportFullyDrawn only on the first recomposition,
|
|
|
|
// however it will be called again if this composable goes out of scope.
|
|
|
|
// however it will be called again if this composable goes out of scope.
|
|
|
|
// Activity.reportFullyDrawn() has its own check for this
|
|
|
|
// Activity.reportFullyDrawn() has its own check for this
|
|
|
|
// and is safe to call multiple times though.
|
|
|
|
// and is safe to call multiple times though.
|
|
|
|
LaunchedEffect(Unit) {
|
|
|
|
LaunchedEffect(Unit) {
|
|
|
|
// We're leveraging the fact, that the current view is directly set as content of Activity.
|
|
|
|
// We're leveraging the fact, that the current view is directly set as content of Activity.
|
|
|
|
val activity = localView.context as? Activity ?: return@LaunchedEffect
|
|
|
|
val activity = localView.context as? Activity ?: return@LaunchedEffect
|
|
|
|
// To be sure not to call in the middle of a frame draw.
|
|
|
|
// To be sure not to call in the middle of a frame draw.
|
|
|
|
localView.doOnPreDraw { activity.reportFullyDrawn() }
|
|
|
|
localView.doOnPreDraw { activity.reportFullyDrawn() }
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
val tag = "forYou:feed"
|
|
|
|
val tag = "forYou:feed"
|
|
|
|
|
|
|
|
|
|
|
|
val lazyGridState = rememberLazyGridState()
|
|
|
|
val lazyGridState = rememberLazyGridState()
|
|
|
|
TrackScrollJank(scrollableState = lazyGridState, stateName = tag)
|
|
|
|
TrackScrollJank(scrollableState = lazyGridState, stateName = tag)
|
|
|
|
|
|
|
|
|
|
|
|
LazyVerticalGrid(
|
|
|
|
LazyVerticalGrid(
|
|
|
|
columns = Adaptive(300.dp),
|
|
|
|
columns = Adaptive(300.dp),
|
|
|
|
contentPadding = PaddingValues(16.dp),
|
|
|
|
contentPadding = PaddingValues(16.dp),
|
|
|
|
horizontalArrangement = Arrangement.spacedBy(16.dp),
|
|
|
|
horizontalArrangement = Arrangement.spacedBy(16.dp),
|
|
|
|
verticalArrangement = Arrangement.spacedBy(24.dp),
|
|
|
|
verticalArrangement = Arrangement.spacedBy(24.dp),
|
|
|
|
modifier = modifier
|
|
|
|
modifier = modifier
|
|
|
|
.padding(innerPadding)
|
|
|
|
.padding(innerPadding)
|
|
|
|
.consumedWindowInsets(innerPadding)
|
|
|
|
.consumedWindowInsets(innerPadding)
|
|
|
|
.fillMaxSize()
|
|
|
|
.fillMaxSize()
|
|
|
|
.testTag("forYou:feed"),
|
|
|
|
.testTag("forYou:feed"),
|
|
|
|
state = lazyGridState
|
|
|
|
state = lazyGridState
|
|
|
|
) {
|
|
|
|
) {
|
|
|
|
interestsSelection(
|
|
|
|
interestsSelection(
|
|
|
|
interestsSelectionState = interestsSelectionState,
|
|
|
|
interestsSelectionState = interestsSelectionState,
|
|
|
|
onAuthorCheckedChanged = onAuthorCheckedChanged,
|
|
|
|
onAuthorCheckedChanged = onAuthorCheckedChanged,
|
|
|
|
onTopicCheckedChanged = onTopicCheckedChanged,
|
|
|
|
onTopicCheckedChanged = onTopicCheckedChanged,
|
|
|
|
saveFollowedTopics = saveFollowedTopics,
|
|
|
|
saveFollowedTopics = saveFollowedTopics,
|
|
|
|
// Custom LayoutModifier to remove the enforced parent 16.dp contentPadding
|
|
|
|
// Custom LayoutModifier to remove the enforced parent 16.dp contentPadding
|
|
|
|
// from the LazyVerticalGrid and enable edge-to-edge scrolling for this section
|
|
|
|
// from the LazyVerticalGrid and enable edge-to-edge scrolling for this section
|
|
|
|
interestsItemModifier = Modifier.layout { measurable, constraints ->
|
|
|
|
interestsItemModifier = Modifier.layout { measurable, constraints ->
|
|
|
|
val placeable = measurable.measure(
|
|
|
|
val placeable = measurable.measure(
|
|
|
|
constraints.copy(
|
|
|
|
constraints.copy(
|
|
|
|
maxWidth = constraints.maxWidth + 32.dp.roundToPx()
|
|
|
|
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(
|
|
|
|
newsFeed(
|
|
|
|
feedState = feedState,
|
|
|
|
feedState = feedState,
|
|
|
|
// Avoid showing a second loading wheel if we already are for the interests
|
|
|
|
// Avoid showing a second loading wheel if we already are for the interests
|
|
|
|
// selection
|
|
|
|
// selection
|
|
|
|
showLoadingUIIfLoading =
|
|
|
|
showLoadingUIIfLoading =
|
|
|
|
interestsSelectionState !is ForYouInterestsSelectionUiState.Loading,
|
|
|
|
interestsSelectionState !is ForYouInterestsSelectionUiState.Loading,
|
|
|
|
onNewsResourcesCheckedChanged = onNewsResourcesCheckedChanged,
|
|
|
|
onNewsResourcesCheckedChanged = onNewsResourcesCheckedChanged,
|
|
|
|
loadingContentDescription = R.string.for_you_loading
|
|
|
|
loadingContentDescription = R.string.for_you_loading
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
item(span = { GridItemSpan(maxLineSpan) }) {
|
|
|
|
item(span = { GridItemSpan(maxLineSpan) }) {
|
|
|
|
Column {
|
|
|
|
Column {
|
|
|
|
Spacer(modifier = Modifier.height(8.dp))
|
|
|
|
Spacer(modifier = Modifier.height(8.dp))
|
|
|
|
Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.safeDrawing))
|
|
|
|
Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.safeDrawing))
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Alex Vanyo
3 years ago
committed by
GitHub