From 499e34a83ae3933a8ea0a5fc2f6c3e89295d751c Mon Sep 17 00:00:00 2001
From: Vincent den Boer <vincent@shishkabab.net>
Date: Fri, 7 Jun 2019 12:21:25 +0200
Subject: [PATCH 1/6] Start of navigation integration

---
 app/android/app/build.gradle                  |   1 +
 .../src/main/java/com/app/MainActivity.java   |  13 ++
 .../main/java/com/app/MainApplication.java    |   4 +-
 app/android/settings.gradle                   |   2 +
 app/ios/app.xcodeproj/project.pbxproj         |  28 ++++
 app/package.json                              |   2 +
 .../example/ui/screens/home-screen/index.tsx  |   6 +-
 .../example/ui/screens/other-screen/index.tsx |  22 +++
 .../ui/screens/other-screen/logic.test.ts     |   0
 .../example/ui/screens/other-screen/logic.ts  |  22 +++
 .../example/ui/screens/other-screen/styles.ts |  20 +++
 app/src/services/index.ts                     |   4 +-
 app/src/services/navigation/react-native.ts   |  24 ++++
 app/src/services/navigation/types.ts          |   3 +
 app/src/services/types.ts                     |   2 +
 app/src/ui/index.tsx                          |  15 +-
 app/src/ui/navigator.ts                       |  17 +++
 app/tsconfig.json                             |   2 +-
 app/yarn.lock                                 | 134 +++++++++++++++++-
 19 files changed, 313 insertions(+), 8 deletions(-)
 create mode 100644 app/src/features/example/ui/screens/other-screen/index.tsx
 create mode 100644 app/src/features/example/ui/screens/other-screen/logic.test.ts
 create mode 100644 app/src/features/example/ui/screens/other-screen/logic.ts
 create mode 100644 app/src/features/example/ui/screens/other-screen/styles.ts
 create mode 100644 app/src/services/navigation/react-native.ts
 create mode 100644 app/src/services/navigation/types.ts
 create mode 100644 app/src/ui/navigator.ts

diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
index f9d387f91..77ab1f564 100644
--- a/app/android/app/build.gradle
+++ b/app/android/app/build.gradle
@@ -138,6 +138,7 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-gesture-handler')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     implementation "com.facebook.react:react-native:+"  // From node_modules
diff --git a/app/android/app/src/main/java/com/app/MainActivity.java b/app/android/app/src/main/java/com/app/MainActivity.java
index 0f886891e..3e5613c50 100644
--- a/app/android/app/src/main/java/com/app/MainActivity.java
+++ b/app/android/app/src/main/java/com/app/MainActivity.java
@@ -1,6 +1,9 @@
 package com.app;
 
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 
 public class MainActivity extends ReactActivity {
 
@@ -12,4 +15,14 @@ public class MainActivity extends ReactActivity {
     protected String getMainComponentName() {
         return "app";
     }
+
+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+        return new ReactActivityDelegate(this, getMainComponentName()) {
+            @Override
+            protected ReactRootView createRootView() {
+                return new RNGestureHandlerEnabledRootView(MainActivity.this);
+            }
+        };
+    }
 }
diff --git a/app/android/app/src/main/java/com/app/MainApplication.java b/app/android/app/src/main/java/com/app/MainApplication.java
index b30b4eff3..a84b85f6d 100644
--- a/app/android/app/src/main/java/com/app/MainApplication.java
+++ b/app/android/app/src/main/java/com/app/MainApplication.java
@@ -3,6 +3,7 @@
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
+import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
@@ -25,7 +26,8 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
         new SQLitePluginPackage(),   // register SQLite Plugin here
-        new MainReactPackage()
+        new MainReactPackage(),
+            new RNGestureHandlerPackage()
       );
     }
 
diff --git a/app/android/settings.gradle b/app/android/settings.gradle
index 7ab18bf24..8bc59e3e3 100644
--- a/app/android/settings.gradle
+++ b/app/android/settings.gradle
@@ -1,4 +1,6 @@
 rootProject.name = 'app'
+include ':react-native-gesture-handler'
+project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
 
 include ':app'
 
diff --git a/app/ios/app.xcodeproj/project.pbxproj b/app/ios/app.xcodeproj/project.pbxproj
index bdb153313..f38cefe53 100644
--- a/app/ios/app.xcodeproj/project.pbxproj
+++ b/app/ios/app.xcodeproj/project.pbxproj
@@ -40,6 +40,8 @@
 		ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
 		ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2971642150620600B7C4FE /* JavaScriptCore.framework */; };
 		999492CD9D124478849E5D8D /* libSQLite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78A893EFA88441FF9E6C3C8B /* libSQLite.a */; };
