inline other tab definitions

Author: hawkrives

source/views/calendar/index.js

@@ -17,36 +17,42 @@ const StOlafTab = ({navigation}) =>
     navigation={navigation}
     calendarId="[email protected]"
   />
-StOlafTab.navigationOptions = {
-  tabBarLabel: 'St. Olaf',
-  tabBarIcon: TabBarIcon('school'),
-}
 
 const OlevilleTab = ({navigation}) =>
   <GoogleCalendarView
     navigation={navigation}
     calendarId="[email protected]"
   />
-OlevilleTab.navigationOptions = {
-  tabBarLabel: 'Oleville',
-  tabBarIcon: TabBarIcon('happy'),
-}
 
 const NorthfieldTab = ({navigation}) =>
   <GoogleCalendarView
     navigation={navigation}
     calendarId="[email protected]"
   />
-NorthfieldTab.navigationOptions = {
-  tabBarLabel: 'Northfield',
-  tabBarIcon: TabBarIcon('pin'),
-}
 
 export default TabNavigator(
   {
-    StOlafCalendarView: {screen: StOlafTab},
-    OlevilleCalendarView: {screen: OlevilleTab},
-    NorthfieldCalendarView: {screen: NorthfieldTab},
+    StOlafCalendarView: {
+      screen: StOlafTab,
+      navigationOptions: {
+        tabBarLabel: 'St. Olaf',
+        tabBarIcon: TabBarIcon('school'),
+      },
+    },
+    OlevilleCalendarView: {
+      screen: OlevilleTab,
+      navigationOptions: {
+        tabBarLabel: 'Oleville',
+        tabBarIcon: TabBarIcon('happy'),
+      },
+    },
+    NorthfieldCalendarView: {
+      screen: NorthfieldTab,
+      navigationOptions: {
+        tabBarLabel: 'Northfield',
+        tabBarIcon: TabBarIcon('pin'),
+      },
+    },
   },
   {
     navigationOptions: {

source/views/news/index.js

@@ -19,10 +19,6 @@ const StOlafTab = ({navigation}) =>
     query={{per_page: 10, _embed: true}}
     name="St. Olaf"
   />
-StOlafTab.navigationOptions = {
-  tabBarLabel: 'St. Olaf',
-  tabBarIcon: TabBarIcon('school'),
-}
 
 const OlevilleTab = ({navigation}) =>
   <NewsContainer
@@ -33,10 +29,6 @@ const OlevilleTab = ({navigation}) =>
     embedFeaturedImage={true}
     name="Oleville"
   />
-OlevilleTab.navigationOptions = {
-  tabBarLabel: 'Oleville',
-  tabBarIcon: TabBarIcon('happy'),
-}
 
 const MessTab = ({navigation}) =>
   <NewsContainer
@@ -45,10 +37,6 @@ const MessTab = ({navigation}) =>
     url="http://manitoumessenger.com/feed/"
     name="The Mess"
   />
-MessTab.navigationOptions = {
-  tabBarLabel: 'The Mess',
-  tabBarIcon: TabBarIcon('paper'),
-}
 
 const PoliticOleTab = ({navigation}) =>
   <NewsContainer
@@ -57,10 +45,6 @@ const PoliticOleTab = ({navigation}) =>
     url="http://oleville.com/politicole/feed/"
     name="PoliticOle"
   />
-PoliticOleTab.navigationOptions = {
-  tabBarLabel: 'PoliticOle',
-  tabBarIcon: TabBarIcon('megaphone'),
-}
 
 const KstoTab = ({navigation}) =>
   <NewsContainer
@@ -70,18 +54,44 @@ const KstoTab = ({navigation}) =>
     query={{per_page: 10, _embed: true}}
     name="KSTO"
   />
-KstoTab.navigationOptions = {
-  tabBarLabel: 'KSTO',
-  tabBarIcon: TabBarIcon('radio'),
-}
 
 export default TabNavigator(
   {
-    StOlafNewsView: {screen: StOlafTab},
-    OlevilleNewsView: {screen: OlevilleTab},
-    MessNewsView: {screen: MessTab},
-    PoliticOleNewsView: {screen: PoliticOleTab},
-    KstoNewsView: {screen: KstoTab},
+    StOlafNewsView: {
+      screen: StOlafTab,
+      navigationOptions: {
+        tabBarLabel: 'St. Olaf',
+        tabBarIcon: TabBarIcon('school'),
+      },
+    },
+    OlevilleNewsView: {
+      screen: OlevilleTab,
+      navigationOptions: {
+        tabBarLabel: 'Oleville',
+        tabBarIcon: TabBarIcon('happy'),
+      },
+    },
+    MessNewsView: {
+      screen: MessTab,
+      navigationOptions: {
+        tabBarLabel: 'The Mess',
+        tabBarIcon: TabBarIcon('paper'),
+      },
+    },
+    PoliticOleNewsView: {
+      screen: PoliticOleTab,
+      navigationOptions: {
+        tabBarLabel: 'PoliticOle',
+        tabBarIcon: TabBarIcon('megaphone'),
+      },
+    },
+    KstoNewsView: {
+      screen: KstoTab,
+      navigationOptions: {
+        tabBarLabel: 'KSTO',
+        tabBarIcon: TabBarIcon('radio'),
+      },
+    },
   },
   {
     navigationOptions: {

source/views/transportation/index.js

@@ -13,35 +13,44 @@ import OtherModesView from './otherModes'
 import BusView from './bus'
 
 const ExpressLineTab = () => <BusView line="Express Bus" />
-ExpressLineTab.navigationOptions = {
-  tabBarLabel: 'Express Bus',
-  tabBarIcon: TabBarIcon('bus'),
-}
 
 const RedLineTab = () => <BusView line="Red Line" />
-RedLineTab.navigationOptions = {
-  tabBarLabel: 'Red Line',
-  tabBarIcon: TabBarIcon('bus'),
-}
 
 const BlueLineTab = () => <BusView line="Blue Line" />
-BlueLineTab.navigationOptions = {
-  tabBarLabel: 'Blue Line',
-  tabBarIcon: TabBarIcon('bus'),
-}
 
 const OtherModesTab = () => <OtherModesView />
-OtherModesTab.navigationOptions = {
-  tabBarLabel: 'Other Modes',
-  tabBarIcon: TabBarIcon('boat'),
-}
 
 export default TabNavigator(
   {
-    ExpressLineBusView: {screen: ExpressLineTab},
-    RedLineBusView: {screen: RedLineTab},
-    BlueLineBusView: {screen: BlueLineTab},
-    TransportationOtherModesListView: {screen: OtherModesTab},
+    ExpressLineBusView: {
+      screen: ExpressLineTab,
+      navigationOptions: {
+        tabBarLabel: 'Express Bus',
+        tabBarIcon: TabBarIcon('bus'),
+      },
+    },
+    RedLineBusView: {
+      screen: RedLineTab,
+      navigationOptions: {
+        tabBarLabel: 'Red Line',
+        tabBarIcon: TabBarIcon('bus'),
+      },
+    },
+    BlueLineBusView: {
+      screen: BlueLineTab,
+
+      navigationOptions: {
+        tabBarLabel: 'Blue Line',
+        tabBarIcon: TabBarIcon('bus'),
+      },
+    },
+    TransportationOtherModesListView: {
+      screen: OtherModesTab,
+      navigationOptions: {
+        tabBarLabel: 'Other Modes',
+        tabBarIcon: TabBarIcon('boat'),
+      },
+    },
   },
   {
     navigationOptions: {