merged

playground/e2e/app.test.js.orig

@@ -0,0 +1,62 @@
+describe('app', () => {
+  beforeEach((done) => {
+    global.simulator.relaunchApp(done);
+  });
+
+  it('shows welcome screen', () => {
+    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  });
+
+  it('switch to tab based app, passProps and functions', () => {
+    elementByLabel('Switch to tab based app').tap();
+    expect(elementByLabel('This is tab 1')).toBeVisible();
+    expect(elementByLabel('Hello from a function!')).toBeVisible();
+  });
+
+  it('push screen', () => {
+    elementByLabel('Push').tap();
+    expect(elementByLabel('Pushed screen')).toBeVisible();
+  });
+
+  it('switch to tabs with side menus', () => {
+    elementByLabel('Switch to app with side menus').tap();
+    elementByLabel('This is a side menu center screen').swipe('right');
+    expect(elementByLabel('This is a side menu screen')).toBeVisible();
+  });
+
+  it('screen lifecycle', () => {
+    elementByLabel('Switch to lifecycle screen').tap();
+    expect(elementByLabel('onStart!')).toBeVisible();
+    elementByLabel('Push to test onStop').tap();
+    expect(elementByLabel('Alert')).toBeVisible();
+    expect(elementByLabel('onStop!')).toBeVisible();
+  });
+
+  it('pop screen', () => {
+    elementByLabel('Push').tap();
+    expect(elementByLabel('Pushed screen')).toBeVisible();
+    elementByLabel('Pop').tap();
+    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  });
+<<<<<<< HEAD
+  
+});
+
+describe('reload app', () => {
+  before(function (done) {
+    simulator.reloadReactNativeApp(done);
+  });
+  it('shows welcome screen', () => {
+    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+=======
+
+  xit('show modal', () => {
+    elementByLabel('Show Modal').tap();
+    expect(elementByLabel('Modal screen')).toBeVisible();
+>>>>>>> 886672b24c98bd44fe235b9f4a5084da85b45d8d
+  });
+});
+
+function elementByLabel(label) {
+  return element(by.label(label));
+}

playground/src/containers/WelcomeScreen.js.orig

@@ -0,0 +1,148 @@
+import React, { Component } from 'react';
+import { View, Text, Button } from 'react-native';
+
+import Navigation from 'react-native-navigation';
+
+class WelcomeScreen extends Component {
+  constructor(props) {
+    super(props);
+    this.onClickPush = this.onClickPush.bind(this);
+    this.onShowModal = this.onShowModal.bind(this);
+  }
+
+  render() {
+    return (
+      <View style={styles.root}>
+        <Text style={styles.h1}>{`React Native Navigation!`}</Text>
+        <Button title="Switch to tab based app" onPress={this.onClickSwitchToTabs} />
+        <Button title="Switch to app with side menus" onPress={this.onClickSwitchToSideMenus} />
+        <Button title="Switch to lifecycle screen" onPress={this.onClickLifecycleScreen} />
+        <Button title="Push" onPress={this.onClickPush} />
+<<<<<<< HEAD
+        <Button title="Show Modal" onPress={this.onClickPush} />
+=======
+        <Button title="Show Modal" onPress={this.onClickShowModal} />
+>>>>>>> 886672b24c98bd44fe235b9f4a5084da85b45d8d
+        <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
+      </View>
+    );
+  }
+
+  onClickSwitchToTabs() {
+    Navigation.setRoot({
+      tabs: [
+        {
+          container: {
+            name: 'navigation.playground.SimpleScreen',
+            passProps: {
+              text: 'This is tab 1',
+              myFunction: () => 'Hello from a function!'
+            }
+          }
+        },
+        {
+          container: {
+            name: 'navigation.playground.SimpleScreen',
+            passProps: {
+              text: 'This is tab 2'
+            }
+          }
+        }
+      ]
+    });
+  }
+
+  onClickSwitchToSideMenus() {
+    Navigation.setRoot({
+      tabs: [
+        {
+          container: {
+            name: 'navigation.playground.SimpleScreen',
+            passProps: {
+              text: 'This is a side menu center screen'
+            }
+          }
+        },
+        {
+          container: {
+            name: 'navigation.playground.SimpleScreen'
+          }
+        },
+        {
+          container: {
+            name: 'navigation.playground.SimpleScreen'
+          }
+        }
+      ],
+      sideMenu: {
+        left: {
+          container: {
+            name: 'navigation.playground.SimpleScreen',
+            passProps: {
+              text: 'This is a side menu screen'
+            }
+          }
+        },
+        right: {
+          container: {
+            name: 'navigation.playground.SimpleScreen'
+          }
+        }
+      }
+    });
+  }
+
+  onClickPush() {
+    Navigation.on(this.props.id).push({
+      name: 'navigation.playground.SimpleScreen',
+      passProps: {
+        text: 'Pushed screen',
+        stackPosition: 1
+      }
+    });
+  }
+
+  onClickLifecycleScreen() {
+    Navigation.setRoot({
+      container: {
+        name: 'navigation.playground.LifecycleScreen'
+      }
+    });
+  }
+<<<<<<< HEAD
+  
+  onShowModal() {
+    Navigation.on(this.props.id).show
+=======
+
+  onClickShowModal() {
+    Navigation.showModal({
+      name: 'navigation.playground.SimpleScreen',
+      passProps: {
+        text: 'Modal screen'
+      }
+    });
+>>>>>>> 886672b24c98bd44fe235b9f4a5084da85b45d8d
+  }
+}
+
+export default WelcomeScreen;
+
+const styles = {
+  root: {
+    flexGrow: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#f5fcff'
+  },
+  h1: {
+    fontSize: 24,
+    textAlign: 'center',
+    margin: 30
+  },
+  footer: {
+    fontSize: 10,
+    color: '#888',
+    marginTop: 80
+  }
+};