+		0393502E386B47F0BE5B5B6A /* libRNGestureHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B71D08F94C3A47F88AC38E2F /* libRNGestureHandler.a */; };
+		DF41734314674576882027C9 /* libRNGestureHandler-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C4037B6869D945759F8293FD /* libRNGestureHandler-tvOS.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -349,6 +351,9 @@
 		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
 		C84920786E2F47CCAA6497C4 /* SQLite.xcodeproj */ = {isa = PBXFileReference; name = "SQLite.xcodeproj"; path = "../node_modules/react-native-sqlite-storage/src/ios/SQLite.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
 		78A893EFA88441FF9E6C3C8B /* libSQLite.a */ = {isa = PBXFileReference; name = "libSQLite.a"; path = "libSQLite.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
+		75ADCF7C797A43A0B971753F /* RNGestureHandler.xcodeproj */ = {isa = PBXFileReference; name = "RNGestureHandler.xcodeproj"; path = "../node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
+		B71D08F94C3A47F88AC38E2F /* libRNGestureHandler.a */ = {isa = PBXFileReference; name = "libRNGestureHandler.a"; path = "libRNGestureHandler.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
+		C4037B6869D945759F8293FD /* libRNGestureHandler-tvOS.a */ = {isa = PBXFileReference; name = "libRNGestureHandler-tvOS.a"; path = "libRNGestureHandler-tvOS.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -378,6 +383,7 @@
 				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
 				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
 				999492CD9D124478849E5D8D /* libSQLite.a in Frameworks */,
+				0393502E386B47F0BE5B5B6A /* libRNGestureHandler.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -394,6 +400,7 @@
 				2D02E4C61E0B4AEC006451C7 /* libRCTSettings-tvOS.a in Frameworks */,
 				2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */,
 				2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */,
+				DF41734314674576882027C9 /* libRNGestureHandler-tvOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -568,6 +575,7 @@
 				00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
 				139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
 				C84920786E2F47CCAA6497C4 /* SQLite.xcodeproj */,
+				75ADCF7C797A43A0B971753F /* RNGestureHandler.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -1196,10 +1204,13 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios",
+					"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
 				);
 			};
 			name = Debug;
@@ -1222,10 +1233,13 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios",
+					"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
 				);
 			};
 			name = Release;
@@ -1249,6 +1263,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios",
+					"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
 				);
 			};
 			name = Debug;
@@ -1271,6 +1286,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios",
+					"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
 				);
 			};
 			name = Release;
@@ -1301,10 +1317,13 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios",
+					"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
 				);
 			};
 			name = Debug;
@@ -1335,10 +1354,13 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios",
+					"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
 				);
 			};
 			name = Release;
@@ -1368,10 +1390,13 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios",
+					"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
 				);
 			};
 			name = Debug;
@@ -1401,10 +1426,13 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-sqlite-storage/src/ios",
+					"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
 				);
 			};
 			name = Release;
diff --git a/app/package.json b/app/package.json
index 540a4e2a7..92fdf5a41 100644
--- a/app/package.json
+++ b/app/package.json
@@ -15,8 +15,10 @@
     "randombytes": "^2.1.0",
     "react": "16.8.3",
     "react-native": "0.59.8",
+    "react-native-gesture-handler": "^1.3.0",
     "react-native-knex": "^0.14.5",
     "react-native-sqlite-storage": "^3.3.10",
+    "react-navigation": "^3.11.0",
     "sqlite3": "^4.0.8",
     "typeorm": "^0.2.17",
     "ui-logic-core": "^0.1.1",
diff --git a/app/src/features/example/ui/screens/home-screen/index.tsx b/app/src/features/example/ui/screens/home-screen/index.tsx
index b340059e4..281d86294 100644
--- a/app/src/features/example/ui/screens/home-screen/index.tsx
+++ b/app/src/features/example/ui/screens/home-screen/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text, View } from 'react-native';
+import { Text, View, Button } from 'react-native';
 import { StatefulUIElement } from 'src/ui/types'
 import Logic, { State, Event } from './logic';
 import styles from './styles'
@@ -17,6 +17,10 @@ export default class HomeScreen extends StatefulUIElement<Props, State, Event> {
           <View style={styles.container}>
             <Text style={styles.welcome}>Welcome to React Native!</Text>
             <Text style={styles.instructions}>To bla, just bla the bla</Text>
+            {/* <Button
+              title="Go to Details"
+              onPress={() => this.props.navigation.navigate('Details')}
+            /> */}
           </View>
         );
       }    
diff --git a/app/src/features/example/ui/screens/other-screen/index.tsx b/app/src/features/example/ui/screens/other-screen/index.tsx
new file mode 100644
index 000000000..d46fd6cb0
--- /dev/null
+++ b/app/src/features/example/ui/screens/other-screen/index.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { Text, View } from 'react-native';
+import { StatefulUIElement } from 'src/ui/types'
+import Logic, { State, Event } from './logic';
+import styles from './styles'
+
+interface Props {
+
+}
+export default class OtherScreen extends StatefulUIElement<Props, State, Event> {
+    constructor(props : Props) {
+        super(props, { logic: new Logic() })
+    }
+
+    render() {
+        return (
+          <View style={styles.container}>
+            <Text style={styles.welcome}>Nothing useful here, just another screen</Text>
+          </View>
+        );
+      }    
+}
diff --git a/app/src/features/example/ui/screens/other-screen/logic.test.ts b/app/src/features/example/ui/screens/other-screen/logic.test.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/src/features/example/ui/screens/other-screen/logic.ts b/app/src/features/example/ui/screens/other-screen/logic.ts
new file mode 100644
index 000000000..2a0674817
--- /dev/null
+++ b/app/src/features/example/ui/screens/other-screen/logic.ts
@@ -0,0 +1,22 @@
+import { UILogic, UIEvent, IncomingUIEvent, UIMutation } from "ui-logic-core"
+
+export interface State {
+    modified : boolean
+    text : string
+}
+export type Event = UIEvent<{
+    setText : { text : string }
+}>
+
+export default class Logic extends UILogic<State, Event> {
+    getInitialState() {
+        return {
+            modified: false,
+            text: 'Click me!'
+        }
+    }
+
+    setText(incoming : IncomingUIEvent<State, Event, 'setText'>) : UIMutation<State> {
+        return { modified: { $set: true }, text: { $set: incoming.event.text } }
+    }
+}
diff --git a/app/src/features/example/ui/screens/other-screen/styles.ts b/app/src/features/example/ui/screens/other-screen/styles.ts
new file mode 100644
index 000000000..b5cb1d6c0
--- /dev/null
+++ b/app/src/features/example/ui/screens/other-screen/styles.ts
@@ -0,0 +1,20 @@
+import {StyleSheet} from 'react-native';
+
+export default StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+        backgroundColor: '#F5FCFF',
+    },
+    welcome: {
+        fontSize: 20,
+        textAlign: 'center',
+        margin: 10,
+    },
+    instructions: {
+        textAlign: 'center',
+        color: '#333333',
+        marginBottom: 5,
+    },
+});
\ No newline at end of file
diff --git a/app/src/services/index.ts b/app/src/services/index.ts
index 051c857b6..7ef825222 100644
--- a/app/src/services/index.ts
+++ b/app/src/services/index.ts
@@ -1,11 +1,13 @@
 import { Services } from "./types";
 import { WorldBrainAuthService } from "./auth/wb-auth";
