Skip to content

Scope appearance listener state per animator #8352

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
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Scope appearance listener state per animator #8352

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
11 changes: 4 additions & 7 deletions ...id/src/main/java/com/reactnativenavigation/views/animations/BaseViewAppearanceAnimator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,19 @@ open class BaseViewAppearanceAnimator<T : View>(
var showAnimator: Animator = AnimatorSet()
private set(value) {
field = value
field.addListener(showAnimatorListener)
field.addListener(AnimatorListener(AnimationState.AnimatingEnter, View.VISIBLE))
field.doOnEnd { onShowAnimationEnd() }
}
@VisibleForTesting
var hideAnimator: Animator = AnimatorSet()
set(value) {
field = value
field.addListener(hideAnimatorListener)
field.addListener(AnimatorListener(AnimationState.AnimatingExit, View.GONE))
field.doOnEnd { onHideAnimationEnd() }
}

private val showAnimatorListener = AnimatorListener(AnimationState.AnimatingEnter, View.VISIBLE)
private val hideAnimatorListener = AnimatorListener(AnimationState.AnimatingExit, View.GONE)

private inner class AnimatorListener(private val startState: AnimationState, private val endVisibility: Int) : AnimatorListenerAdapter() {
var isCancelled = false
private var isCancelled = false

override fun onAnimationStart(animation: Animator) {
view.resetViewProperties()
Expand Down Expand Up @@ -172,4 +169,4 @@ open class BaseViewAppearanceAnimator<T : View>(
start()
}
}
}
}
14 changes: 13 additions & 1 deletion ...rc/test/java/com/reactnativenavigation/views/animations/BaseViewAppearanceAnimatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,19 @@ class BaseViewAppearanceAnimatorTest : BaseTest() {
assertThat(uut.hideAnimator).isEqualTo(defaultHideAnimator)
}

@Test
fun hide_completesAfterPreviousHideWasCancelled() {
uut.hide()
uut.show()
uut.showAnimator.end()

uut.hide()
uut.hideAnimator.end()

assertThat(view.visibility).isEqualTo(View.GONE)
}

private fun assertNotAnimating() = assertThat(uut.isAnimatingHide() && uut.isAnimatingShow()).isFalse()
private fun assertAnimatingShow() = assertThat(uut.isAnimatingShow() && !uut.isAnimatingHide()).isTrue()
private fun assertAnimatingHide() = assertThat(uut.isAnimatingHide() && !uut.isAnimatingShow()).isTrue()
}
}