Skip to content

Commit d4469fb

Browse files
mdvaccafacebook-github-bot
authored andcommitted
Fix MissingOverrideAnnotation: Add @OverRide to ScrollView methods
Summary: Fixed MissingOverrideAnnotation lint errors in ReactHorizontalScrollView.java and ReactScrollView.java. Added Override annotation to getScrollEnabled(), reactSmoothScrollTo(), and getStateWrapper() methods in both scroll view implementations, keeping them in sync as required. changelog: [internal] internal Differential Revision: D95412846
1 parent 56fa8da commit d4469fb

3 files changed

Lines changed: 10 additions & 1 deletion

File tree

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
240240
}
241241
}
242242

243+
@Override
243244
public boolean getScrollEnabled() {
244245
return mScrollEnabled;
245246
}
@@ -1599,6 +1600,7 @@ public void setBorderStyle(@Nullable String style) {
15991600
* <p>`smoothScrollTo` changes `contentOffset` and we need to keep `contentOffset` in sync between
16001601
* scroll view and state. Calling raw `smoothScrollTo` doesn't update state.
16011602
*/
1603+
@Override
16021604
public void reactSmoothScrollTo(int x, int y) {
16031605
ReactScrollViewHelper.smoothScrollTo(this, x, y);
16041606
setPendingContentOffsets(x, y);
@@ -1742,6 +1744,7 @@ private void adjustPositionForContentChangeRTL(int left, int right, int oldLeft,
17421744
}
17431745

17441746
@Nullable
1747+
@Override
17451748
public StateWrapper getStateWrapper() {
17461749
return mStateWrapper;
17471750
}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<fefaf14f0291216b635ea0c356e9929c>>
7+
* @generated SignedSource<<f31741d016231b75604a72aa89dd6923>>
88
*/
99

1010
/**
@@ -300,6 +300,7 @@ public void setScrollEnabled(boolean scrollEnabled) {
300300
mScrollEnabled = scrollEnabled;
301301
}
302302

303+
@Override
303304
public boolean getScrollEnabled() {
304305
return mScrollEnabled;
305306
}
@@ -888,6 +889,7 @@ private int getMaxScrollY() {
888889
}
889890

890891
@Nullable
892+
@Override
891893
public StateWrapper getStateWrapper() {
892894
return mStateWrapper;
893895
}
@@ -1353,6 +1355,7 @@ public void setContentOffset(@Nullable ReadableMap value) {
13531355
* <p>`smoothScrollTo` changes `contentOffset` and we need to keep `contentOffset` in sync between
13541356
* scroll view and state. Calling raw `smoothScrollTo` doesn't update state.
13551357
*/
1358+
@Override
13561359
public void reactSmoothScrollTo(int x, int y) {
13571360
ReactScrollViewHelper.smoothScrollTo(this, x, y);
13581361
setPendingContentOffsets(x, y);

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ public void setScrollEnabled(boolean scrollEnabled) {
292292
mScrollEnabled = scrollEnabled;
293293
}
294294

295+
@Override
295296
public boolean getScrollEnabled() {
296297
return mScrollEnabled;
297298
}
@@ -880,6 +881,7 @@ private int getMaxScrollY() {
880881
}
881882

882883
@Nullable
884+
@Override
883885
public StateWrapper getStateWrapper() {
884886
return mStateWrapper;
885887
}
@@ -1345,6 +1347,7 @@ public void setContentOffset(@Nullable ReadableMap value) {
13451347
* <p>`smoothScrollTo` changes `contentOffset` and we need to keep `contentOffset` in sync between
13461348
* scroll view and state. Calling raw `smoothScrollTo` doesn't update state.
13471349
*/
1350+
@Override
13481351
public void reactSmoothScrollTo(int x, int y) {
13491352
ReactScrollViewHelper.smoothScrollTo(this, x, y);
13501353
setPendingContentOffsets(x, y);

0 commit comments

Comments
 (0)