navigation controllers

ios/RNNControllerFactory.m

@@ -8,10 +8,22 @@
 
 +(UIViewController *)createRootViewController:(NSDictionary *)layout
 {
-    NSString* containerName = layout[@"container"][@"name"];
-    NSString* containerId = layout[@"container"][@"id"];
+    if ([layout[@"type"] isEqualToString:@"ContainerStack"]) {
+        UINavigationController* stack = [[UINavigationController alloc] init];
+        
+        NSString* containerName = [layout[@"children"] objectAtIndex:0][@"data"][@"name"];
+        NSString* containerId = [layout[@"children"] objectAtIndex:0][@"id"];
+        
+        [stack setViewControllers:@[[RNNControllerFactory create:containerName containerId:containerId]] animated:false];
+        
+        return stack;
+    }
     
-    return [RNNControllerFactory create:containerName containerId:containerId];
+//    NSString* containerName = layout[@"container"][@"name"];
+//    NSString* containerId = layout[@"container"][@"id"];
+    
+//    return [RNNControllerFactory create:containerName containerId:containerId];
+    return nil;
 }
 
 +(UIViewController*)create:(NSString*)containerName containerId:(NSString*)containerId

scripts/test.android.js

@@ -1,7 +1,7 @@
 const exec = require('shell-utils').exec;
 
 function run() {
-  if (process.env.TRAVIS) {
+  if (process.env.CI) {
     exec.execSync(`./scripts/installAndroidSDK.sh`);
   }
   exec.execSync(`cd android && ./gradlew clean testDebugUnitTest`);

src/commands/Commands.js

@@ -6,7 +6,7 @@ export default class Commands {
     this.layoutTreeParser = new LayoutTreeParser(uniqueIdProvider);
   }
 
-  startApp(params) {
-    this.nativeCommandsSender.startApp(this.layoutTreeParser.parse(params));
+  startApp(simpleApi) {
+    this.nativeCommandsSender.startApp(this.layoutTreeParser.parseSimpleApi(simpleApi));
   }
 }

src/commands/Commands.test.js

@@ -21,10 +21,18 @@ describe('Commands', () => {
       });
       expect(mockCommandsSender.startApp).toHaveBeenCalledTimes(1);
       expect(mockCommandsSender.startApp).toHaveBeenCalledWith({
-        container: {
-          name: 'com.example.MyScreen',
-          id: 'containerUNIQUE_ID'
-        }
+        type: 'ContainerStack',
+        id: 'ContainerStackUNIQUE_ID',
+        children: [
+          {
+            type: 'Container',
+            id: 'ContainerUNIQUE_ID',
+            children: [],
+            data: {
+              name: 'com.example.MyScreen'
+            }
+          }
+        ]
       });
     });
   });

src/commands/LayoutTreeParser.js

@@ -5,22 +5,45 @@ export default class LayoutTreeParser {
     this.uniqueIdProvider = uniqueIdProvider;
   }
 
-  parse(params) {
-    const layout = _.cloneDeep(params);
-    if (layout.container) {
-      layout.container.id = this.uniqueIdProvider.generate(`container`);
-    }
-    if (layout.sideMenu) {
-      if (layout.sideMenu.left) {
-        layout.sideMenu.left.id = this.uniqueIdProvider.generate(`container`);
-      }
-      if (layout.sideMenu.right) {
-        layout.sideMenu.right.id = this.uniqueIdProvider.generate(`container`);
-      }
-    }
-    if (layout.tabs) {
-      _.forEach(layout.tabs, (t) => t.container.id = this.uniqueIdProvider.generate(`container`));
-    }
+  parseSimpleApi(params) {
+    const layout = this.createContainerStackWithContainer(params.container);
+
+    //const layout = _.cloneDeep(params);
+    //if (layout.container) {
+    //  this.generateIdFor(layout.container);
+    //}
+    //if (layout.sideMenu) {
+    //  if (layout.sideMenu.left) {
+    //    this.generateIdFor(layout.sideMenu.left);
+    //  }
+    //  if (layout.sideMenu.right) {
+    //    this.generateIdFor(layout.sideMenu.right);
+    //  }
+    //}
+    //if (layout.tabs) {
+    //  _.forEach(layout.tabs, this.generateIdFor);
+    //}
     return layout;
   }
+
+  createContainerStackWithContainer(container) {
+    return {
+      type: 'ContainerStack',
+      id: this.uniqueIdProvider.generate(`ContainerStack`),
+      children: [
+        this.createContainer(container)
+      ]
+    };
+  }
+
+  createContainer(container) {
+    return {
+      data: {
+        ...container
+      },
+      type: 'Container',
+      id: this.uniqueIdProvider.generate(`Container`),
+      children: []
+    };
+  }
 }

