Merge pull request #1732 from StoDevX/carleton-no-nest

Remove nested StackNavigator from Carleton menus

Author: hawkrives

source/navigation.js

@@ -9,7 +9,13 @@ import {ContactsView, ContactsDetailView} from './views/contacts'
 import {DictionaryView, DictionaryDetailView} from './views/dictionary'
 import {HomeView, EditHomeView} from './views/home'
 import StreamingView from './views/streaming'
-import {MenusView} from './views/menus'
+import {
+  MenusView,
+  CarletonBurtonMenuScreen,
+  CarletonLDCMenuScreen,
+  CarletonWeitzMenuScreen,
+  CarletonSaylesMenuScreen,
+} from './views/menus'
 import {FilterView} from './views/components/filter'
 import NewsView from './views/news'
 import NewsItemView from './views/news/news-item'
@@ -83,6 +89,10 @@ export const AppNavigator = StackNavigator(
     TransportationView: {screen: TransportationView},
     OtherModesDetailView: {screen: OtherModesDetailView},
     BusMapView: {screen: BusMapView},
+    CarletonBurtonMenuView: {screen: CarletonBurtonMenuScreen},
+    CarletonLDCMenuView: {screen: CarletonLDCMenuScreen},
+    CarletonWeitzMenuView: {screen: CarletonWeitzMenuScreen},
+    CarletonSaylesMenuView: {screen: CarletonSaylesMenuScreen},
   },
   {
     navigationOptions: {

source/views/menus/index.js

@@ -5,33 +5,20 @@
  */
 
 import React from 'react'
-import {StackNavigator} from 'react-navigation'
 import {TabNavigator} from '../components/tabbed-view'
 import {TabBarIcon} from '../components/tabbar-icon'
 
 import {BonAppHostedMenu} from './menu-bonapp'
 import {GitHubHostedMenu} from './menu-github'
-import {
-  CarletonCafeIndex,
+import {CarletonCafeIndex} from './carleton-menus'
+// import {BonAppPickerView} from './dev-bonapp-picker'
+
+export {
   CarletonBurtonMenuScreen,
   CarletonLDCMenuScreen,
   CarletonWeitzMenuScreen,
   CarletonSaylesMenuScreen,
 } from './carleton-menus'
-// import {BonAppPickerView} from './dev-bonapp-picker'
-
-const CarletonMenuPicker = StackNavigator(
-  {
-    CarletonCafeIndex: {screen: CarletonCafeIndex},
-    CarletonBurtonMenuView: {screen: CarletonBurtonMenuScreen},
-    CarletonLDCMenuView: {screen: CarletonLDCMenuScreen},
-    CarletonWeitzMenuView: {screen: CarletonWeitzMenuScreen},
-    CarletonSaylesMenuView: {screen: CarletonSaylesMenuScreen},
-  },
-  {
-    headerMode: 'none',
-  },
-)
 
 export const MenusView = TabNavigator(
   {
@@ -100,9 +87,9 @@ export const MenusView = TabNavigator(
     },
 
     CarletonMenuListView: {
-      screen: CarletonMenuPicker,
+      screen: CarletonCafeIndex,
       navigationOptions: {
-        title: 'Carleton',
+        tabBarLabel: 'Carleton',
         tabBarIcon: TabBarIcon('menu'),
       },
     },