iOS native scroll and feel by elijah-semyonov · Pull Request #609 · JetBrains/compose-multiplatform-core

Elijah Semyonov (elijah-semyonov) · 2023-06-27T12:14:51Z

Proposed Changes

Implement CupertinoScrollDecayAnimationSpec to simulate iOS inertia equation.
Implement CupertinoOverscrollEffect to simulate rubber banding and spring effect.

Testing

Test: launch iOS app and test interaction between fling and overscroll

Notes

Comments for CupertinoOverscrollEffect.direction mention this behavior for 2D cases:
Left picture shows visual path of combined scroll offset (scrollable content offset + overscroll offset), rect represents bounds of values max(0, content.size - frame.size) for each dimension.
Right pictures show value over time (t) for X and Y components. Green changes are happening inside spring animation, blue inside fling animation. (t) scale is matching for both (bottom and top on the right).

Currently the API forces us to communicate with outer entities using velocities deltas, which is built on assumption that all these animations' stages happen in sync for both dimensions (which is not the case).

override suspend fun applyToFling(
        velocity: Velocity,
        performFling: suspend (Velocity) -> Velocity
    ) {
        val availableFlingVelocity = playInitialSpringAnimationIfNeeded(velocity)

        val velocityConsumedByFling = performFling(availableFlingVelocity)
        val postFlingVelocity = availableFlingVelocity - velocityConsumedByFling

        playSpringAnimation(
            lastFlingUncosumedDelta.toFloat(),
            postFlingVelocity.toFloat(),
            false
        )
    }

# Conflicts: # compose/mpp/demo-uikit/build.gradle.kts

This reverts commit 3b04108.

This reverts commit bb18b67.

This reverts commit 69b717e.

# Conflicts: # compose/mpp/demo/src/commonMain/kotlin/androidx/compose/mpp/demo/LazyLayouts.kt

* developmentTeamToRunOnRealDevice * print jvm arch * iOS run configuration * redundant run configurations * run configurations * Revert "run configurations" This reverts commit 3b04108. * Revert "redundant run configurations" This reverts commit bb18b67. * Revert "iOS run configuration" This reverts commit 69b717e. * simplify * check runOnDevice correctly * update README * update README * run with Xcode * run with Xcode * run with Xcode * doc run mpp/demo-uikit sample on iOS * projectProperties * projectProperties * fix iOS on x86-64 * simplify demo-uikit * Added check to TEAM_ID * Add geometry functions to Offset.kt * Implement DecelerationTimingParameters * add feature flag * Add RubberBand effect business logic * Fix comment * Refactor RubberBand * WIP: start experimenting * Revert Scroll.kt changes * Chop OvercrollEffect actual providers into uikit and macos targets. Implement stub for iOS. * Implement working stub for iOS. * Implement rubber band logic in IOSOverScrollEffect * Delete dead code, mark private members accordingly. * Explicitly pass environmental variables to Xcode build script. * Integrate COMPOSE_DEMO_APPLE_TEAM_ID variable into xcodegen * Add stub for demo with spring animation * Add Underdamped spring solution * Create logic for making spring solution * Snapshot * Remove dead code. * Add spec-based implementation * Add test case to check animation * Snapshot * Snapshot * Snapshot * Snapshot * Snapshot everything except edge case working * Move connecting fling behavior and overscroll further down the tree * Add back button on nested selection screens in Demo App * Play spring animation on zero velocity fling. * Remove dead code * Snapshot before fling from overscroll edge case * Resolve edge case of flinging from inside overscroll area * Update documentation * Refactor boolean value to OverscrollOffsetSpace enum * Refactor boolean value to OverscrollOffsetSpace enum * Modify API to support interaction between OverscrollEffect and FlingBehavior * Delete dead code. * Update comment. * Update comment. * Move division by density outside of Offset * Revert "Add geometry functions to Offset.kt" This reverts commit 947b295. * Remove redundant import * Remove redundant CupertinoFlingBehavior. * Remove redundant constructor arg * Refine documentation * Modify android code and tests to conform to API change * Update document * Reset change * Remove gradle line. * Revert changes * Revert changes * Revert changes * Add comment * Make constant internal * Revert Scrollable.kt. * Bring CupertinoFlingBehavior back * Revert changes. * Revert API change. * Updater converter interface * Update CupertinoOverscrollEffect * Update CupertinoOverscrollEffect * Revert "Modify android code and tests to conform to API change" This reverts commit d5ad295. * Revert changes * Remove dead code mentions * Bind cupertino fling and overscroll behavior together * Fix a wrong construction argument bug * Revert line * Remove unneeded imports * Remove rubberband/linear space logic. iOS seems to calculate everything in rubberband space. * Update stiffness to counteract rubbe-band space visual feedback. * Fix typo. * Return it back. * Refactor density injection logic. * Fix edge case. * Change var to val * Remove new line * Fix formatting * Fix typo * Adjust fling from overscroll logic * Implement Cupertino behavior using old API * Remove println * Fix RTL and add demo * Make added API internal * Add optOut API * Update comment * Remove ScrollValueConverter altogether. * Update documentation * Move CupertinoScrollDecayAnimationSpec to uikit source set * Move CupertinoOverscrollEffect to cupertino module * Change visibility modifer * Change visibility modifier * Move CupertinoScrollDecayAnimationSpec to cupertino module * Revert visibility modifier change. * Fix formatting * Remove dead code. * Use specific type instead of a Pair * Add explicit arguments' names * Update formatting * Replace boolean with enum * Move Velocity<->Offset conversions to file scope. * Replace default decelerationRate with iOS constant instead of literal * Remove extra line * Move opt-out rubber banding to ScrollConfig * Refactor last change a bit * Rename UIKitScroll config * Fix experimental annotation to correct one --------- Co-authored-by: dima.avdeev <dima.avdeev@jetbrains.com>

