Skip to content

Commit c98a068

Browse files
troZeePiotr Trocki
andauthored
chore(android): Revert android to the stable version (#238)
* revert android to 3.3.0 * update readme * cherry-pick overScrollMode * Fix overscroll Co-authored-by: Piotr Trocki <[email protected]>
1 parent c625da7 commit c98a068

File tree

13 files changed

+494
-265
lines changed

13 files changed

+494
-265
lines changed

README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,17 @@ This component allows the user to swipe left and right through pages of data. Un
1111

1212
## Versions
1313

14-
| 1.x | 2.x | 3.x | 4.x |
15-
| ---------------- | ------------- | ------------- | ------------- |
16-
| | iOS support | iOS support | iOS support |
17-
| Android support | Android support | AndroidX support | ViewPager2 support |
14+
| 1.x | 2.x | 3.x | 4.0.x, 4.2.x | > 4.2 |
15+
| ---------------- | ------------- | ------------- | ------------- | ------------- |
16+
| | iOS support | iOS support | iOS support | iOS support |
17+
| Android support | Android support | AndroidX support | ViewPager2 support | [Reverted to 3.3.0](https://github.com/callstack/react-native-viewpager/issues/233#issue-711000654) |
18+
19+
20+
## Experimental version
21+
22+
[ViewPager2](https://developer.android.com/jetpack/androidx/releases/viewpager2) for Android uses another implementation than ViewPager1, hence it caused lots of issues. You can try experimental version using below command
23+
24+
`yarn add @react-native-community/viewpager@next`
1825

1926
## Getting started
2027

android/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,4 @@ repositories {
3838
dependencies {
3939
//noinspection GradleDynamicVersion
4040
api 'com.facebook.react:react-native:+'
41-
implementation 'com.github.troZee:ViewPager2:v1.0.6'
42-
4341
}

android/src/main/java/com/reactnativecommunity/viewpager/FragmentAdapter.java

Lines changed: 0 additions & 65 deletions
This file was deleted.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.reactnativecommunity.viewpager.event;
8+
package com.reactnativecommunity.viewpager;
99

1010
import com.facebook.react.bridge.Arguments;
1111
import com.facebook.react.bridge.WritableMap;
@@ -22,14 +22,14 @@
2222
* (1 - x) fraction of the page at "position" index is visible, and x fraction of the next page
2323
* is visible.
2424
*/
25-
public class PageScrollEvent extends Event<PageScrollEvent> {
25+
/* package */ class PageScrollEvent extends Event<PageScrollEvent> {
2626

2727
public static final String EVENT_NAME = "topPageScroll";
2828

2929
private final int mPosition;
3030
private final float mOffset;
3131

32-
public PageScrollEvent(int viewTag, int position, float offset) {
32+
protected PageScrollEvent(int viewTag, int position, float offset) {
3333
super(viewTag);
3434
mPosition = position;
3535

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.reactnativecommunity.viewpager.event;
8+
package com.reactnativecommunity.viewpager;
99

1010
import com.facebook.react.bridge.Arguments;
1111
import com.facebook.react.bridge.WritableMap;
@@ -18,13 +18,13 @@
1818
* Additional data provided by this event:
1919
* - pageScrollState - {Idle,Dragging,Settling}
2020
*/
21-
public class PageScrollStateChangedEvent extends Event<PageScrollStateChangedEvent> {
21+
class PageScrollStateChangedEvent extends Event<PageScrollStateChangedEvent> {
2222

2323
public static final String EVENT_NAME = "topPageScrollStateChanged";
2424

2525
private final String mPageScrollState;
2626

27-
public PageScrollStateChangedEvent(int viewTag, String pageScrollState) {
27+
protected PageScrollStateChangedEvent(int viewTag, String pageScrollState) {
2828
super(viewTag);
2929
mPageScrollState = pageScrollState;
3030
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.reactnativecommunity.viewpager.event;
8+
package com.reactnativecommunity.viewpager;
99

1010
import com.facebook.react.bridge.Arguments;
1111
import com.facebook.react.bridge.WritableMap;
@@ -18,13 +18,13 @@
1818
* Additional data provided by this event:
1919
* - position - index of page that has been selected
2020
*/
21-
public class PageSelectedEvent extends Event<PageSelectedEvent> {
21+
/* package */ class PageSelectedEvent extends Event<PageSelectedEvent> {
2222

2323
public static final String EVENT_NAME = "topPageSelected";
2424

2525
private final int mPosition;
2626

27-
public PageSelectedEvent(int viewTag, int position) {
27+
protected PageSelectedEvent(int viewTag, int position) {
2828
super(viewTag);
2929
mPosition = position;
3030
}

0 commit comments

Comments
 (0)