src/commands/LayoutTreeParser.test.js

@@ -4,25 +4,116 @@ describe('LayoutTreeParser', () => {
   let uut;
 
   beforeEach(() => {
-    const uniqueIdProvider = {generate: (p) => `${p}UNIQUE_ID`};
+    const uniqueIdProvider = {generate: (prefix) => `${prefix}+UNIQUE_ID`};
     const LayoutTreeParser = require('./LayoutTreeParser').default;
     uut = new LayoutTreeParser(uniqueIdProvider);
   });
 
-  it('returns a deep clone', () => {
-    const input = {inner: {foo: {bar: 1}}};
-    expect(uut.parse(input)).not.toBe(input);
-    expect(uut.parse(input).inner).not.toBe(input.inner);
-    expect(uut.parse(input).inner.foo).not.toBe(input.inner.foo);
+  it('parses single screen', () => {
+    expect(uut.parseSimpleApi(SimpleLayouts.singleScreenApp))
+      .toEqual({
+        type: 'ContainerStack',
+        id: 'ContainerStack+UNIQUE_ID',
+        children: [
+          {
+            type: 'Container',
+            id: 'Container+UNIQUE_ID',
+            data: {
+              name: 'com.example.MyScreen'
+            },
+            children: []
+          }
+        ]
+      });
   });
 
-  it('adds uniqueId to containers', () => {
+  it('parses single screen with props', () => {
+    expect(uut.parseSimpleApi(SimpleLayouts.singleScreenWithAditionalParams))
+      .toEqual({
+        type: 'ContainerStack',
+        id: 'ContainerStack+UNIQUE_ID',
+        children: [
+          {
+            type: 'Container',
+            id: 'Container+UNIQUE_ID',
+            children: [],
+            data: {
+              name: 'com.example.MyScreen',
+              passProps: {
+                foo: {
+                  number: 1,
+                  string: 'Hello!'
+                },
+                bar: SimpleLayouts.passedFunction
+              },
+              style: {},
+              buttons: {}
+            }
+          }
+        ]
+      });
+  });
+
+  xit('parses tab based', () => {
+    expect(uut.parseSimpleApi(SimpleLayouts.tabBasedApp))
+      .toEqual({
+        type: 'Tabs',
+        id: 'Tabs+UNIQUE_ID',
+        children: [
+          {
+            container: {
+              name: 'com.example.FirstTab'
+            }
+          },
+          {
+            container: {
+              name: 'com.example.SecondTab'
+            }
+          },
+          {
+            container: {
+              name: 'com.example.FirstTab'
+            }
+          }
+        ]
+      });
+  });
+
+  xit('adds uniqueId to containers', () => {
     const input = {container: {}};
-    expect(uut.parse(input)).toEqual({container: {id: 'containerUNIQUE_ID'}});
+    expect(uut.parse(input)).toEqual({container: {id: 'Container+UNIQUE_ID'}});
   });
 
-  it('parses simple structures', () => {
-    uut.parse(SimpleLayouts.singleScreenApp);
-    //TODO
+  xit('parses side menus', () => {
+    //const result2 = {
+    //  type: 'Menus',
+    //  id: 'MenusUNIQUE_ID',
+    //  children: [
+    //    {
+    //      type: 'Container',
+    //      id: 'ContainerUNIQUE_ID',
+    //      name: 'com.example.LeftSideMenu',
+    //      children: []
+    //    },
+    //    {
+    //      type: 'ContainerStack',
+    //      id: 'ContainerStackUNIQUE_ID',
+    //      children: [
+    //        {
+    //          type: 'Container',
+    //          id: 'ContainerUNIQUE_ID',
+    //          name: 'com.example.WelcomeScreen',
+    //          children: []
+    //        }
+    //      ]
+    //    },
+    //    {
+    //      type: 'Container',
+    //      id: 'ContainerUNIQUE_ID',
+    //      name: 'com.example.RightSideMenu',
+    //      children: []
+    //    }
+    //  ]
+    //};
   });
 });

src/commands/SimpleLayouts.js

@@ -4,6 +4,23 @@ export const singleScreenApp = {
   }
 };
 
+export const passedFunction = () => 'Hello from a function';
+
+export const singleScreenWithAditionalParams = {
+  container: {
+    name: 'com.example.MyScreen',
+    passProps: {
+      foo: {
+        number: 1,
+        string: 'Hello!'
+      },
+      bar: passedFunction
+    },
+    style: {},
+    buttons: {}
+  }
+};
+
 export const tabBasedApp = {
   tabs: [
     {
@@ -62,7 +79,7 @@ export const singleWithBothMenus = {
   }
 };
 
-export const tabBasedWithSideMenu = {
+export const tabBasedWithBothSideMenus = {
   tabs: [
     {
       container: {