Skip to content

Commit 9b34aa2

Browse files
mdvaccafacebook-github-bot
mdvacca
authored and
facebook-github-bot
committed
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
1 parent b133427 commit 9b34aa2

File tree

2 files changed

+75
-85
lines changed

2 files changed

+75
-85
lines changed

‎ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java

+37-42
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import android.graphics.Rect;
1818
import android.graphics.drawable.ColorDrawable;
1919
import android.graphics.drawable.Drawable;
20-
import android.os.Build;
2120
import android.view.FocusFinder;
2221
import android.view.KeyEvent;
2322
import android.view.MotionEvent;
@@ -960,50 +959,46 @@ public void reactSmoothScrollTo(int x, int y) {
960959
// of the animation. This means that, for example, if the user is scrolling rapidly, multiple
961960
// pages could be considered part of one animation, causing some page animations to be animated
962961
// very rapidly - looking like they're not animated at all.
963-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
964-
if (mScrollAnimator != null) {
965-
mScrollAnimator.cancel();
966-
}
962+
if (mScrollAnimator != null) {
963+
mScrollAnimator.cancel();
964+
}
967965

968-
mFinalAnimatedPositionScrollX = x;
969-
mFinalAnimatedPositionScrollY = y;
970-
PropertyValuesHolder scrollX = PropertyValuesHolder.ofInt("scrollX", getScrollX(), x);
971-
PropertyValuesHolder scrollY = PropertyValuesHolder.ofInt("scrollY", getScrollY(), y);
972-
mScrollAnimator = ObjectAnimator.ofPropertyValuesHolder(scrollX, scrollY);
973-
mScrollAnimator.setDuration(
974-
ReactScrollViewHelper.getDefaultScrollAnimationDuration(getContext()));
975-
mScrollAnimator.addUpdateListener(
976-
new ValueAnimator.AnimatorUpdateListener() {
977-
@Override
978-
public void onAnimationUpdate(ValueAnimator valueAnimator) {
979-
int scrollValueX = (Integer) valueAnimator.getAnimatedValue("scrollX");
980-
int scrollValueY = (Integer) valueAnimator.getAnimatedValue("scrollY");
981-
scrollTo(scrollValueX, scrollValueY);
982-
}
983-
});
984-
mScrollAnimator.addListener(
985-
new Animator.AnimatorListener() {
986-
@Override
987-
public void onAnimationStart(Animator animator) {}
988-
989-
@Override
990-
public void onAnimationEnd(Animator animator) {
991-
mFinalAnimatedPositionScrollX = -1;
992-
mFinalAnimatedPositionScrollY = -1;
993-
mScrollAnimator = null;
994-
updateStateOnScroll();
995-
}
966+
mFinalAnimatedPositionScrollX = x;
967+
mFinalAnimatedPositionScrollY = y;
968+
PropertyValuesHolder scrollX = PropertyValuesHolder.ofInt("scrollX", getScrollX(), x);
969+
PropertyValuesHolder scrollY = PropertyValuesHolder.ofInt("scrollY", getScrollY(), y);
970+
mScrollAnimator = ObjectAnimator.ofPropertyValuesHolder(scrollX, scrollY);
971+
mScrollAnimator.setDuration(
972+
ReactScrollViewHelper.getDefaultScrollAnimationDuration(getContext()));
973+
mScrollAnimator.addUpdateListener(
974+
new ValueAnimator.AnimatorUpdateListener() {
975+
@Override
976+
public void onAnimationUpdate(ValueAnimator valueAnimator) {
977+
int scrollValueX = (Integer) valueAnimator.getAnimatedValue("scrollX");
978+
int scrollValueY = (Integer) valueAnimator.getAnimatedValue("scrollY");
979+
scrollTo(scrollValueX, scrollValueY);
980+
}
981+
});
982+
mScrollAnimator.addListener(
983+
new Animator.AnimatorListener() {
984+
@Override
985+
public void onAnimationStart(Animator animator) {}
996986

997-
@Override
998-
public void onAnimationCancel(Animator animator) {}
987+
@Override
988+
public void onAnimationEnd(Animator animator) {
989+
mFinalAnimatedPositionScrollX = -1;
990+
mFinalAnimatedPositionScrollY = -1;
991+
mScrollAnimator = null;
992+
updateStateOnScroll();
993+
}
999994

1000-
@Override
1001-
public void onAnimationRepeat(Animator animator) {}
1002-
});
1003-
mScrollAnimator.start();
1004-
} else {
1005-
smoothScrollTo(x, y);
1006-
}
995+
@Override
996+
public void onAnimationCancel(Animator animator) {}
997+
998+
@Override
999+
public void onAnimationRepeat(Animator animator) {}
1000+
});
1001+
mScrollAnimator.start();
10071002
updateStateOnScroll(x, y);
10081003
setPendingContentOffsets(x, y);
10091004
}

‎ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java

