This repository has been archived by the owner on Nov 14, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 563
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added ViewPropertyAnimator extensions
- Loading branch information
Showing
3 changed files
with
178 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
src/androidTest/java/androidx/core/animation/ViewPropertyAnimatorTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package androidx.core.animation | ||
|
|
||
| import android.support.test.InstrumentationRegistry | ||
| import android.support.test.annotation.UiThreadTest | ||
| import android.support.test.filters.SdkSuppress | ||
| import android.support.test.runner.AndroidJUnit4 | ||
| import android.view.View | ||
| import android.view.ViewPropertyAnimator | ||
| import org.junit.Assert | ||
| import org.junit.Before | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| @RunWith(AndroidJUnit4::class) | ||
| class ViewPropertyAnimatorTest { | ||
| private val context = InstrumentationRegistry.getContext() | ||
| private val view = View(context) | ||
|
|
||
| private lateinit var animator: ViewPropertyAnimator | ||
|
|
||
| @Before | ||
| fun before() { | ||
| view.alpha = 0f | ||
| animator = view.animate().alpha(1f).setDuration(0) | ||
| } | ||
|
|
||
| @UiThreadTest | ||
| @Test fun testDoOnStart() { | ||
| var called = false | ||
| animator.doOnStart { | ||
| called = true | ||
| } | ||
|
|
||
| animator.start() | ||
| Assert.assertTrue(called) | ||
| } | ||
|
|
||
| @UiThreadTest | ||
| @Test fun testDoOnEnd() { | ||
| var called = false | ||
| animator.doOnEnd { | ||
| called = true | ||
| } | ||
|
|
||
| animator.start() | ||
| animator.cancel() | ||
| Assert.assertTrue(called) | ||
| } | ||
|
|
||
| @UiThreadTest | ||
| @Test fun testDoOnCancel() { | ||
| var cancelCalled = false | ||
| animator.doOnCancel { | ||
| cancelCalled = true | ||
| } | ||
|
|
||
| animator.start() | ||
| animator.cancel() | ||
| Assert.assertTrue(cancelCalled) | ||
| } | ||
|
|
||
| @UiThreadTest | ||
| @SdkSuppress(minSdkVersion = 19) | ||
| @Test fun testDoOnUpdate() { | ||
| var called = false | ||
| animator.doOnUpdate { | ||
| called = true | ||
| } | ||
|
|
||
| animator.start() | ||
| Assert.assertTrue(called) | ||
| } | ||
| } |
94 changes: 94 additions & 0 deletions
94
src/main/java/androidx/core/animation/ViewPropertyAnimator.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| package androidx.core.animation | ||
|
|
||
| import android.animation.Animator | ||
| import android.animation.ValueAnimator | ||
| import android.view.ViewPropertyAnimator | ||
| import androidx.annotation.RequiresApi | ||
|
|
||
| /** | ||
| * Add an action which will be invoked when the animation has ended. | ||
| * | ||
| * @return the [Animator.AnimatorListener] added to the Animator | ||
| * @see Animator.end | ||
| */ | ||
| fun ViewPropertyAnimator.doOnEnd(action: (animator: Animator) -> Unit) = | ||
| setListener(onEnd = action) | ||
|
|
||
| /** | ||
| * Add an action which will be invoked when the animation has started. | ||
| * | ||
| * @return the [Animator.AnimatorListener] added to the Animator | ||
| * @see Animator.start | ||
| */ | ||
| fun ViewPropertyAnimator.doOnStart(action: (animator: Animator) -> Unit) = | ||
| setListener(onStart = action) | ||
|
|
||
| /** | ||
| * Add an action which will be invoked when the animation has been cancelled. | ||
| * | ||
| * @return the [Animator.AnimatorListener] added to the Animator | ||
| * @see Animator.cancel | ||
| */ | ||
| fun ViewPropertyAnimator.doOnCancel(action: (animator: Animator) -> Unit) = | ||
| setListener(onCancel = action) | ||
|
|
||
| /** | ||
| * Add an action which will be invoked when the animation has repeated. | ||
| * @return the [Animator.AnimatorListener] added to the Animator | ||
| */ | ||
| fun ViewPropertyAnimator.doOnRepeat(action: (animator: Animator) -> Unit) = | ||
| setListener(onRepeat = action) | ||
|
|
||
| /** | ||
| * Add an action which will be invoked when the animation has been updated. | ||
| * | ||
| * @return the [ValueAnimator.AnimatorUpdateListener] added to the Animator | ||
| * @see Animator.pause | ||
| */ | ||
| @RequiresApi(19) | ||
| fun ViewPropertyAnimator.doOnUpdate(action: (animator: ValueAnimator?) -> Unit) = | ||
| setUpdateListener(onUpdate = action) | ||
|
|
||
| /** | ||
| * Add a listener to this Animator using the provided actions. | ||
| */ | ||
| fun ViewPropertyAnimator.setListener( | ||
| onEnd: ((animator: Animator) -> Unit)? = null, | ||
| onStart: ((animator: Animator) -> Unit)? = null, | ||
| onCancel: ((animator: Animator) -> Unit)? = null, | ||
| onRepeat: ((animator: Animator) -> Unit)? = null | ||
| ): Animator.AnimatorListener { | ||
| val listener = object : Animator.AnimatorListener { | ||
| override fun onAnimationRepeat(animator: Animator) { | ||
| onRepeat?.invoke(animator) | ||
| } | ||
|
|
||
| override fun onAnimationEnd(animator: Animator) { | ||
| onEnd?.invoke(animator) | ||
| } | ||
|
|
||
| override fun onAnimationCancel(animator: Animator) { | ||
| onCancel?.invoke(animator) | ||
| } | ||
|
|
||
| override fun onAnimationStart(animator: Animator) { | ||
| onStart?.invoke(animator) | ||
| } | ||
| } | ||
| setListener(listener) | ||
| return listener | ||
| } | ||
|
|
||
| /** | ||
| * Add an update listener to this Animator using the provided actions. | ||
| */ | ||
| @RequiresApi(19) | ||
| fun ViewPropertyAnimator.setUpdateListener( | ||
| onUpdate: ((animator: ValueAnimator?) -> Unit)? = null | ||
| ): ValueAnimator.AnimatorUpdateListener { | ||
| val listener = ValueAnimator.AnimatorUpdateListener { | ||
| onUpdate?.invoke(it) | ||
| } | ||
| setUpdateListener(listener) | ||
| return listener | ||
| } |