From 9b34aa261c272d96829c9a7d5b166594b3162f9d Mon Sep 17 00:00:00 2001 From: David Vacca Date: Fri, 31 Jul 2020 10:41:20 -0700 Subject: [PATCH] Cleanup unsed code in ReactScrollView Summary: This diff cleansup unsed code in ReactScrollView changelog: [Android][Deprecated] Remove code used by Android API level < 16 Reviewed By: JoshuaGross Differential Revision: D22771910 fbshipit-source-id: d02f7da209d3f313b22f3d4b8f6c413b32f7bc44 --- .../scroll/ReactHorizontalScrollView.java | 79 +++++++++--------- .../react/views/scroll/ReactScrollView.java | 81 +++++++++---------- 2 files changed, 75 insertions(+), 85 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java index c6db70340f8ff9..83f39fd86d1687 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java @@ -17,7 +17,6 @@ import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.os.Build; import android.view.FocusFinder; import android.view.KeyEvent; import android.view.MotionEvent; @@ -960,50 +959,46 @@ public void reactSmoothScrollTo(int x, int y) { // of the animation. This means that, for example, if the user is scrolling rapidly, multiple // pages could be considered part of one animation, causing some page animations to be animated // very rapidly - looking like they're not animated at all. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - if (mScrollAnimator != null) { - mScrollAnimator.cancel(); - } + if (mScrollAnimator != null) { + mScrollAnimator.cancel(); + } - mFinalAnimatedPositionScrollX = x; - mFinalAnimatedPositionScrollY = y; - PropertyValuesHolder scrollX = PropertyValuesHolder.ofInt("scrollX", getScrollX(), x); - PropertyValuesHolder scrollY = PropertyValuesHolder.ofInt("scrollY", getScrollY(), y); - mScrollAnimator = ObjectAnimator.ofPropertyValuesHolder(scrollX, scrollY); - mScrollAnimator.setDuration( - ReactScrollViewHelper.getDefaultScrollAnimationDuration(getContext())); - mScrollAnimator.addUpdateListener( - new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator valueAnimator) { - int scrollValueX = (Integer) valueAnimator.getAnimatedValue("scrollX"); - int scrollValueY = (Integer) valueAnimator.getAnimatedValue("scrollY"); - scrollTo(scrollValueX, scrollValueY); - } - }); - mScrollAnimator.addListener( - new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animator) {} - - @Override - public void onAnimationEnd(Animator animator) { - mFinalAnimatedPositionScrollX = -1; - mFinalAnimatedPositionScrollY = -1; - mScrollAnimator = null; - updateStateOnScroll(); - } + mFinalAnimatedPositionScrollX = x; + mFinalAnimatedPositionScrollY = y; + PropertyValuesHolder scrollX = PropertyValuesHolder.ofInt("scrollX", getScrollX(), x); + PropertyValuesHolder scrollY = PropertyValuesHolder.ofInt("scrollY", getScrollY(), y); + mScrollAnimator = ObjectAnimator.ofPropertyValuesHolder(scrollX, scrollY); + mScrollAnimator.setDuration( + ReactScrollViewHelper.getDefaultScrollAnimationDuration(getContext())); + mScrollAnimator.addUpdateListener( + new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator valueAnimator) { + int scrollValueX = (Integer) valueAnimator.getAnimatedValue("scrollX"); + int scrollValueY = (Integer) valueAnimator.getAnimatedValue("scrollY"); + scrollTo(scrollValueX, scrollValueY); + } + }); + mScrollAnimator.addListener( + new Animator.AnimatorListener() { + @Override + public void onAnimationStart(Animator animator) {} - @Override - public void onAnimationCancel(Animator animator) {} + @Override + public void onAnimationEnd(Animator animator) { + mFinalAnimatedPositionScrollX = -1; + mFinalAnimatedPositionScrollY = -1; + mScrollAnimator = null; + updateStateOnScroll(); + } - @Override - public void onAnimationRepeat(Animator animator) {} - }); - mScrollAnimator.start(); - } else { - smoothScrollTo(x, y); - } + @Override + public void onAnimationCancel(Animator animator) {} + + @Override + public void onAnimationRepeat(Animator animator) {} + }); + mScrollAnimator.start(); updateStateOnScroll(x, y); setPendingContentOffsets(x, y); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java index 5016bafe25e4ee..3d0410638c031e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java @@ -16,7 +16,6 @@ import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.os.Build; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; @@ -86,7 +85,7 @@ public class ReactScrollView extends ScrollView private @Nullable List mSnapOffsets; private boolean mSnapToStart = true; private boolean mSnapToEnd = true; - private View mContentView; + private @Nullable View mContentView; private ReactViewBackgroundManager mReactBackgroundManager; private int pendingContentOffsetX = UNSET_CONTENT_OFFSET; private int pendingContentOffsetY = UNSET_CONTENT_OFFSET; @@ -831,50 +830,46 @@ public void reactSmoothScrollTo(int x, int y) { // of the animation. This means that, for example, if the user is scrolling rapidly, multiple // pages could be considered part of one animation, causing some page animations to be animated // very rapidly - looking like they're not animated at all. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - if (mScrollAnimator != null) { - mScrollAnimator.cancel(); - } + if (mScrollAnimator != null) { + mScrollAnimator.cancel(); + } + + mFinalAnimatedPositionScrollX = x; + mFinalAnimatedPositionScrollY = y; + PropertyValuesHolder scrollX = PropertyValuesHolder.ofInt("scrollX", getScrollX(), x); + PropertyValuesHolder scrollY = PropertyValuesHolder.ofInt("scrollY", getScrollY(), y); + mScrollAnimator = ObjectAnimator.ofPropertyValuesHolder(scrollX, scrollY); + mScrollAnimator.setDuration( + ReactScrollViewHelper.getDefaultScrollAnimationDuration(getContext())); + mScrollAnimator.addUpdateListener( + new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator valueAnimator) { + int scrollValueX = (Integer) valueAnimator.getAnimatedValue("scrollX"); + int scrollValueY = (Integer) valueAnimator.getAnimatedValue("scrollY"); + scrollTo(scrollValueX, scrollValueY); + } + }); + mScrollAnimator.addListener( + new Animator.AnimatorListener() { + @Override + public void onAnimationStart(Animator animator) {} - mFinalAnimatedPositionScrollX = x; - mFinalAnimatedPositionScrollY = y; - PropertyValuesHolder scrollX = PropertyValuesHolder.ofInt("scrollX", getScrollX(), x); - PropertyValuesHolder scrollY = PropertyValuesHolder.ofInt("scrollY", getScrollY(), y); - mScrollAnimator = ObjectAnimator.ofPropertyValuesHolder(scrollX, scrollY); - mScrollAnimator.setDuration( - ReactScrollViewHelper.getDefaultScrollAnimationDuration(getContext())); - mScrollAnimator.addUpdateListener( - new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator valueAnimator) { - int scrollValueX = (Integer) valueAnimator.getAnimatedValue("scrollX"); - int scrollValueY = (Integer) valueAnimator.getAnimatedValue("scrollY"); - scrollTo(scrollValueX, scrollValueY); - } - }); - mScrollAnimator.addListener( - new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animator) {} - - @Override - public void onAnimationEnd(Animator animator) { - mFinalAnimatedPositionScrollX = -1; - mFinalAnimatedPositionScrollY = -1; - mScrollAnimator = null; - updateStateOnScroll(); - } + @Override + public void onAnimationEnd(Animator animator) { + mFinalAnimatedPositionScrollX = -1; + mFinalAnimatedPositionScrollY = -1; + mScrollAnimator = null; + updateStateOnScroll(); + } - @Override - public void onAnimationCancel(Animator animator) {} + @Override + public void onAnimationCancel(Animator animator) {} - @Override - public void onAnimationRepeat(Animator animator) {} - }); - mScrollAnimator.start(); - } else { - smoothScrollTo(x, y); - } + @Override + public void onAnimationRepeat(Animator animator) {} + }); + mScrollAnimator.start(); updateStateOnScroll(x, y); setPendingContentOffsets(x, y); }