Skip to content

Commit fa7199f

Browse files
troZeetroZee
authored
chore: update example to latest react native (#160)
1 parent 6ef6e74 commit fa7199f

File tree

22 files changed

+1237
-782
lines changed

22 files changed

+1237
-782
lines changed

‎.flowconfig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ node_modules/warning/.*
2222
[include]
2323

2424
[libs]
25-
node_modules/react-native/Libraries/react-native/react-native-interface.js
25+
node_modules/react-native/interface.js
2626
node_modules/react-native/flow/
2727
node_modules/react-navigation/flow/react-navigation.js
2828
flow-typed/.*
@@ -35,9 +35,9 @@ esproposal.nullish_coalescing=enable
3535

3636
munge_underscores=true
3737

38-
module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
38+
3939
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
40-
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
40+
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
4141
# Support the library import in examples
4242
module.name_mapper='^\@react-native-community/viewpager$' -> '<PROJECT_ROOT>/js/index.js'
4343

@@ -81,4 +81,4 @@ untyped-import
8181
untyped-type-import
8282

8383
[version]
84-
^0.105.0
84+
^0.113.0

‎example/android/app/build.gradle‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ import com.android.build.OutputFile
7676
*/
7777

7878
project.ext.react = [
79-
entryFile: "index.js",
8079
enableHermes: true, // clean and rebuild if changing
8180
]
8281

@@ -162,6 +161,13 @@ android {
162161
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
163162
}
164163
}
164+
packagingOptions {
165+
pickFirst "lib/armeabi-v7a/libc++_shared.so"
166+
pickFirst "lib/arm64-v8a/libc++_shared.so"
167+
pickFirst "lib/x86/libc++_shared.so"
168+
pickFirst "lib/x86_64/libc++_shared.so"
169+
}
170+
165171
// applicationVariants are e.g. debug, release
166172
applicationVariants.all { variant ->
167173
variant.outputs.each { output ->
@@ -181,8 +187,20 @@ android {
181187
dependencies {
182188
implementation fileTree(dir: "libs", include: ["*.jar"])
183189
implementation "androidx.appcompat:appcompat:${rootProject.ext.appCompatVersion}"
190+
//noinspection GradleDynamicVersion
184191
implementation "com.facebook.react:react-native:+" // From node_modules
185192
implementation project(':react-native-viewpager')
193+
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
194+
195+
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
196+
exclude group:'com.facebook.fbjni'
197+
}
198+
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
199+
exclude group:'com.facebook.flipper'
200+
}
201+
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
202+
exclude group:'com.facebook.flipper'
203+
}
186204

187205
if (enableHermes) {
188206
def hermesPath = "../../../node_modules/hermes-engine/android/";

‎example/android/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
<activity
1414
android:name="com.reactnativecommunity.viewpager.example.MainActivity"
1515
android:label="@string/app_name"
16-
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
16+
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
17+
android:launchMode="singleTask"
1718
android:windowSoftInputMode="adjustResize">
1819
<intent-filter>
1920
<action android:name="android.intent.action.MAIN" />

‎example/android/app/src/main/java/com/reactnativecommunity/viewpager/example/MainApplication.java‎

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import android.app.Application;
44
import android.content.Context;
5+
56
import com.facebook.react.PackageList;
67
import com.facebook.react.ReactApplication;
8+
import com.facebook.react.ReactInstanceManager;
79
import com.facebook.react.ReactNativeHost;
810
import com.facebook.react.ReactPackage;
911
import com.facebook.soloader.SoLoader;
@@ -14,64 +16,66 @@
1416

1517
public class MainApplication extends Application implements ReactApplication {
1618

17-
private final ReactNativeHost mReactNativeHost =
18-
new ReactNativeHost(this) {
19-
@Override
20-
public boolean getUseDeveloperSupport() {
21-
return BuildConfig.DEBUG;
22-
}
19+
private final ReactNativeHost mReactNativeHost =
20+
new ReactNativeHost(this) {
21+
@Override
22+
public boolean getUseDeveloperSupport() {
23+
return BuildConfig.DEBUG;
24+
}
2325

24-
@Override
25-
protected List<ReactPackage> getPackages() {
26-
@SuppressWarnings("UnnecessaryLocalVariable")
27-
List<ReactPackage> packages = new PackageList(this).getPackages();
28-
// Packages that cannot be autolinked yet can be added manually here, for example:
29-
// packages.add(new MyReactNativePackage());\
30-
packages.add(new RNCViewPagerPackage());
31-
return packages;
32-
}
26+
@Override
27+
protected List<ReactPackage> getPackages() {
28+
@SuppressWarnings("UnnecessaryLocalVariable")
29+
List<ReactPackage> packages = new PackageList(this).getPackages();
30+
// Packages that cannot be autolinked yet can be added manually here, for example:
31+
// packages.add(new MyReactNativePackage());\
32+
packages.add(new RNCViewPagerPackage());
33+
return packages;
34+
}
3335

34-
@Override
35-
protected String getJSMainModuleName() {
36-
return "example/index";
37-
}
38-
};
36+
@Override
37+
protected String getJSMainModuleName() {
38+
return "example/index";
39+
}
40+
};
3941

40-
@Override
41-
public ReactNativeHost getReactNativeHost() {
42-
return mReactNativeHost;
43-
}
42+
@Override
43+
public ReactNativeHost getReactNativeHost() {
44+
return mReactNativeHost;
45+
}
4446

45-
@Override
46-
public void onCreate() {
47-
super.onCreate();
48-
SoLoader.init(this, /* native exopackage */ false);
49-
initializeFlipper(this); // Remove this line if you don't want Flipper enabled
50-
}
47+
@Override
48+
public void onCreate() {
49+
super.onCreate();
50+
SoLoader.init(this, /* native exopackage */ false);
51+
initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
52+
}
5153

52-
/**
53-
* Loads Flipper in React Native templates.
54-
*
55-
* @param context
56-
*/
57-
private static void initializeFlipper(Context context) {
58-
if (BuildConfig.DEBUG) {
59-
try {
54+
/**
55+
* Loads Flipper in React Native templates.
56+
*
57+
* @param context
58+
*/
59+
private static void initializeFlipper(
60+
Context context, ReactInstanceManager reactInstanceManager) {
61+
if (BuildConfig.DEBUG) {
62+
try {
6063
/*
6164
We use reflection here to pick up the class that initializes Flipper,
6265
since Flipper library is not available in release mode
6366
*/
64-
Class<?> aClass = Class.forName("com.facebook.flipper.ReactNativeFlipper");
65-
aClass.getMethod("initializeFlipper", Context.class).invoke(null, context);
66-
} catch (ClassNotFoundException e) {
67-
e.printStackTrace();
68-
} catch (NoSuchMethodException e) {
69-
e.printStackTrace();
70-
} catch (IllegalAccessException e) {
71-
e.printStackTrace();
72-
} catch (InvocationTargetException e) {
73-
e.printStackTrace();
74-
}
67+
Class<?> aClass = Class.forName("com.reactnativecommunity.viewpager.example.ReactNativeFlipper");
68+
aClass.getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
69+
.invoke(null, context, reactInstanceManager);
70+
} catch (ClassNotFoundException e) {
71+
e.printStackTrace();
72+
} catch (NoSuchMethodException e) {
73+
e.printStackTrace();
74+
} catch (IllegalAccessException e) {
75+
e.printStackTrace();
76+
} catch (InvocationTargetException e) {
77+
e.printStackTrace();
78+
}
79+
}
7580
}
76-
}
7781
}

‎example/android/app/src/main/java/com/reactnativecommunity/viewpager/example/ReactNativeFlipper.java‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*
4+
* <p>This source code is licensed under the MIT license found in the LICENSE file in the root
5+
* directory of this source tree.
6+
*/
7+
package com.reactnativecommunity.viewpager.example;
8+
9+
import android.content.Context;
10+
import com.facebook.flipper.android.AndroidFlipperClient;
11+
import com.facebook.flipper.android.utils.FlipperUtils;
12+
import com.facebook.flipper.core.FlipperClient;
13+
import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
14+
import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
15+
import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
16+
import com.facebook.flipper.plugins.inspector.DescriptorMapping;
17+
import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
18+
import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
19+
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
20+
import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
21+
import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
22+
import com.facebook.react.ReactInstanceManager;
23+
import com.facebook.react.bridge.ReactContext;
24+
import com.facebook.react.modules.network.NetworkingModule;
25+
import okhttp3.OkHttpClient;
26+
27+
public class ReactNativeFlipper {
28+
public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
29+
if (FlipperUtils.shouldEnableFlipper(context)) {
30+
final FlipperClient client = AndroidFlipperClient.getInstance(context);
31+
32+
client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
33+
client.addPlugin(new ReactFlipperPlugin());
34+
client.addPlugin(new DatabasesFlipperPlugin(context));
35+
client.addPlugin(new SharedPreferencesFlipperPlugin(context));
36+
client.addPlugin(CrashReporterPlugin.getInstance());
37+
38+
NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
39+
NetworkingModule.setCustomClientBuilder(
40+
builder -> builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin)));
41+
client.addPlugin(networkFlipperPlugin);
42+
client.start();
43+
44+
// Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
45+
// Hence we run if after all native modules have been initialized
46+
ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
47+
if (reactContext == null) {
48+
reactInstanceManager.addReactInstanceEventListener(
49+
new ReactInstanceManager.ReactInstanceEventListener() {
50+
@Override
51+
public void onReactContextInitialized(ReactContext reactContext) {
52+
reactInstanceManager.removeReactInstanceEventListener(this);
53+
reactContext.runOnNativeModulesQueueThread(
54+
new Runnable() {
55+
@Override
56+
public void run() {
57+
client.addPlugin(new FrescoFlipperPlugin());
58+
}
59+
});
60+
}
61+
});
62+
} else {
63+
client.addPlugin(new FrescoFlipperPlugin());
64+
}
65+
}
66+
}
67+
}

