Merge branch 'react-navigation-take2' into busview-cleanups

hawkrives · web-flow · commit 84dfde63b686 · 2017-06-12T14:54:32.000-05:00
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/data/building-hours/1-1-cage.yaml b/data/building-hours/1-1-cage.yaml
@@ -6,10 +6,8 @@ schedule:
   - title: Kitchen
     notes: The kitchen stops cooking at 8 p.m.
     hours:
-      - {days: [Mo, Tu, We, Th], from: '7:30am', to: '8:00pm'}
-      - {days: [Fr], from: '7:30am', to: '8:00pm'}
-      - {days: [Sa], from: '9:00am', to: '8:00pm'}
-      - {days: [Su], from: '9:00am', to: '8:00pm'}
+      - {days: [Mo, Tu, We, Th, Fr], from: '7:30am', to: '8:00pm'}
+      - {days: [Sa, Su], from: '9:00am', to: '8:00pm'}
 
   - title: Late Night
     hours:
diff --git a/data/building-hours/3-1-post-office.yaml b/data/building-hours/3-1-post-office.yaml
@@ -17,5 +17,8 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
-    - {days: [Fr], from: '7:30am', to: '12:00pm'}
+    - title: Hours
+      closedForChapelTime: true
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
+        - {days: [Fr], from: '7:30am', to: '12:00pm'}
diff --git a/data/building-hours/3-2-print-center.yaml b/data/building-hours/3-2-print-center.yaml
@@ -16,5 +16,8 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
-    - {days: [Fr], from: '7:30am', to: '12:00pm'}
+    - title: Hours
+      closedForChapelTime: true
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
+        - {days: [Fr], from: '7:30am', to: '12:00pm'}
diff --git a/data/building-hours/4-3-rølvaag-library.yaml b/data/building-hours/4-3-rølvaag-library.yaml
@@ -17,5 +17,7 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo, Tu, We, Th], from: '7:45am', to: '4:30pm'}
-    - {days: [Fr], from: '7:45am', to: '12:00pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:45am', to: '4:30pm'}
+        - {days: [Fr], from: '7:45am', to: '12:00pm'}
diff --git a/data/building-hours/5-1-it-helpdesk.yaml b/data/building-hours/5-1-it-helpdesk.yaml
@@ -16,5 +16,7 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
-    - {days: [Fr], from: '7:45am', to: '12:00pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
+        - {days: [Fr], from: '7:45am', to: '12:00pm'}
diff --git a/data/building-hours/5-2-asc.yaml b/data/building-hours/5-2-asc.yaml
@@ -16,5 +16,7 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
-    - {days: [Fr], from: '7:45am', to: '12:00pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
+        - {days: [Fr], from: '7:45am', to: '12:00pm'}
diff --git a/data/building-hours/7-1-wellness-center.yaml b/data/building-hours/7-1-wellness-center.yaml
@@ -15,6 +15,8 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo], from: '12:00pm', to: '1:00pm'}
-    - {days: [We], from: '12:00pm', to: '1:00pm'}
-    - {days: [Th], from: '4:00pm', to: '5:30am'}
+    - title: Hours
+      hours:
+        - {days: [Mo], from: '12:00pm', to: '1:00pm'}
+        - {days: [We], from: '12:00pm', to: '1:00pm'}
+        - {days: [Th], from: '4:00pm', to: '5:30am'}
diff --git a/data/building-hours/8-bc.yaml b/data/building-hours/8-bc.yaml
@@ -17,5 +17,7 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo, Tu, We, Th], from: '7:00am', to: '10:00pm'}
-    - {days: [Fr, Sa, Su], from: '7:00am', to: '7:00pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:00am', to: '10:00pm'}
+        - {days: [Fr, Sa, Su], from: '7:00am', to: '7:00pm'}
diff --git a/data/building-hours/8-rns.yaml b/data/building-hours/8-rns.yaml
@@ -10,31 +10,45 @@ schedule:
 
 breakSchedule:
   fall:
-    - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '12:00am'}
-    - {days: [Sa, Su], from: '8:00am', to: '12:00am'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '12:00am'}
+        - {days: [Sa, Su], from: '8:00am', to: '12:00am'}
 
   thanksgiving:
