Skip to content
This repository has been archived by the owner on Aug 2, 2024. It is now read-only.

Remove unused code related to NestedScrollConnection #944

Merged
merged 2 commits into from
Jan 2, 2024
Merged

Remove unused code related to NestedScrollConnection #944

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eea746
Remove unused code
Dec 30, 2023
09dfce4
Merge branch 'main' into remove-NestedScrollConnection
arriolac Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 1 addition & 29 deletions app/src/main/java/com/google/samples/apps/sunflower/compose/plantdetail/PlantDetailView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
import androidx.compose.ui.input.nestedscroll.NestedScrollSource
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.layout.positionInWindow
Expand Down Expand Up @@ -178,31 +174,7 @@ fun PlantDetails(
if (toolbarTransitionState == ToolbarState.HIDDEN) 1f else 0f
}

val toolbarHeightPx = with(LocalDensity.current) {
Dimens.PlantDetailAppBarHeight.roundToPx().toFloat()
}
val toolbarOffsetHeightPx = remember { mutableStateOf(0f) }
val nestedScrollConnection = remember {
object : NestedScrollConnection {
override fun onPreScroll(
available: Offset,
source: NestedScrollSource
): Offset {
val delta = available.y
val newOffset = toolbarOffsetHeightPx.value + delta
toolbarOffsetHeightPx.value =
newOffset.coerceIn(-toolbarHeightPx, 0f)
return Offset.Zero
}
}
}

Box(
modifier
.fillMaxSize()
// attach as a parent to the nested scroll system
.nestedScroll(nestedScrollConnection)
) {
Box(modifier.fillMaxSize()) {
PlantDetailsContent(
scrollState = scrollState,
toolbarState = toolbarState,
Expand Down