status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-01-27 09:45:04 +00:00
Code Issues Projects Releases Wiki Activity

added in snapAlignment for horizontal android scrollView

Browse Source 
Summary:
<!--
  Required: Write your motivation here.
  If this PR fixes an issue, type "Fixes #issueNumber" to automatically close the issue when the PR is merged.
-->
`snapToAlignment` is available on iOS but not android yet. This PR is to add support for `snapToAlignment` on android as `snapToInterval` was recently added to android and they are very useful together.

Make a `Flatlist` in android with `pagingEnabled`, `horizontal`, `snapToInterval` and `snapToAlignment` set and see how adjusting between the three values of `snapToAlignment` aligns just like it does in iOS.

<!--
  Required.
  Help reviewers and the release process by writing your own release notes. See below for an example.
-->

[ANDROID] [MINOR] [ScrollView] - On Android, **ScrollView** now takes snapToAlignment like iOS

<!--
  **INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

    CATEGORY
  [----------]      TYPE
  [ CLI      ] [-------------]    LOCATION
  [ DOCS     ] [ BREAKING    ] [-------------]
  [ GENERAL  ] [ BUGFIX      ] [ {Component} ]
  [ INTERNAL ] [ ENHANCEMENT ] [ {Filename}  ]
  [ IOS      ] [ FEATURE     ] [ {Directory} ]   |-----------|
  [ ANDROID  ] [ MINOR       ] [ {Framework} ] - | {Message} |
  [----------] [-------------] [-------------]   |-----------|

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/18648

Differential Revision: D7473762

Pulled By: mdvacca

fbshipit-source-id: ad4778b83f9fd1352455b2ed28a5f37229d9d8c7
This commit is contained in:
philvasseur 2018-04-04 20:33:11 -07:00 committed by Facebook Github Bot
parent 490f22ae72
commit 3ed076b65a
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
View File

@ -52,6 +52,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView implements
private @Nullable Drawable mEndBackground;
private int mEndFillColor = Color.TRANSPARENT;
private int mSnapInterval = 0;
private String mSnapAlignment = "start";
private ReactViewBackgroundManager mReactBackgroundManager;
public ReactHorizontalScrollView(Context context) {
@ -96,6 +97,13 @@ public class ReactHorizontalScrollView extends HorizontalScrollView implements
public void setSnapInterval(int snapInterval) {
mSnapInterval = snapInterval;
if(snapInterval != 0) {
mPagingEnabled = true;
}
}
public void setSnapAlignment(String snapAlignment) {
mSnapAlignment = snapAlignment;
}
public void flashScrollIndicators() {
@ -236,6 +244,17 @@ public class ReactHorizontalScrollView extends HorizontalScrollView implements
return getWidth();
}
private int getAlignmentOffset() {
int width = getWidth();
int snapInterval = getSnapInterval();
if (mSnapAlignment.equals("center")) {
return (width - snapInterval)/2;
} else if(mSnapAlignment.equals("end")) {
return (width - snapInterval);
}
return 0;
}
public void setEndFillColor(int color) {
if (color != mEndFillColor) {
mEndFillColor = color;
@ -349,7 +368,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView implements
if (predictedX > page * width + width / 2) {
page = page + 1;
}
smoothScrollTo(page * width, getScrollY());
smoothScrollTo(page * width - getAlignmentOffset(), getScrollY());
}
@Override

5
ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
View File

@ -80,6 +80,11 @@ public class ReactHorizontalScrollViewManager
view.setSnapInterval((int) (snapToInterval * screenDisplayMetrics.density));
}
@ReactProp(name = "snapToAlignment")
public void setSnapToAlignment(ReactHorizontalScrollView view, String snapToAlignment) {
view.setSnapAlignment(snapToAlignment);
}
@ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
public void setRemoveClippedSubviews(ReactHorizontalScrollView view, boolean removeClippedSubviews) {
view.setRemoveClippedSubviews(removeClippedSubviews);