-    - {days: [Tu, We], from: '7:00am', to: '10:00pm'}
-    - {days: [Sa], from: '8:00pm', to: '5:00pm'}
-    - {days: [Su], from: '8:00am', to: '12:00am'}
+    - title: Hours
+      hours:
+        - {days: [Tu, We], from: '7:00am', to: '10:00pm'}
+        - {days: [Sa], from: '8:00pm', to: '5:00pm'}
+        - {days: [Su], from: '8:00am', to: '12:00am'}
 
   winter:
-    - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '8:00pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '8:00pm'}
 
   interim:
-    - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '5:00pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '5:00pm'}
 
   spring:
-    - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '5:00pm'}
-    - {days: [Sa], from: '8:00pm', to: '5:00pm'}
-    - {days: [Su], from: '8:00am', to: '12:00am'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '5:00pm'}
+        - {days: [Sa], from: '8:00pm', to: '5:00pm'}
+        - {days: [Su], from: '8:00am', to: '12:00am'}
 
   easter:
-    - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '5:00pm'}
-    - {days: [Sa], from: '8:00pm', to: '5:00pm'}
-    - {days: [Su], from: '8:00am', to: '12:00am'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '5:00pm'}
+        - {days: [Sa], from: '8:00pm', to: '5:00pm'}
+        - {days: [Su], from: '8:00am', to: '12:00am'}
 
   summer:
