Merge branch 'master' into building-hours-list-fix

Author: hawkrives

README.md

@@ -22,11 +22,8 @@ The Calendar won't work until you give it a Google Calendar API key. You should
 1. Create a copy of the `.env.sample.js` file and rename it to `.env.js`
 2. Insert your API key in place of the `key goes here` text
 
-## Todo
-* Bugs! All bugs should have the [`bug`](https://github.com/StoDevX/AAO-React-Native/issues?q=is%3Aopen+is%3Aissue+label%3Abug) label in the issues
+## Contributing
+* Bugs! All bugs should have the [`bug/general`](https://github.com/StoDevX/AAO-React-Native/labels/bug%2Fgeneral) or [`bug/layout`](https://github.com/StoDevX/AAO-React-Native/labels/bug%2Flayout) label in the issues
 * Enhancements! All ideas for improvement that are not being worked on should be [`closed` and labelled as `discussion`](https://github.com/StoDevX/AAO-React-Native/issues?utf8=%E2%9C%93&q=is%3Aclosed%20is%3Aissue%20label%3Astatus%2Fdiscussion)
-* [3D touch actions](https://github.com/jordanbyron/react-native-quick-actions) for icon and within
-* [Touch-ID](https://github.com/naoufal/react-native-touch-id) for SIS
 
-## Contributing
-Please see [CONTRIBUTING](CONTRIBUTING.md)
+For full information, see [CONTRIBUTING](CONTRIBUTING.md)

data/bus-times/express.yaml

@@ -21,7 +21,7 @@ schedules:
     stops:
         [St. Olaf,  Carleton,  Food Co-op, Cub/Target, El Tequila, Food Co-op, Carleton,  St. Olaf]
     times:
-      - ['1:15pm',  '1:22pm',  '1:23pm',   '1:33pm',   '1:37pm',   '1:43pm',   '1:44pm',  '1:52pm']
-      - ['1:55pm',  '2:02pm',  '2:03pm',   '2:13pm',   '2:17pm',   '2:23pm',   '2:24pm',  '2:32pm']
-      - ['2:35pm',  '2:42pm',  '2:43pm',   '2:53pm',   '2:57pm',   '3:03pm',   '3:04pm',  '3:12pm']
       - ['3:15pm',  '3:22pm',  '3:23pm',   '3:33pm',   '3:37pm',   '3:43pm',   '3:44pm',  '3:52pm']
+      - ['3:55pm',  '4:02pm',  '4:03pm',   '4:13pm',   '4:17pm',   '4:23pm',   '4:24pm',  '4:32pm']
+      - ['4:35pm',  '4:42pm',  '4:43pm',   '4:53pm',   '4:57pm',   '4:03pm',   '5:04pm',  '5:12pm']
+      - ['5:15pm',  '5:22pm',  '5:23pm',   '5:33pm',   '5:37pm',   '5:43pm',   '5:44pm',  '5:52pm']

package.json

@@ -71,7 +71,7 @@
     "react-native-custom-tabs": "0.1.6",
     "react-native-datepicker": "1.6.0",
     "react-native-device-info": "0.11.0",
-    "react-native-google-analytics-bridge": "5.3.0",
+    "react-native-google-analytics-bridge": "5.3.1",
     "react-native-keychain": "2.0.0-rc",
     "react-native-linear-gradient": "2.3.0",
     "react-native-maps": "0.16.3",
@@ -112,7 +112,7 @@
     "eslint-plugin-react-native": "3.1.0",
     "flow-bin": "0.45.0",
     "jest": "21.0.2",
-    "js-yaml": "3.9.1",
+    "js-yaml": "3.10.0",
     "junk": "2.1.0",
     "marked": "0.3.6",
     "minimist": "1.2.0",

source/lib/report-network-problem.js

@@ -0,0 +1,10 @@
+// @flow
+
+import {tracker} from '../analytics'
+import bugsnag from '../bugsnag'
+
+export function reportNetworkProblem(err: Error) {
+  tracker.trackException(err.message)
+  bugsnag.notify(err)
+  console.warn(err)
+}

source/views/building-hours/detail/building.js

@@ -16,6 +16,7 @@ import {getShortBuildingStatus} from '../lib'
 import {Badge} from './badge'
 import {Header} from './header'
 import {ScheduleTable} from './schedule-table'
+import {ListFooter} from '../../components/list'
 
 const transparentPixel = require('../../../../images/transparent.png')
 
@@ -72,6 +73,12 @@ export class BuildingDetail extends React.Component<void, Props, void> {
             now={now}
             onProblemReport={onProblemReport}
           />
+
+          <ListFooter
+            title={
+              'Building hours subject to change without notice\n\nData collected by the humans of All About Olaf'
+            }
+          />
         </View>
       </ParallaxView>
     )

source/views/building-hours/list.js

@@ -5,25 +5,18 @@
  */
 
 import React from 'react'
-import {StyleSheet, SectionList} from 'react-native'
+import {SectionList} from 'react-native'
 import {BuildingRow} from './row'
 import {tracker} from '../../analytics'
 
 import type momentT from 'moment'
 import type {TopLevelViewPropsType} from '../types'
 import type {BuildingType} from './types'
 
-import * as c from '../components/colors'
-import {ListSeparator, ListSectionHeader} from '../components/list'
+import {ListSeparator, ListSectionHeader, ListFooter} from '../components/list'
 
 export {BuildingHoursDetailView} from './detail'
 
-const styles = StyleSheet.create({
-  container: {
-    backgroundColor: c.white,
-  },
-})
-
 export class BuildingHoursList extends React.PureComponent {
   props: TopLevelViewPropsType & {
     now: momentT,
@@ -54,12 +47,18 @@ export class BuildingHoursList extends React.PureComponent {
     return (
       <SectionList
         ItemSeparatorComponent={ListSeparator}
+        ListFooterComponent={
+          <ListFooter
+            title={
+              'Building hours subject to change without notice\n\nData collected by the humans of All About Olaf'
+            }
+          />
+        }
         sections={(this.props.buildings: any)}
         extraData={this.props}
         keyExtractor={this.keyExtractor}
         renderSectionHeader={this.renderSectionHeader}
         renderItem={this.renderItem}
-        contentContainerStyle={styles.container}
         refreshing={this.props.loading}
         onRefresh={this.props.onRefresh}
       />

source/views/building-hours/row.js

@@ -15,6 +15,9 @@ import {ListRow, Detail, Title} from '../components/list'
 import {getDetailedBuildingStatus, getShortBuildingStatus} from './lib'
 
 const styles = StyleSheet.create({
+  row: {
+    backgroundColor: c.white,
+  },
   title: {
     justifyContent: 'space-between',
     alignItems: 'center',
@@ -133,7 +136,7 @@ export class BuildingRow extends React.Component<void, Props, State> {
     const {openStatus, hours, accentBg, accentText} = this.state
 
     return (
-      <ListRow onPress={this.onPress} arrowPosition="center">
+      <ListRow onPress={this.onPress} arrowPosition="center" style={styles.row}>
         <Row style={styles.title}>
           <Title lines={1} style={styles.titleText}>
             <Text>{name}</Text>

source/views/components/list/list-footer.js

@@ -16,7 +16,7 @@ const styles = StyleSheet.create({
 export class ListFooter extends React.PureComponent {
   props: {
     title: string,
-    href: string,
+    href?: string,
   }
 
   render() {

source/views/streaming/index.js

@@ -13,10 +13,10 @@ import {StreamListView} from './streams'
 
 export default TabNavigator(
   {
+    StreamingView: {screen: StreamListView},
+    LiveWebcamsView: {screen: WebcamsView},
     KSTORadioView: {screen: KSTOView},
     // WeeklyMovieView: {screen: WeeklyMovieView},
-    LiveWebcamsView: {screen: WebcamsView},
-    StreamingView: {screen: StreamListView},
   },
   {
     navigationOptions: {

source/views/transportation/bus/bus-line.js

@@ -1,11 +1,12 @@
 // @flow
 import React from 'react'
 import {View, Text, StyleSheet, Platform} from 'react-native'
-import type {BusLineType, FancyBusTimeListType} from './types'
+import type {BusLineType, FancyBusTimeListType, BusScheduleType} from './types'
 import {getScheduleForNow, getSetOfStopsForNow} from './lib'
 import get from 'lodash/get'
 import zip from 'lodash/zip'
 import head from 'lodash/head'
+import isEqual from 'lodash/isEqual'
 import last from 'lodash/last'
 import moment from 'moment-timezone'
 import * as c from '../../components/colors'
@@ -49,7 +50,7 @@ function makeSubtitle({now, moments, isLastBus}) {
   return lineDetail
 }
 
-const parseTime = (now: moment) => time => {
+const parseTime = (now: moment) => (time: string | false) => {
   // either pass `false` through or return a parsed time
   if (time === false) {
     return false
@@ -64,18 +65,101 @@ const parseTime = (now: moment) => time => {
   )
 }
 
-export class BusLine extends React.PureComponent {
-  props: {line: BusLineType, now: moment, openMap: () => any}
+type Props = {
+  line: BusLineType,
+  now: moment,
+  openMap: () => any,
+}
+
+type State = {
+  schedule: ?BusScheduleType,
+  scheduledMoments: Array<FancyBusTimeListType>,
+  currentMoments: FancyBusTimeListType,
+  stopTitleTimePairs: Array<[string, moment]>,
+}
+
+export class BusLine extends React.Component<void, Props, State> {
+  state = {
+    schedule: null,
+    scheduledMoments: [],
+    currentMoments: [],
+    stopTitleTimePairs: [],
+    firstUpdate: true,
+  }
+
+  componentWillMount() {
+    this.setStateFromProps(this.props)
+  }
+
+  componentWillReceiveProps(nextProps: Props) {
+    this.setStateFromProps(nextProps)
+  }
+
+  shouldComponentUpdate(nextProps: Props, nextState: State) {
+    // We won't check the time in shouldComponentUpdate, because we really
+    // only care if the bus information has changed, and this is called after
+    // setStateFromProps runs.
+
+    return (
+      this.props.line !== nextProps.line ||
+      this.props.openMap !== nextProps.openMap ||
+      !isEqual(this.state.currentMoments, nextState.currentMoments)
+    )
+  }
+
+  setStateFromProps = (nextProps: Props) => {
+    if (
+      this.props.now.isSame(nextProps.now, 'minute') &&
+      !this.state.firstUpdate
+    ) {
+      return
+    }
+
+    const {line, now} = nextProps
+
+    const schedule = getScheduleForNow(line.schedules, now)
+    if (!schedule) {
+      return
+    }
+
+    const parseTimes = timeset => timeset.map(parseTime(now))
+    const scheduledMoments: Array<FancyBusTimeListType> = schedule.times.map(
+      parseTimes,
+    )
+
+    const currentMoments: FancyBusTimeListType = getSetOfStopsForNow(
+      scheduledMoments,
+      now,
+    )
+
+    const stopTitleTimePairs: Array<[string, moment]> = zip(
+      schedule.stops,
+      currentMoments,
+    )
+
+    this.setState(() => ({
+      schedule,
+      scheduledMoments,
+      currentMoments,
+      stopTitleTimePairs,
+      firstUpdate: false,
+    }))
+  }
 
   render() {
     const {line, now} = this.props
+    const {
+      schedule,
+      scheduledMoments,
+      currentMoments,
+      stopTitleTimePairs,
+    } = this.state
 
     // grab the colors (with fallbacks) via _.get
     const barColor = get(barColors, line.line, c.black)
     const currentStopColor = get(stopColors, line.line, c.gray)
     const androidColor = Platform.OS === 'android' ? {color: barColor} : null
 
-    const schedule = getScheduleForNow(line.schedules, now)
     if (!schedule) {
       return (
         <View>
@@ -87,19 +171,9 @@ export class BusLine extends React.PureComponent {
       )
     }
 
-    const scheduledMoments: FancyBusTimeListType[] = schedule.times.map(
-      timeset => timeset.map(parseTime(now)),
-    )
-
-    const moments: FancyBusTimeListType = getSetOfStopsForNow(
-      scheduledMoments,
-      now,
-    )
-    const pairs: [[string, moment]] = zip(schedule.stops, moments)
-
-    const timesIndex = scheduledMoments.indexOf(moments)
+    const timesIndex = scheduledMoments.indexOf(currentMoments)
     const isLastBus = timesIndex === scheduledMoments.length - 1
-    const subtitle = makeSubtitle({now, moments, isLastBus})
+    const subtitle = makeSubtitle({now, moments: currentMoments, isLastBus})
 
     return (
       <View>
@@ -109,7 +183,7 @@ export class BusLine extends React.PureComponent {
           titleStyle={androidColor}
         />
 
-        {pairs.map(([placeTitle, moment], i, list) =>
+        {stopTitleTimePairs.map(([placeTitle, moment], i, list) =>
           <View key={i}>
             <BusStopRow
               // get the arrival time for this stop from each bus loop after