Skip to content

Fix progress changing without scrolling (on navigation) #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix progress changing without scrolling (on navigation) #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions lib/src/main/java/me/onebone/toolbar/CollapsingToolbar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,14 @@ import kotlin.math.roundToInt

@Stable
class CollapsingToolbarState(
initial: Int = Int.MAX_VALUE
): ScrollableState {
initialHeight: Int = Int.MAX_VALUE,
initialMinHeight: Int = 0,
initialMaxHeight: Int = Int.MAX_VALUE,
) : ScrollableState {
/**
* [height] indicates current height of the toolbar.
*/
var height: Int by mutableStateOf(initial)
var height: Int by mutableStateOf(initialHeight)
private set

/**
Expand Down Expand Up @@ -95,8 +97,8 @@ class CollapsingToolbarState(
}
}

private var maxHeightState by mutableStateOf(Int.MAX_VALUE)
private var minHeightState by mutableStateOf(0)
private var maxHeightState by mutableStateOf(initialMaxHeight)
private var minHeightState by mutableStateOf(initialMinHeight)

val progress: Float
@FloatRange(from = 0.0, to = 1.0)
Expand Down Expand Up @@ -189,11 +191,11 @@ class CollapsingToolbarState(

@Composable
fun rememberCollapsingToolbarState(
initial: Int = Int.MAX_VALUE
initialHeight: Int = Int.MAX_VALUE
): CollapsingToolbarState {
return remember {
CollapsingToolbarState(
initial = initial
initialHeight = initialHeight
)
}
}
Expand Down
8 changes: 7 additions & 1 deletion lib/src/main/java/me/onebone/toolbar/CollapsingToolbarScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,19 @@ class CollapsingToolbarScaffoldState(
private class CollapsingToolbarScaffoldStateSaver: Saver<CollapsingToolbarScaffoldState, Bundle> {
override fun restore(value: Bundle): CollapsingToolbarScaffoldState =
CollapsingToolbarScaffoldState(
CollapsingToolbarState(value.getInt("height", Int.MAX_VALUE)),
CollapsingToolbarState(
initialHeight = value.getInt("height", Int.MAX_VALUE),
initialMaxHeight = value.getInt("maxHeight", Int.MAX_VALUE),
initialMinHeight = value.getInt("minHeight", 0)
),
value.getInt("offsetY", 0)
)

override fun SaverScope.save(value: CollapsingToolbarScaffoldState): Bundle =
Bundle().apply {
putInt("height", value.toolbarState.height)
putInt("minHeight", value.toolbarState.minHeight)
putInt("maxHeight", value.toolbarState.maxHeight)
putInt("offsetY", value.offsetY)
}
}
Expand Down