Skip to content
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

Jump to bottom

Use correct ScaleType when animating same element multiple times #6507

Merged
merged 1 commit into from
Aug 25, 2020
+6 −2
Merged

Use correct ScaleType when animating same element multiple times #6507

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
8 changes: 6 additions & 2 deletions ...oid/app/src/main/java/com/reactnativenavigation/views/element/animators/MatrixAnimator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,12 @@ class MatrixAnimator(from: View, to: View) : PropertyAnimatorCreator<ReactImageV
}

private fun getScaleType(child: View): ScalingUtils.ScaleType? {
val scaleType = (child as ReactImageView).hierarchy.actualImageScaleType
return if (scaleType is InterpolatingScaleType) scaleType.scaleTypeFrom else scaleType
return getScaleType(child as ReactImageView, child.hierarchy.actualImageScaleType!!)
}

private fun getScaleType(child: ReactImageView, scaleType: ScalingUtils.ScaleType): ScalingUtils.ScaleType? {
if (scaleType is InterpolatingScaleType) return getScaleType(child, scaleType.scaleTypeTo )
return scaleType
}

private fun calculateBounds(view: View) = Rect(0, 0, view.width, view.height)
Expand Down