…mon*` Test: ./gradlew paging:paging-testing:allTests This is an imported pull request from androidx#609. Resolves JetBrains#609 Github-Pr-Head-Sha: 8ce38e6 GitOrigin-RevId: ea700e2 Change-Id: I001dac7814ba8b9a01f1797657efac0643a18b0c

dima.avdeev (dima-avdeev-jb) and others added 30 commits April 17, 2023 14:58

developmentTeamToRunOnRealDevice

0aaabd4

Merge branch 'jb-main' into dima.avdeev/run-demo-uikit-on-deivice

a4a2a5d

# Conflicts: # compose/mpp/demo-uikit/build.gradle.kts

print jvm arch

c21a4d3

iOS run configuration

69b717e

redundant run configurations

bb18b67

run configurations

3b04108

Revert "run configurations"

a8be2fe

This reverts commit 3b04108.

Revert "redundant run configurations"

bd63456

This reverts commit bb18b67.

Revert "iOS run configuration"

a6f217d

This reverts commit 69b717e.

simplify

cef682d

check runOnDevice correctly

0d60bd2

update README

d0aeb8f

update README

1de8717

run with Xcode

dc6c772

run with Xcode

0cf59fa

run with Xcode

3cf9d3b

doc run mpp/demo-uikit sample on iOS

640d2e3

projectProperties

c4de446

projectProperties

f505e57

fix iOS on x86-64

bc09c91

simplify demo-uikit

903de00

Added check to TEAM_ID

231de6e

Add geometry functions to Offset.kt

947b295

Implement DecelerationTimingParameters

dc7523a

add feature flag

c356416

Add RubberBand effect business logic

88d0af8

Fix comment

cf5116b

Refactor RubberBand

1f4ae57

WIP: start experimenting

baaf888

Revert Scroll.kt changes

afca754

Elijah Semyonov (elijah-semyonov) added 10 commits July 4, 2023 14:30

Move CupertinoScrollDecayAnimationSpec to cupertino module

5dce6c1

Revert visibility modifier change.

838dcd5

Fix formatting

ae1b429

Remove dead code.

b974bc3

Use specific type instead of a Pair

1962694

Add explicit arguments' names

336ab1e

Update formatting

3f7afb0

Replace boolean with enum

dd8af4c

Move Velocity<->Offset conversions to file scope.

dca1cfb

Replace default decelerationRate with iOS constant instead of literal

8fedbc0

Igor Demin (igordmn) mentioned this pull request Jul 4, 2023

Introduce ComposePanel that can be disposed manually #620

Merged

Merge branch 'jb-main' into elijah.semyonov/ios-scroll-behavior

a6f835b

# Conflicts: # compose/mpp/demo/src/commonMain/kotlin/androidx/compose/mpp/demo/LazyLayouts.kt

Ivan Matkov (MatkovIvan) reviewed Jul 10, 2023

View reviewed changes

Comment thread ...e/foundation/foundation/src/uikitMain/kotlin/androidx/compose/foundation/Overscroll.uikit.kt Outdated

Ivan Matkov (MatkovIvan) reviewed Jul 10, 2023

View reviewed changes

Comment thread ...tion/src/uikitMain/kotlin/androidx/compose/foundation/cupertino/CupertinoOverscrollEffect.kt Outdated

Elijah Semyonov (elijah-semyonov) added 5 commits July 10, 2023 11:32

Remove extra line

08b67eb

Move opt-out rubber banding to ScrollConfig

8859691

Move opt-out rubber banding to ScrollConfig

2ac2f53

Refactor last change a bit

baac6e4

Rename UIKitScroll config

99dd70a

Ivan Matkov (MatkovIvan) reviewed Jul 10, 2023

View reviewed changes

Comment thread ...oundation/src/uikitMain/kotlin/androidx/compose/foundation/gestures/UikitScrollable.uikit.kt Outdated

Fix experimental annotation to correct one

c5ab1e1

Ivan Matkov (MatkovIvan) approved these changes Jul 10, 2023

View reviewed changes

Elijah Semyonov (elijah-semyonov) merged commit aba6dd3 into jb-main Jul 10, 2023

Elijah Semyonov (elijah-semyonov) deleted the elijah.semyonov/ios-scroll-behavior branch July 10, 2023 10:14

Ivan Matkov (MatkovIvan) mentioned this pull request Jul 13, 2023

Restore scrollable changes for fling #659

Merged

Navigation Menu

Uh oh!

iOS native scroll and feel - #609

iOS native scroll and feel#609
Elijah Semyonov (elijah-semyonov) merged 135 commits into
jb-mainfrom
elijah.semyonov/ios-scroll-behavior

Elijah Semyonov (elijah-semyonov) commented Jun 27, 2023 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

Elijah Semyonov (elijah-semyonov) commented Jun 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed Changes

Testing

Notes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Elijah Semyonov (elijah-semyonov) commented Jun 27, 2023 •

edited

Loading