Skip to content

[JetLagged] Fix drawer animation logic #1599

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 2 commits into
base: main
Choose a base branch
from
Open

[JetLagged] Fix drawer animation logic #1599

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e93efc
Fix drawer animation logic
cartland Jul 29, 2025
dd331c9
Improve readability of canReachTargetWithDecay with if-else
cartland Jul 29, 2025
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
6 changes: 2 additions & 4 deletions JetLagged/app/src/main/java/com/example/jetlagged/JetLaggedDrawer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,18 +158,16 @@ fun HomeScreenDrawer(windowSizeClass: WindowSizeClass) {
} else {
0f
}
// checking if the difference between the target and actual is + or -
val targetDifference = (actualTargetX - targetOffsetX)
val canReachTargetWithDecay =
(
targetOffsetX > actualTargetX &&
velocity > 0f &&
targetDifference > 0f
actualTargetX > 0f
) ||
(
targetOffsetX < actualTargetX &&
velocity < 0 &&
targetDifference < 0f
actualTargetX == 0f
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The compound condition for canReachTargetWithDecay is dense and can be hard to understand at a glance. The use of actualTargetX > 0f to imply that the drawer is opening is not immediately obvious.

To improve readability and maintainability, refactor this logic to be more explicit about its intent. An if/else structure based on the target state (opening vs. closing) would make the conditions for checking if the fling will overshoot the target much clearer.

                            val canReachTargetWithDecay = if (actualTargetX > 0f) {
                                // We are aiming for the open state, check if the fling is strong
                                // enough to overshoot.
                                velocity > 0f && targetOffsetX > actualTargetX
                            } else {
                                // We are aiming for the closed state, check if the fling is strong
                                // enough to overshoot.
                                velocity < 0f && targetOffsetX < actualTargetX
                            }

if (canReachTargetWithDecay) {
translationX.animateDecay(
Expand Down