+import ReactNativeNavigationService from "./navigation/react-native";
 
 export interface CreateServicesOptions {
 }
 
 export async function createServices(options : CreateServicesOptions) : Promise<Services> {
     return {
-        auth: new WorldBrainAuthService()
+        auth: new WorldBrainAuthService(),
+        navigation: new ReactNativeNavigationService()
     }
 }
diff --git a/app/src/services/navigation/react-native.ts b/app/src/services/navigation/react-native.ts
new file mode 100644
index 000000000..b0c009825
--- /dev/null
+++ b/app/src/services/navigation/react-native.ts
@@ -0,0 +1,24 @@
+import { NavigationService } from "./types";
+import { NavigationContainerComponent, NavigationActions } from "react-navigation";
+
+export default class ReactNativeNavigationService implements NavigationService {
+    private navigationContainerComponent? : NavigationContainerComponent
+    
+    setNavigationContainerComponent(navigationContainerComponent : NavigationContainerComponent) {
+        this.navigationContainerComponent = navigationContainerComponent
+    }
+    
+    goTo(routeName : string) {
+        if (!this.navigationContainerComponent) {
+            throw new Error(`Tried to call NavigationService.goTo() before setting initializing React Navigation`)
+        }
+        
+        this.navigationContainerComponent.dispatch(
+            NavigationActions.navigate({
+                routeName,
+                params: {},
+            })
+        )
+    }
+}
+    
\ No newline at end of file
diff --git a/app/src/services/navigation/types.ts b/app/src/services/navigation/types.ts
new file mode 100644
index 000000000..a83722289
--- /dev/null
+++ b/app/src/services/navigation/types.ts
@@ -0,0 +1,3 @@
+export interface NavigationService {
+    goTo(screen : string) : void
+}
diff --git a/app/src/services/types.ts b/app/src/services/types.ts
index 9f09f36e5..0c1b3db12 100644
--- a/app/src/services/types.ts
+++ b/app/src/services/types.ts
@@ -1,5 +1,7 @@
 import { AuthService } from "./auth/types";
+import { NavigationService } from "./navigation/types";
 
 export interface Services {
     auth : AuthService
+    navigation : NavigationService
 }
diff --git a/app/src/ui/index.tsx b/app/src/ui/index.tsx
index 406522819..86aae9f37 100644
--- a/app/src/ui/index.tsx
+++ b/app/src/ui/index.tsx
@@ -1,4 +1,5 @@
 import {AppRegistry} from 'react-native'
+import { createAppContainer } from 'react-navigation';
 import {name as appName} from '../../app.json'
 
 import { Storage } from 'src/storage/types';
@@ -7,7 +8,12 @@ import { Services } from 'src/services/types';
 import React, { Component } from 'react';
 import { View, Text } from 'react-native';
 
+import AppNavigator from './navigator'
+
 import HomeScreen from 'src/features/example/ui/screens/home-screen'
+import ReactNativeNavigationService from 'src/services/navigation/react-native.js';
+
+const AppNavigatorContainer = createAppContainer(AppNavigator)
 
 export interface UIDependencies {
     storage : Storage
@@ -47,7 +53,14 @@ export class UI {
                     )
                 }
 
-                return <HomeScreen />
+                return <AppNavigatorContainer ref={topLevelNavigator => {
+                    if (!topLevelNavigator) {
+                        return
+                    }
+
+                    const navigationService = (this.state.dependencies!.services.navigation as ReactNativeNavigationService)
+                    navigationService.setNavigationContainerComponent(topLevelNavigator)
+                }} />
             }
         }
 
diff --git a/app/src/ui/navigator.ts b/app/src/ui/navigator.ts
new file mode 100644
index 000000000..a8fd7f538
--- /dev/null
+++ b/app/src/ui/navigator.ts
@@ -0,0 +1,17 @@
+import { createStackNavigator } from "react-navigation";
+import HomeScreen from "src/features/example/ui/screens/home-screen";
+import OtherScreen from "src/features/example/ui/screens/other-screen";
+
+export default createStackNavigator(
+    {
+        Home: {
+            screen: HomeScreen
+        },
+        Other: {
+            screen: OtherScreen
+        }
+    },
+    {
+        initialRouteName: "Home"
+    }
+)
diff --git a/app/tsconfig.json b/app/tsconfig.json
index 0e7278b0e..aa70f3ac1 100644
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -10,7 +10,7 @@
     "lib": ["es6"],
     "moduleResolution": "node",
     "noEmit": true,
