Merge branch 'master' into issue/3258

* master: Examples: move to its own folder (#3288) # Conflicts: # examples/react-native/Example.js
aksonov · Sep 21, 2018 · 14d773f · 14d773f
2 parents 4e3d11b + e789438
commit 14d773f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 
 ___
 
-* [Example](#try-the-example-app)
+* [Examples](#try-the-example-apps)
 * [Motivation](https://gist.github.com/aksonov/e2d7454421e44b1c4c72214d14053410)
 * [v4 Features](#v4-features)
 * [API](/docs/API.md)
@@ -51,22 +51,20 @@ Actions.refresh({param1: 'hello', param2: 'world'})
 
 For a full listing of the API, [view the API docs](https://github.com/aksonov/react-native-router-flux/blob/master/docs/API.md).
 
-## Try the [example app](https://github.com/aksonov/react-native-router-flux/tree/master/Example)
+## Try the [example apps](https://github.com/aksonov/react-native-router-flux/tree/master/examples)
 
 ![rnrf](https://user-images.githubusercontent.com/3681859/27937441-ef61d932-626b-11e7-885f-1db7dc74b32e.gif)
 
 ```bash
 # Get the code
 git clone https://github.com/aksonov/react-native-router-flux.git
-cd react-native-router-flux/Example
+cd react-native-router-flux/examples/[expo|react-native|redux]
 
 # Installing dependencies
 yarn
-or
-npm i
 
 # Run it
-react-native run-ios
+yarn start
 ```
 
 ## v4 Features

diff --git a/examples/react-native/Example.js b/examples/react-native/Example.js
@@ -56,7 +56,10 @@ const getSceneStyle = () => ({
 // on Android, the URI prefix typically contains a host in addition to scheme
 const prefix = Platform.OS === 'android' ? 'mychat://mychat/' : 'mychat://';
 
-const transitionConfig = () => ({ screenInterpolator: StackViewStyleInterpolator.CardStackStyleInterpolator.forFadeFromBottomAndroid });
+const transitionConfig = () => ({
+  screenInterpolator:
+    StackViewStyleInterpolator.forFadeFromBottomAndroid,
+});
 
 const Example = () => (
   <Router createReducer={reducerCreate} onStateChange={stateHandler} getSceneStyle={getSceneStyle} uriPrefix={prefix}>

diff --git a/packages/react-native-router-flux-cli/index.js b/packages/react-native-router-flux-cli/index.js
@@ -11,8 +11,6 @@ const commands = {
   dedup: function () {
     const blacklisted = [
       'node_modules/react-native-router-flux/node_modules',
-      'node_modules/react-native-router-flux/Example',
-      'node_modules/react-native-router-flux/ReduxExample',
       'node_modules/react-native-router-flux/examples'
     ];