+38-43
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import android.graphics.Rect;
1717
import android.graphics.drawable.ColorDrawable;
1818
import android.graphics.drawable.Drawable;
19-
import android.os.Build;
2019
import android.view.KeyEvent;
2120
import android.view.MotionEvent;
2221
import android.view.View;
@@ -86,7 +85,7 @@ public class ReactScrollView extends ScrollView
8685
private @Nullable List<Integer> mSnapOffsets;
8786
private boolean mSnapToStart = true;
8887
private boolean mSnapToEnd = true;
89-
private View mContentView;
88+
private @Nullable View mContentView;
9089
private ReactViewBackgroundManager mReactBackgroundManager;
9190
private int pendingContentOffsetX = UNSET_CONTENT_OFFSET;
9291
private int pendingContentOffsetY = UNSET_CONTENT_OFFSET;
@@ -831,50 +830,46 @@ public void reactSmoothScrollTo(int x, int y) {
831830
// of the animation. This means that, for example, if the user is scrolling rapidly, multiple
832831
// pages could be considered part of one animation, causing some page animations to be animated
833832
// very rapidly - looking like they're not animated at all.
834-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
835-
if (mScrollAnimator != null) {
836-
mScrollAnimator.cancel();
837-
}
833+
if (mScrollAnimator != null) {
834+
mScrollAnimator.cancel();
835+
}
836+
837+
mFinalAnimatedPositionScrollX = x;
838+
mFinalAnimatedPositionScrollY = y;
839+
PropertyValuesHolder scrollX = PropertyValuesHolder.ofInt("scrollX", getScrollX(), x);
840+
PropertyValuesHolder scrollY = PropertyValuesHolder.ofInt("scrollY", getScrollY(), y);
841+
mScrollAnimator = ObjectAnimator.ofPropertyValuesHolder(scrollX, scrollY);
842+
mScrollAnimator.setDuration(
843+
ReactScrollViewHelper.getDefaultScrollAnimationDuration(getContext()));
844+
mScrollAnimator.addUpdateListener(
845+
new ValueAnimator.AnimatorUpdateListener() {
846+
@Override
847+
public void onAnimationUpdate(ValueAnimator valueAnimator) {
848+
int scrollValueX = (Integer) valueAnimator.getAnimatedValue("scrollX");
849+
int scrollValueY = (Integer) valueAnimator.getAnimatedValue("scrollY");
850+
scrollTo(scrollValueX, scrollValueY);
851+
}
852+
});
853+
mScrollAnimator.addListener(
854+
new Animator.AnimatorListener() {
855+
@Override
856+
public void onAnimationStart(Animator animator) {}
838857

839-
mFinalAnimatedPositionScrollX = x;
840-
mFinalAnimatedPositionScrollY = y;
841-
PropertyValuesHolder scrollX = PropertyValuesHolder.ofInt("scrollX", getScrollX(), x);
842-
PropertyValuesHolder scrollY = PropertyValuesHolder.ofInt("scrollY", getScrollY(), y);
843-
mScrollAnimator = ObjectAnimator.ofPropertyValuesHolder(scrollX, scrollY);
844-
mScrollAnimator.setDuration(
845-
ReactScrollViewHelper.getDefaultScrollAnimationDuration(getContext()));
846-
mScrollAnimator.addUpdateListener(
847-
new ValueAnimator.AnimatorUpdateListener() {
848-
@Override
849-
public void onAnimationUpdate(ValueAnimator valueAnimator) {
850-
int scrollValueX = (Integer) valueAnimator.getAnimatedValue("scrollX");
851-
int scrollValueY = (Integer) valueAnimator.getAnimatedValue("scrollY");
852-
scrollTo(scrollValueX, scrollValueY);
853-
}
854-
});
855-
mScrollAnimator.addListener(
856-
new Animator.AnimatorListener() {
857-
@Override
858-
public void onAnimationStart(Animator animator) {}
859-
860-
@Override
861-
public void onAnimationEnd(Animator animator) {
862-
mFinalAnimatedPositionScrollX = -1;
863-
mFinalAnimatedPositionScrollY = -1;
864-
mScrollAnimator = null;
865-
updateStateOnScroll();
866-
}
858+
@Override
859+
public void onAnimationEnd(Animator animator) {
860+
mFinalAnimatedPositionScrollX = -1;
861+
mFinalAnimatedPositionScrollY = -1;
862+
mScrollAnimator = null;
863+
updateStateOnScroll();
864+
}
867865

868-
@Override
869-
public void onAnimationCancel(Animator animator) {}
866+
@Override
867+
public void onAnimationCancel(Animator animator) {}
870868

871-
@Override
872-
public void onAnimationRepeat(Animator animator) {}
873-
});
874-
mScrollAnimator.start();
875-
} else {
876-
smoothScrollTo(x, y);
877-
}
869+
@Override
870+
public void onAnimationRepeat(Animator animator) {}
871+
});
872+
mScrollAnimator.start();
878873
updateStateOnScroll(x, y);
879874
setPendingContentOffsets(x, y);
880875
}

0 commit comments

Comments
 (0)