‎example/android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
jcenter()
1414
}
1515
dependencies {
16-
classpath("com.android.tools.build:gradle:3.4.2")
16+
classpath("com.android.tools.build:gradle:3.5.2")
1717

1818
// NOTE: Do not place your application dependencies here; they belong
1919
// in the individual module build.gradle files
@@ -34,6 +34,6 @@ allprojects {
3434

3535
google()
3636
jcenter()
37-
maven { url 'https://jitpack.io' }
37+
maven { url 'https://www.jitpack.io' }
3838
}
3939
}

‎example/android/gradle.properties‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,12 @@
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
1919

20+
# AndroidX package structure to make it clearer which packages are bundled with the
21+
# Android operating system, and which are packaged with your app's APK
22+
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2023
android.useAndroidX=true
24+
# Automatically convert third-party libraries to use AndroidX
2125
android.enableJetifier=true
26+
27+
# Version of flipper SDK to use with React Native
28+
FLIPPER_VERSION=0.33.1

‎example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎example/android/gradlew‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ if $darwin; then
125125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126126
fi
127127

128-
# For Cygwin, switch paths to Windows format before running java
129-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132132
JAVACMD=`cygpath --unix "$JAVACMD"`

‎example/index.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
/* @flow */
1+
/*
2+
*
3+
* @format
4+
*/
25

36
import React from 'react';
47
import {AppRegistry} from 'react-native';

0 commit comments

Comments
 (0)