-    - {days: [Mo, Tu, We, Th], from: '7:00am', to: '10:00pm'}
-    - {days: [Fr], from: '7:00am', to: '8:00pm'}
-    - {days: [Sa, Su], from: '10:00am', to: '10:00pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:00am', to: '10:00pm'}
+        - {days: [Fr], from: '7:00am', to: '8:00pm'}
+        - {days: [Sa, Su], from: '10:00am', to: '10:00pm'}
diff --git a/data/building-hours/9-admissions.yaml b/data/building-hours/9-admissions.yaml
@@ -15,4 +15,6 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo, Tu, We, Th, Fr], from: '7:30am', to: '4:30pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th, Fr], from: '7:30am', to: '4:30pm'}
diff --git a/data/building-hours/9-business-office.yaml b/data/building-hours/9-business-office.yaml
@@ -14,5 +14,7 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:00pm'}
-    - {days: [Fr], from: '7:30am', to: '12:00pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:00pm'}
+        - {days: [Fr], from: '7:30am', to: '12:00pm'}
diff --git a/data/building-hours/9-financial-aid.yaml b/data/building-hours/9-financial-aid.yaml
@@ -14,5 +14,7 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
-    - {days: [Fr], from: '7:30am', to: '12:00pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
+        - {days: [Fr], from: '7:30am', to: '12:00pm'}
diff --git a/data/building-hours/9-registrar.yaml b/data/building-hours/9-registrar.yaml
@@ -14,5 +14,7 @@ breakSchedule:
   spring: []
   easter: []
   summer:
-    - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
-    - {days: [Fr], from: '7:30am', to: '12:00pm'}
+    - title: Hours
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
+        - {days: [Fr], from: '7:30am', to: '12:00pm'}
diff --git a/source/views/building-hours/building-hours-helpers.js b/source/views/building-hours/building-hours-helpers.js
@@ -6,7 +6,6 @@ const RESULT_FORMAT = 'h:mma'
 
 import type {
   BuildingType,
-  NamedBuildingScheduleType,
   SingleBuildingScheduleType,
   DayOfWeekEnumType,
 } from './types'
@@ -146,7 +145,7 @@ export function getDetailedBuildingStatus(
 
   let dayOfWeek = getDayOfWeek(m)
 
-  let schedules = normalizeBuildingSchedule(info)
+  let schedules = info.schedule || []
   if (!schedules.length) {
     return [{isActive: false, label: null, status: 'Hours unknown'}]
   }
@@ -186,7 +185,7 @@ export function getDetailedBuildingStatus(
 export function getShortBuildingStatus(info: BuildingType, m: momentT): string {
   let dayOfWeek = getDayOfWeek(m)
 
-  let schedules = normalizeBuildingSchedule(info)
+  let schedules = info.schedule || []
   if (!schedules.length) {
     return 'Closed'
   }
@@ -218,7 +217,7 @@ export function getShortBuildingStatus(info: BuildingType, m: momentT): string {
 export function isBuildingOpen(info: BuildingType, m: momentT): boolean {
   let dayOfWeek = getDayOfWeek(m)
 
-  let schedules = normalizeBuildingSchedule(info)
+  let schedules = info.schedule || []
   if (!schedules.length) {
     return false
   }
@@ -300,14 +299,3 @@ export function summarizeDays(days: DayOfWeekEnumType[]): string {
 
   return `${start} — ${end}`
 }
-
-export function normalizeBuildingSchedule(
-  info: BuildingType,
-): NamedBuildingScheduleType[] {
-  let schedules = info.schedule
-  if (!schedules) {
-    return []
-  }
-
-  return schedules
-}
diff --git a/source/views/building-hours/detail/building.js b/source/views/building-hours/detail/building.js
@@ -11,10 +11,7 @@ import type {BuildingType} from '../types'
 import moment from 'moment-timezone'
 import ParallaxView from 'react-native-parallax-view'
 import * as c from '../../components/colors'
-import {
-  normalizeBuildingSchedule,
-  getShortBuildingStatus,
-} from '../building-hours-helpers'
+import {getShortBuildingStatus} from '../building-hours-helpers'
 
 import {Badge} from './badge'
 import {Header} from './header'
@@ -45,7 +42,7 @@ export class BuildingDetail extends React.PureComponent {
       ? buildingImages[info.image]
       : transparentPixel
     const openStatus = getShortBuildingStatus(info, now)
-    const schedules = normalizeBuildingSchedule(info, now)
+    const schedules = info.schedule || []
 
     return (
       <ParallaxView
diff --git a/source/views/building-hours/row.js b/source/views/building-hours/row.js
@@ -66,7 +66,7 @@ export function BuildingRow({info, name, now, onPress}: PropsType) {
   const textaccent = foregroundColors[openStatus] || 'rgb(130, 82, 45)'
 
   return (
-    <ListRow onPress={onPress} arrowPosition="center" direction="column">
+    <ListRow onPress={onPress} arrowPosition="center">
       <Column>
         <Row style={styles.title}>
           <Title lines={1} style={styles.titleText}>
diff --git a/source/views/building-hours/types.js b/source/views/building-hours/types.js
@@ -34,7 +34,7 @@ export type NamedBuildingScheduleType = {|
 |}
 
 export type BreakScheduleContainerType = {
-  [key: BreakNameEnumType]: SingleBuildingScheduleType[],
+  [key: BreakNameEnumType]: NamedBuildingScheduleType[],
 }
 
 export type BuildingType = {|
diff --git a/source/views/components/list/list-row.js b/source/views/components/list/list-row.js
@@ -34,7 +34,7 @@ const styles = StyleSheet.create({
   },
 })
 
-type PropsType = {
+type PropsType = {|
   style?: any,
   contentContainerStyle?: any,
   arrowPosition?: 'center' | 'top' | 'none',
@@ -43,7 +43,7 @@ type PropsType = {
   spacing?: {left?: number, right?: number},
   onPress?: () => any,
   children?: any,
-}
+|}
 export function ListRow(props: PropsType) {
   const {
     style,
diff --git a/source/views/transportation/bus/bus-line.js b/source/views/transportation/bus/bus-line.js
@@ -1,6 +1,6 @@
 // @flow
 import React from 'react'
-import {View, StyleSheet, Platform} from 'react-native'
+import {View, StyleSheet, Platform, Text} from 'react-native'
 import type {BusLineType, FancyBusTimeListType} from './types'
 import {getScheduleForNow, getSetOfStopsForNow} from './lib'
 import get from 'lodash/get'
@@ -11,7 +11,7 @@ import moment from 'moment-timezone'
 import * as c from '../../components/colors'
 import {Separator} from '../../components/separator'
 import {BusStopRow} from './bus-stop-row'
-import {ListRow, ListSectionHeader} from '../../components/list'
+import {ListRow, ListSectionHeader, Title} from '../../components/list'
 
 const TIME_FORMAT = 'h:mma'
 const TIMEZONE = 'America/Winnipeg'
@@ -80,7 +80,9 @@ export class BusLine extends React.PureComponent {
       return (
         <View>
           <ListSectionHeader title={line.line} titleStyle={androidColor} />
-          <ListRow title="This line is not running today." />
+          <ListRow>
+            <Title><Text>This line is not running today.</Text></Title>
+          </ListRow>
         </View>
       )
     }
