Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d77e2885 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Move OffsetOverscrollEffect and others to PlatformComposeCore (1/2) 

Bug: 378470603
Test: atest OffsetOverscrollEffectTest
Flag: EXEMPT simple refactoring
Change-Id: Ic5b32111ae971a1962e61fdf35e766fbab2472f0
parent 3671ae22

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/effect/ContentOverscrollEffect.kt→packages/SystemUI/compose/core/src/com/android/compose/gesture/effect/ContentOverscrollEffect.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.compose.animation.scene.effect

package com.android.compose.gesture.effect



import androidx.compose.animation.core.Animatable

import androidx.compose.animation.core.AnimationSpec

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/effect/OffsetOverscrollEffect.kt→packages/SystemUI/compose/core/src/com/android/compose/gesture/effect/OffsetOverscrollEffect.kt

+34 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.compose.animation.scene.effect

package com.android.compose.gesture.effect



import androidx.annotation.VisibleForTesting

import androidx.compose.animation.core.AnimationSpec
@@ -34,7 +34,6 @@ import androidx.compose.ui.node.LayoutModifierNode 
import androidx.compose.ui.unit.Constraints

import androidx.compose.ui.unit.Density

import androidx.compose.ui.unit.dp

import com.android.compose.animation.scene.ProgressConverter

import kotlin.math.roundToInt

import kotlinx.coroutines.CoroutineScope
@@ -80,7 +79,7 @@ class OffsetOverscrollEffect( 
            )



        @VisibleForTesting

        internal fun computeOffset(density: Density, overscrollDistance: Float): Int {

        fun computeOffset(density: Density, overscrollDistance: Float): Int {

            val maxDistancePx = with(density) { MaxDistance.toPx() }

            val progress = ProgressConverter.Default.convert(overscrollDistance / maxDistancePx)

            return (progress * maxDistancePx).roundToInt()
@@ -98,3 +97,35 @@ fun rememberOffsetOverscrollEffect( 
        OffsetOverscrollEffect(orientation, animationScope, animationSpec)

    }

}



/** This converter lets you change a linear progress into a function of your choice. */

fun interface ProgressConverter {

    fun convert(progress: Float): Float



    companion object {

        /** Starts linearly with some resistance and slowly approaches to 0.2f */

        val Default = tanh(maxProgress = 0.2f, tilt = 3f)



        /**

         * The scroll stays linear, with [factor] you can control how much resistance there is.

         *

         * @param factor If you choose a value between 0f and 1f, the progress will grow more

         *   slowly, like there's resistance. A value of 1f means there's no resistance.

         */

        fun linear(factor: Float = 1f) = ProgressConverter { it * factor }



        /**

         * This function starts linear and slowly approaches [maxProgress].

         *

         * See a [visual representation](https://www.desmos.com/calculator/usgvvf0z1u) of this

         * function.

         *

         * @param maxProgress is the maximum progress value.

         * @param tilt behaves similarly to the factor in the [linear] function, and allows you to

         *   control how quickly you get to the [maxProgress].

         */

        fun tanh(maxProgress: Float, tilt: Float = 1f) = ProgressConverter {

            maxProgress * kotlin.math.tanh(x = it / (maxProgress * tilt))

        }

    }

}

packages/SystemUI/compose/scene/src/com/android/compose/ui/util/SpaceVectorConverter.kt→packages/SystemUI/compose/core/src/com/android/compose/ui/util/SpaceVectorConverter.kt

+0 −0

File moved.

View file

packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/effect/OffsetOverscrollEffectTest.kt→packages/SystemUI/compose/core/tests/src/com/android/compose/gesture/effect/OffsetOverscrollEffectTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.compose.animation.scene.effect

package com.android.compose.gesture.effect



import androidx.compose.foundation.gestures.Orientation

import androidx.compose.foundation.gestures.rememberScrollableState

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/OverlayShade.kt

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ import androidx.compose.ui.unit.dp 
import com.android.compose.animation.scene.ContentScope

import com.android.compose.animation.scene.ElementKey

import com.android.compose.animation.scene.LowestZIndexContentPicker

import com.android.compose.animation.scene.effect.rememberOffsetOverscrollEffect

import com.android.compose.gesture.effect.rememberOffsetOverscrollEffect

import com.android.compose.windowsizeclass.LocalWindowSizeClass

import com.android.systemui.res.R