-    "strict": false,
+    "strict": true,
     "target": "esnext",
     "resolveJsonModule": true,
     "paths": {
diff --git a/app/yarn.lock b/app/yarn.lock
index 163c20649..c0e7bea52 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -841,6 +841,25 @@
     xcode "^2.0.0"
     xmldoc "^0.4.0"
 
+"@react-navigation/core@~3.4.1":
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.4.2.tgz#bec563e94fde40fbab3730cdc97f22afbb2a1498"
+  integrity sha512-7G+iDzLSTeOUU4vVZeRZKJ+Bd7ds7ZxYNqZcB8i0KlBeQEQfR74Ounfu/p0KIEq2RiNnaE3QT7WVP3C87sebzw==
+  dependencies:
+    hoist-non-react-statics "^3.3.0"
+    path-to-regexp "^1.7.0"
+    query-string "^6.4.2"
+    react-is "^16.8.6"
+
+"@react-navigation/native@~3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.5.0.tgz#f5d16e0845ac26d1147d1caa481f18a00740e7ae"
+  integrity sha512-TmGOis++ejEXG3sqNJhCSKqB0/qLu3FQgDtO959qpqif36R/diR8SQwJqeSdofoEiK3CepdhFlTCeHdS1/+MsQ==
+  dependencies:
+    hoist-non-react-statics "^3.0.1"
+    react-native-safe-area-view "^0.14.1"
+    react-native-screens "^1.0.0 || ^1.0.0-alpha"
+
 "@types/babel__core@^7.1.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f"
@@ -2913,6 +2932,18 @@ highlight.js@^9.6.0:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.6.tgz#72d4d8d779ec066af9a17cb14360c3def0aa57c4"
   integrity sha512-zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ==
 
+hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
+  integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
+
+hoist-non-react-statics@^3.0.1, hoist-non-react-statics@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
+  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
+  dependencies:
+    react-is "^16.7.0"
+
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -3071,7 +3102,7 @@ interpret@^1.1.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
   integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
-invariant@^2.2.4:
+invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -3328,6 +3359,11 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -5190,6 +5226,13 @@ path-root@^0.1.1:
   dependencies:
     path-root-regex "^0.1.0"
 
+path-to-regexp@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=
+  dependencies:
+    isarray "0.0.1"
+
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
@@ -5370,7 +5413,7 @@ prompts@^2.0.1:
     kleur "^3.0.2"
     sisteransi "^1.0.0"
 
-prop-types@^15.5.8, prop-types@^15.6.2:
+prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.1, prop-types@^15.6.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -5422,6 +5465,15 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
+query-string@^6.4.2:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.6.0.tgz#a6b7dfd57ad67e346b143d033df2b1e4cfb6b53a"
+  integrity sha512-Xhvaa80rZzfvI7gYXF6ism5otKTyea90XROstBTBKiWE/tDfnIDbQwkGLguJaQBNweVCW4T9DoTe5eyox0CbZQ==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    split-on-first "^1.0.0"
+    strict-uri-encode "^2.0.0"
+
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
@@ -5481,11 +5533,25 @@ react-devtools-core@^3.6.0:
     shell-quote "^1.6.1"
     ws "^3.3.1"
 
-react-is@^16.8.1, react-is@^16.8.3, react-is@^16.8.4:
+react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.3, react-is@^16.8.4, react-is@^16.8.6:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
   integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
 
+react-lifecycles-compat@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
+  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
+
+react-native-gesture-handler@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.3.0.tgz#d0386f565928ccc1849537f03f2e37fd5f6ad43f"
+  integrity sha512-ASRFIXBuKRvqlmwkWJhV8yP2dTpvcqVrLNpd7FKVBFHYWr6SAxjGyO9Ik8w1lAxDhMlRP2IcJ9p9eq5X2WWeLQ==
+  dependencies:
+    hoist-non-react-statics "^2.3.1"
+    invariant "^2.2.2"
+    prop-types "^15.5.10"
+
 react-native-knex@^0.14.5:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/react-native-knex/-/react-native-knex-0.14.5.tgz#aba6a18f9121c0b0545264b8cd1bcc390ffb2549"
@@ -5513,6 +5579,18 @@ react-native-knex@^0.14.5:
     uuid "^3.2.1"
     v8flags "^3.0.1"
 
+react-native-safe-area-view@^0.14.1:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.5.tgz#eeded66bbeb0807f0a7f5f449e7fb2871f7ecf76"
+  integrity sha512-1NxWK1G0gzwCOuyNV/zf4n18s6FWsiqgwkzU3P9C0Iu8AErjhstK1jUqpRwzLH8+/7hGLsrQedmn+ZbQTOrJPg==
+  dependencies:
+    hoist-non-react-statics "^2.3.1"
+
+"react-native-screens@^1.0.0 || ^1.0.0-alpha":
+  version "1.0.0-alpha.22"
+  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.22.tgz#7a120377b52aa9bbb94d0b8541a014026be9289b"
+  integrity sha512-kSyAt0AeVU6N7ZonfV6dP6iZF8B7Bce+tk3eujXhzBGsLg0VSLnU7uE9VqJF0xdQrHR91ZjGgVMieo/8df9KTA==
+
 react-native-sqlite-storage@^3.3.10:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/react-native-sqlite-storage/-/react-native-sqlite-storage-3.3.10.tgz#b331de4ba61ec1f6223d28da4baff533bf4004cf"
@@ -5520,6 +5598,13 @@ react-native-sqlite-storage@^3.3.10:
   dependencies:
     xcode "0.8.9"
 
+react-native-tab-view@^1.2.0, react-native-tab-view@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.4.1.tgz#f113cd87485808f0c991abec937f70fa380478b9"
+  integrity sha512-Bke8KkDcDhvB/z0AS7MnQKMD2p6Kwfc1rSKlMOvg9CC5CnClQ2QEnhPSbwegKDYhUkBI92iH/BYy7hNSm5kbUQ==
+  dependencies:
+    prop-types "^15.6.1"
+
 react-native@0.59.8:
   version "0.59.8"
   resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.59.8.tgz#ade4141c777c60f5ec4889d9811d0f80a9d56547"
@@ -5576,6 +5661,39 @@ react-native@0.59.8:
     xmldoc "^0.4.0"
     yargs "^9.0.0"
 
+react-navigation-drawer@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-1.2.1.tgz#7bd5efeee7d2f611d3ebb0933e0c8e8eb7cafe52"
+  integrity sha512-T2kaBjY2c4/3I6noWFnaf/c18ntNH5DsST38i+pdc2NPxn5Yi5lkK+ZZTeKuHSFD4a7G0jWY9OGf1iRkHWLMAQ==
+  dependencies:
+    react-native-tab-view "^1.2.0"
+
+react-navigation-stack@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.4.0.tgz#69cdb029ea4ee5877d7e933b3117dc90bc841eb2"
+  integrity sha512-zEe9wCA0Ot8agarYb//0nSWYW1GM+1R0tY/nydUV0EizeJ27At0EklYVWvYEuYU6C48va6cu8OPL7QD/CcJACw==
+
+react-navigation-tabs@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-1.1.4.tgz#00a312250df3c519c60b7815a523ace5ee11163a"
+  integrity sha512-py2hLCRxPwXOzmY1W9XcY1rWXxdK6RGW/aXh56G9gIf8cpHNDhy/bJV4e46/JrVcse3ybFaN0liT09/DM/NdwQ==
+  dependencies:
+    hoist-non-react-statics "^2.5.0"
+    prop-types "^15.6.1"
+    react-lifecycles-compat "^3.0.4"
+    react-native-tab-view "^1.4.1"
+
+react-navigation@^3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-3.11.0.tgz#2c82217c452d07d8b9b0929bc7e77e2bcfaf9388"
+  integrity sha512-wlPcDtNiIdPeYxNQ/MN4arY5Xe9EphD2QVpRuvvuPWW+BamF3AJaIy060r3Yz59DODAoWllscabat/yqnih8Tg==
+  dependencies:
+    "@react-navigation/core" "~3.4.1"
+    "@react-navigation/native" "~3.5.0"
+    react-navigation-drawer "~1.2.1"
+    react-navigation-stack "~1.4.0"
+    react-navigation-tabs "~1.1.4"
+
 react-proxy@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-1.1.8.tgz#9dbfd9d927528c3aa9f444e4558c37830ab8c26a"
@@ -6281,6 +6399,11 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
   integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
 
+split-on-first@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
+  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -6357,6 +6480,11 @@ stream-buffers@~2.2.0:
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
   integrity sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=
 
+strict-uri-encode@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
+  integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
+
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"

From faeeef6b31077b11b6ff767e52b53981f4a93a0a Mon Sep 17 00:00:00 2001
From: Vincent den Boer <vincent@shishkabab.net>
Date: Fri, 7 Jun 2019 12:47:27 +0200
Subject: [PATCH 2/6] Successful navigation test

---
 .../example/ui/screens/home-screen/index.tsx  | 23 +++++++++++--------
 app/src/services/navigation/react-native.ts   | 16 ++++++++-----
 app/src/storage/index.ts                      |  8 +++----
 app/src/ui/index.tsx                          | 13 +++++++----
 app/src/ui/navigator.ts                       | 15 +++++++++---
 5 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/app/src/features/example/ui/screens/home-screen/index.tsx b/app/src/features/example/ui/screens/home-screen/index.tsx
index 281d86294..b294e70b4 100644
--- a/app/src/features/example/ui/screens/home-screen/index.tsx
+++ b/app/src/features/example/ui/screens/home-screen/index.tsx
@@ -3,9 +3,10 @@ import { Text, View, Button } from 'react-native';
 import { StatefulUIElement } from 'src/ui/types'
 import Logic, { State, Event } from './logic';
 import styles from './styles'
+import { Services } from 'src/services/types';
 
 interface Props {
-
+    services : Pick<Services, 'navigation'>
 }
 export default class HomeScreen extends StatefulUIElement<Props, State, Event> {
     constructor(props : Props) {
@@ -13,15 +14,17 @@ export default class HomeScreen extends StatefulUIElement<Props, State, Event> {
     }
 
     render() {
+        console.log(this.props)
+
         return (
-          <View style={styles.container}>
-            <Text style={styles.welcome}>Welcome to React Native!</Text>
-            <Text style={styles.instructions}>To bla, just bla the bla</Text>
-            {/* <Button
-              title="Go to Details"
-              onPress={() => this.props.navigation.navigate('Details')}
-            /> */}
-          </View>
+            <View style={styles.container}>
+                <Text style={styles.welcome}>Welcome to React Native!</Text>
+                <Text style={styles.instructions}>To bla, just bla the bla</Text>
+                <Button
+                    title="Go to another screen"
+                    onPress={() => this.props.services.navigation.goTo('Other')}
+                />
+            </View>
         );
-      }    
+    }
 }
diff --git a/app/src/services/navigation/react-native.ts b/app/src/services/navigation/react-native.ts
index b0c009825..5ef46e534 100644
--- a/app/src/services/navigation/react-native.ts
+++ b/app/src/services/navigation/react-native.ts
@@ -1,19 +1,23 @@
 import { NavigationService } from "./types";
 import { NavigationContainerComponent, NavigationActions } from "react-navigation";
 
+export interface ReactNativeNavigationServiceDependencies {
+    navigationContainerComponent : NavigationContainerComponent
+}
+
 export default class ReactNativeNavigationService implements NavigationService {
-    private navigationContainerComponent? : NavigationContainerComponent
+    private dependencies? : ReactNativeNavigationServiceDependencies
     
-    setNavigationContainerComponent(navigationContainerComponent : NavigationContainerComponent) {
-        this.navigationContainerComponent = navigationContainerComponent
+    setDependencies(dependencies : ReactNativeNavigationServiceDependencies) {
+        this.dependencies = dependencies
     }
     
     goTo(routeName : string) {
-        if (!this.navigationContainerComponent) {
-            throw new Error(`Tried to call NavigationService.goTo() before setting initializing React Navigation`)
+        if (!this.dependencies) {
+            throw new Error(`Tried to call NavigationService.goTo() before injecting service dependencies`)
         }
         
-        this.navigationContainerComponent.dispatch(
+        this.dependencies.navigationContainerComponent.dispatch(
             NavigationActions.navigate({
                 routeName,
                 params: {},
diff --git a/app/src/storage/index.ts b/app/src/storage/index.ts
index 720c4e8b4..8f9bff63c 100644
--- a/app/src/storage/index.ts
+++ b/app/src/storage/index.ts
@@ -20,13 +20,13 @@ export async function createStorage(options : CreateStorageOptions) : Promise<St
     registerModuleMapCollections(storageManager.registry, modules as any)
     await storageManager.finishInitialization()
 
-    await backend.connection.dropDatabase()
-    if (!(await backend.connection.createQueryRunner().getDatabases()).includes(options.dbName)) {
+    await backend.connection!.dropDatabase()
+    if (!(await backend.connection!.createQueryRunner().getDatabases()).includes(options.dbName)) {
         await storageManager.backend.migrate()
     }
 
-    const list = await modules.todoList.getOrCreateDefaultList({ defaultLabel: 'Default list' })
-    console.log('Default list', list)
+    // const list = await modules.todoList.getOrCreateDefaultList({ defaultLabel: 'Default list' })
+    // console.log('Default list', list)
 
     return {
         manager: storageManager,
diff --git a/app/src/ui/index.tsx b/app/src/ui/index.tsx
index 86aae9f37..f72df7038 100644
--- a/app/src/ui/index.tsx
+++ b/app/src/ui/index.tsx
@@ -13,8 +13,6 @@ import AppNavigator from './navigator'
 import HomeScreen from 'src/features/example/ui/screens/home-screen'
 import ReactNativeNavigationService from 'src/services/navigation/react-native.js';
 
-const AppNavigatorContainer = createAppContainer(AppNavigator)
-
 export interface UIDependencies {
     storage : Storage
     services : Services
@@ -43,7 +41,7 @@ export class UI {
             componentWillUnmount() {
                 console.log('unmounting')
             }
-
+            
             render() {
                 if (!this.state.dependencies) {
                     return (
@@ -53,13 +51,18 @@ export class UI {
                     )
                 }
 
+                const AppNavigatorContainer = createAppContainer(AppNavigator(this.state.dependencies))
+
                 return <AppNavigatorContainer ref={topLevelNavigator => {
                     if (!topLevelNavigator) {
                         return
                     }
 
-                    const navigationService = (this.state.dependencies!.services.navigation as ReactNativeNavigationService)
-                    navigationService.setNavigationContainerComponent(topLevelNavigator)
+                    const dependencies = (this.state.dependencies!);
+                    const navigationService = (dependencies.services.navigation as ReactNativeNavigationService)
+                    navigationService.setDependencies({
+                        navigationContainerComponent: topLevelNavigator,
+                    })
                 }} />
             }
         }
diff --git a/app/src/ui/navigator.ts b/app/src/ui/navigator.ts
index a8fd7f538..890ec2c1f 100644
--- a/app/src/ui/navigator.ts
+++ b/app/src/ui/navigator.ts
@@ -1,14 +1,23 @@
+import React from 'react'
 import { createStackNavigator } from "react-navigation";
+import { Storage } from "src/storage/types";
+import { Services } from "src/services/types";
 import HomeScreen from "src/features/example/ui/screens/home-screen";
 import OtherScreen from "src/features/example/ui/screens/other-screen";
 
-export default createStackNavigator(
+type ScreenDependencies = { storage : Storage, services : Services }
+
+function createScreen(screenClass : any, dependencies : ScreenDependencies) {
+    return () => React.createElement(screenClass, dependencies)
+}  
+
+export default (dependencies : ScreenDependencies) => createStackNavigator(
     {
         Home: {
-            screen: HomeScreen
+            screen: createScreen(HomeScreen, dependencies)
         },
         Other: {
-            screen: OtherScreen
+            screen: createScreen(OtherScreen, dependencies)
         }
     },
     {

From 237954c27d9053bc3191ba045d6ca7f6116393f0 Mon Sep 17 00:00:00 2001
From: Vincent den Boer <vincent@shishkabab.net>
Date: Fri, 7 Jun 2019 13:01:50 +0200
Subject: [PATCH 3/6] Remove console.log

---
 app/src/features/example/ui/screens/home-screen/index.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/features/example/ui/screens/home-screen/index.tsx b/app/src/features/example/ui/screens/home-screen/index.tsx
index b294e70b4..7420fe04c 100644
--- a/app/src/features/example/ui/screens/home-screen/index.tsx
+++ b/app/src/features/example/ui/screens/home-screen/index.tsx
@@ -14,8 +14,6 @@ export default class HomeScreen extends StatefulUIElement<Props, State, Event> {
     }
 
     render() {
-        console.log(this.props)
-
         return (
             <View style={styles.container}>
                 <Text style={styles.welcome}>Welcome to React Native!</Text>

From 00ec381b45b301e9a55a537a3a66cf5d45ab5e98 Mon Sep 17 00:00:00 2001
From: Vincent den Boer <vincent@shishkabab.net>
Date: Fri, 7 Jun 2019 14:57:02 +0200
Subject: [PATCH 4/6] Get Mocha to work

---
 app/__tests__/App-test.tsx                    |  14 --
 app/package.json                              |   7 +-
 .../features/example/storage/index.test.ts    |   6 +-
 .../ui/screens/home-screen/logic.test.ts      |   7 +
 .../ui/screens/other-screen/logic.test.ts     |   5 +
 .../migrations/2019-06-01/index.test.ts       |   6 +-
 app/tsconfig.mocha.json                       |  12 +
 app/yarn.lock                                 | 224 ++++++++++++++++--
 8 files changed, 242 insertions(+), 39 deletions(-)
 delete mode 100644 app/__tests__/App-test.tsx
 create mode 100644 app/tsconfig.mocha.json

diff --git a/app/__tests__/App-test.tsx b/app/__tests__/App-test.tsx
deleted file mode 100644
index a5f5c837b..000000000
--- a/app/__tests__/App-test.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @format
- */
-
-import 'react-native';
-import React from 'react';
-import App from '../App';
-
-// Note: test renderer must be required after react-native.
-import renderer from 'react-test-renderer';
-
-it('renders correctly', () => {
-  renderer.create(<App />);
-});
\ No newline at end of file
diff --git a/app/package.json b/app/package.json
index 92fdf5a41..19d2b3edf 100644
--- a/app/package.json
+++ b/app/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
-    "test": "jest",
+    "test": "TS_NODE_PROJECT=tsconfig.mocha.json mocha --require ts-node/register 'src/**/*.test.ts'",
+    "test:watch": "TS_NODE_PROJECT=tsconfig.mocha.json mocha --watch --watch-extensions ts --require ts-node/register 'src/**/*.test.ts'",
     "react-native": "react-native",
     "build:deptree": "depcruise --exclude '^node_modules' --output-type dot ./src | dot -T svg > /tmp/dependencygraph.svg"
   },
@@ -28,6 +29,7 @@
   "devDependencies": {
     "@babel/core": "^7.4.4",
     "@babel/runtime": "^7.4.4",
+    "@types/expect": "^1.20.4",
     "@types/jest": "^24.0.13",
     "@types/node": "^12.0.2",
     "@types/react": "^16.8.18",
@@ -38,9 +40,12 @@
     "babel-plugin-module-alias": "^1.6.0",
     "babel-plugin-module-resolver": "^3.2.0",
     "dependency-cruiser": "^4.21.0",
+    "expect": "^24.8.0",
     "jest": "^24.8.0",
     "metro-react-native-babel-preset": "^0.54.1",
+    "mocha": "^6.1.4",
     "react-test-renderer": "16.8.3",
+    "ts-node": "^8.2.0",
     "typescript": "^3.4.5"
   },
   "jest": {
diff --git a/app/src/features/example/storage/index.test.ts b/app/src/features/example/storage/index.test.ts
index 8507862e8..80e595187 100644
--- a/app/src/features/example/storage/index.test.ts
+++ b/app/src/features/example/storage/index.test.ts
@@ -1 +1,5 @@
-// Should include unit tests for StorageModule
\ No newline at end of file
+import { TodoListStorage } from ".";
+
+describe('Should include unit tests for StorageModule', () => {
+    
+})
\ No newline at end of file
diff --git a/app/src/features/example/ui/screens/home-screen/logic.test.ts b/app/src/features/example/ui/screens/home-screen/logic.test.ts
index e69de29bb..fc4253e3f 100644
--- a/app/src/features/example/ui/screens/home-screen/logic.test.ts
+++ b/app/src/features/example/ui/screens/home-screen/logic.test.ts
@@ -0,0 +1,7 @@
+import Logic from "./logic";
+
+describe('Home screen logic', () => {
+    it('should pass', () => {
+        
+    })
+})
\ No newline at end of file
diff --git a/app/src/features/example/ui/screens/other-screen/logic.test.ts b/app/src/features/example/ui/screens/other-screen/logic.test.ts
index e69de29bb..548b5ffc9 100644
--- a/app/src/features/example/ui/screens/other-screen/logic.test.ts
+++ b/app/src/features/example/ui/screens/other-screen/logic.test.ts
@@ -0,0 +1,5 @@
+import Logic from "./logic";
+
+describe('Other screen logic', () => {
+    
+})
\ No newline at end of file
diff --git a/app/src/storage/migrations/2019-06-01/index.test.ts b/app/src/storage/migrations/2019-06-01/index.test.ts
index 13096aad2..15950c202 100644
--- a/app/src/storage/migrations/2019-06-01/index.test.ts
+++ b/app/src/storage/migrations/2019-06-01/index.test.ts
@@ -1 +1,5 @@
-// Should include the unit test for this migration
\ No newline at end of file
+import { createStorage } from "src/storage";
+
+describe('Should include the unit test for this migration', () => {
+    
+})
diff --git a/app/tsconfig.mocha.json b/app/tsconfig.mocha.json
new file mode 100644
index 000000000..e3ca6313b
--- /dev/null
+++ b/app/tsconfig.mocha.json
@@ -0,0 +1,12 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "target": "ES6",
+        "module": "commonjs",
+        "sourceMap": true,
+        "skipDefaultLibCheck": true,
+        "skipLibCheck": true,
+        "outDir": "tmp"
+    },
+    "include": ["./src/**/*"]
+}
diff --git a/app/yarn.lock b/app/yarn.lock
index c0e7bea52..0c3f0e155 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -893,6 +893,11 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/expect@^1.20.4":
+  version "1.20.4"
+  resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
+  integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -1041,6 +1046,11 @@ ajv@6.10.0, ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ansi-colors@3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
+  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+
 ansi-colors@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
@@ -1142,6 +1152,11 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
+arg@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.0.tgz#583c518199419e0037abb74062c37f8519e575f0"
+  integrity sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1520,6 +1535,11 @@ browser-resolve@^1.11.3:
   dependencies:
     resolve "1.1.7"
 
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -1948,7 +1968,7 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.2.6:
+debug@3.2.6, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2088,6 +2108,16 @@ diff-sequences@^24.3.0:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz#0f20e8a1df1abddaf4d9c226680952e64118b975"
   integrity sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw==
 
+diff@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+
+diff@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
+  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
+
 dom-walk@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
@@ -2204,7 +2234,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -2586,6 +2616,13 @@ find-cache-dir@^2.0.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
+find-up@3.0.0, find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -2593,13 +2630,6 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -2626,6 +2656,13 @@ flagged-respawn@^1.0.0:
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
+flat@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
+  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
+  dependencies:
+    is-buffer "~2.0.3"
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -2788,6 +2825,18 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
+glob@7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@7.1.4, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
@@ -2838,6 +2887,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
@@ -2927,6 +2981,11 @@ has@^1.0.1, has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+he@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
 highlight.js@^9.6.0:
   version "9.15.6"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.6.tgz#72d4d8d779ec066af9a17cb14360c3def0aa57c4"
@@ -3151,6 +3210,11 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-buffer@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
+  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
+
 is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
@@ -3826,7 +3890,7 @@ jest@^24.8.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
+js-yaml@3.13.1, js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -4114,6 +4178,13 @@ lodash@^3.5.0:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
 
+log-symbols@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -4137,6 +4208,11 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
+make-error@^1.1.1:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
+  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
+
 make-iterator@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
@@ -4606,7 +4682,7 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
-minimatch@^3.0.4:
+minimatch@3.0.4, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -4651,13 +4727,42 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
+mocha@^6.1.4:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.1.4.tgz#e35fada242d5434a7e163d555c705f6875951640"
+  integrity sha512-PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg==
+  dependencies:
+    ansi-colors "3.2.3"
+    browser-stdout "1.3.1"
+    debug "3.2.6"
+    diff "3.5.0"
+    escape-string-regexp "1.0.5"
+    find-up "3.0.0"
+    glob "7.1.3"
+    growl "1.10.5"
+    he "1.2.0"
+    js-yaml "3.13.1"
+    log-symbols "2.2.0"
+    minimatch "3.0.4"
+    mkdirp "0.5.1"
+    ms "2.1.1"
+    node-environment-flags "1.0.5"
+    object.assign "4.1.0"
+    strip-json-comments "2.0.1"
+    supports-color "6.0.0"
+    which "1.3.1"
+    wide-align "1.1.3"
+    yargs "13.2.2"
+    yargs-parser "13.0.0"
+    yargs-unparser "1.5.0"
+
 morgan@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
@@ -4744,6 +4849,14 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+node-environment-flags@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a"
+  integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==
+  dependencies:
+    object.getownpropertydescriptors "^2.0.3"
+    semver "^5.7.0"
+
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -4913,7 +5026,7 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.12:
+object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -4930,6 +5043,16 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
+object.assign@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -6153,7 +6276,7 @@ semver-try-require@2.0.6:
   dependencies:
     semver "6.1.1"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -6564,15 +6687,22 @@ strip-eof@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
+strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
 strip-json-comments@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
   integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
 
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+supports-color@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
+  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
+  dependencies:
+    has-flag "^3.0.0"
 
 supports-color@^2.0.0:
   version "2.0.0"
@@ -6763,6 +6893,17 @@ trim-right@^1.0.1:
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
+ts-node@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.2.0.tgz#4a89754b00560bb24cd54526e1685fa38c45f240"
+  integrity sha512-m8XQwUurkbYqXrKqr3WHCW310utRNvV5OnRVeISeea7LoCWVcdfeB/Ntl8JYWFh+WRoUAdBgESrzKochQt7sMw==
+  dependencies:
+    arg "^4.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    source-map-support "^0.5.6"
+    yn "^3.0.0"
+
 ts-pnp@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.2.tgz#be8e4bfce5d00f0f58e0666a82260c34a57af552"
@@ -7119,14 +7260,14 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.14, which@^1.2.9, which@^1.3.0:
+which@1.3.1, which@^1.2.14, which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
+wide-align@1.1.3, wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
   integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
@@ -7300,6 +7441,14 @@ yargonaut@^1.1.2:
     figlet "^1.1.1"
     parent-require "^1.0.0"
 
+yargs-parser@13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
+  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
@@ -7308,7 +7457,7 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.0:
+yargs-parser@^13.0.0, yargs-parser@^13.1.0:
   version "13.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
   integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
@@ -7323,7 +7472,33 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs@^12.0.2:
+yargs-unparser@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.5.0.tgz#f2bb2a7e83cbc87bb95c8e572828a06c9add6e0d"
+  integrity sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==
+  dependencies:
+    flat "^4.1.0"
+    lodash "^4.17.11"
+    yargs "^12.0.5"
+
+yargs@13.2.2:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
+  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
+  dependencies:
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
+
+yargs@^12.0.2, yargs@^12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
   integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
@@ -7376,3 +7551,8 @@ yargs@^9.0.0:
     which-module "^2.0.0"
     y18n "^3.2.1"
     yargs-parser "^7.0.0"
+
+yn@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.0.tgz#fcbe2db63610361afcc5eb9e0ac91e976d046114"
+  integrity sha512-kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg==

From 49e237d9c077ed2e5bb3b5e99b6bb292593a11b3 Mon Sep 17 00:00:00 2001
From: Vincent den Boer <vincent@shishkabab.net>
Date: Fri, 7 Jun 2019 15:03:21 +0200
Subject: [PATCH 5/6] Add Travis config

---
 app/.travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 app/.travis.yml

diff --git a/app/.travis.yml b/app/.travis.yml
new file mode 100644
index 000000000..057233eca
--- /dev/null
+++ b/app/.travis.yml
@@ -0,0 +1,14 @@
+language: node_js
+node_js:
+    - 'lts/*'
+install:
+    - git submodule update --init --recursive
+    - yarn install --frozen-lockfile
+script:
+    - npm run test
+cache:
+    yarn: true
+    directories:
+        - node_modules
+notifications:
+    email: false

From d61059944acf9f4e3423a956c3d1b5c2e495d99c Mon Sep 17 00:00:00 2001
From: Vincent den Boer <vincent@shishkabab.net>
Date: Fri, 7 Jun 2019 15:14:56 +0200
Subject: [PATCH 6/6] Update UI logic dependencies

---
 app/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/package.json b/app/package.json
index 19d2b3edf..52637c91b 100644
--- a/app/package.json
+++ b/app/package.json
@@ -22,8 +22,8 @@
     "react-navigation": "^3.11.0",
     "sqlite3": "^4.0.8",
     "typeorm": "^0.2.17",
-    "ui-logic-core": "^0.1.1",
-    "ui-logic-react": "^0.1.2",
+    "ui-logic-core": "^0.1.2",
+    "ui-logic-react": "^0.1.3",
     "user-logic": "^0.0.1"
   },
   "devDependencies": {