Merge branch 'master' into push-notifications-settings-hawken

hawkrives · hawkrives · commit 7852517d6d5f · 2018-09-08T18:58:13.000-05:00
* master: (28 commits)
  prettify
  remove manual color overrides from Settings
  Hide extraneous black left/right edge borders
  fix up the background color of Section on Android
  show info header for each line
  line messages for each bus
  circle: Upgrade ruby-based builds to use 2.5.1
  circle: Extract HOMEBREW_NO_AUTO_UPDATE to ios environment
  circle: Stop repeating Docker image for ruby builds
  circle: Stop repeating Docker image for node builds
  hours: Fix convenience store hours
  hours: Mark convenience store as open for the year
  hours: Remove opening on Sunday
  hours: Correct user-submitted hours
  hours: Update Post Office hours per user submission
  hours: Update bookstore hours per user submission
  yarn: Poke the lockfile
  yarn: Poke the lockfile
  yarn: Poke the lockfile
  android: Prioritize local repositories over remotes
  ...
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,6 +2,11 @@
 version: 2
 
 x-config:
+  x-images:
+    - &docker-node
+      - image: 'circleci/node:8'
+    - &docker-ruby
+      - image: 'circleci/ruby:2.5.1'
   x-caching:  # caching instructions
     - &save-cache-yarn
       key: 'v3-yarn-dependencies-{{ arch }}-{{ checksum "yarn.lock" }}'
@@ -103,7 +108,7 @@ workflows:
 
 jobs:
   cache-yarn-linux:
-    docker: [{image: 'circleci/node:8'}]
+    docker: *docker-node
     steps:
       - checkout
       - restore_cache: *restore-cache-yarn
@@ -113,7 +118,7 @@ jobs:
       - persist_to_workspace: *persist-workspace-node_modules
 
   cache-bundler-linux:
-    docker: [{image: 'circleci/ruby:2.4'}]
+    docker: *docker-ruby
     steps:
       - checkout
       - run: *set-ruby-version
@@ -125,7 +130,7 @@ jobs:
       - save_cache: *save-cache-bundler
 
   danger:
-    docker: [{image: 'circleci/node:8'}]
+    docker: *docker-node
     environment:
       task: JS-general
     steps:
@@ -134,7 +139,7 @@ jobs:
       - run: *run-danger
 
   flow:
-    docker: [{image: 'circleci/node:8'}]
+    docker: *docker-node
     environment:
       task: JS-flow
     steps:
@@ -146,7 +151,7 @@ jobs:
       - run: *run-danger
 
   jest:
-    docker: [{image: 'circleci/node:8'}]
+    docker: *docker-node
     environment:
       task: JS-jest
       JEST_JUNIT_OUTPUT: ./test-results/jest/junit.xml
@@ -171,7 +176,7 @@ jobs:
             fi
 
   prettier:
-    docker: [{image: 'circleci/node:8'}]
+    docker: *docker-node
     environment:
       task: JS-prettier
     steps:
@@ -189,7 +194,7 @@ jobs:
       - run: *run-danger
 
   eslint:
-    docker: [{image: 'circleci/node:8'}]
+    docker: *docker-node
     environment:
       task: JS-lint
     steps:
@@ -204,7 +209,7 @@ jobs:
           path: ./test-results
 
   data:
-    docker: [{image: 'circleci/node:8'}]
+    docker: *docker-node
     environment:
       task: JS-data
     steps:
@@ -260,7 +265,7 @@ jobs:
       IS_NIGHTLY: '1'
 
   android-bundle:
-    docker: [{image: 'circleci/node:8'}]
+    docker: *docker-node
     environment:
       task: JS-bundle-android
     steps:
@@ -284,6 +289,7 @@ jobs:
       task: IOS
       FASTLANE_SKIP_UPDATE_CHECK: '1'
       FASTLANE_DISABLE_ANIMATION: '1'
+      HOMEBREW_NO_AUTO_UPDATE: 1
       LC_ALL: en_US.UTF-8
       LANG: en_US.UTF-8
     shell: /bin/bash --login -o pipefail
@@ -297,8 +303,8 @@ jobs:
       - restore_cache: *restore-cache-bundler
       - run: bundle check || bundle install --frozen --path ./vendor/bundle
       - save_cache: *save-cache-bundler
-      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew tap wix/brew
-      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install applesimutils
+      - run: brew tap wix/brew
+      - run: brew install applesimutils
       - run: mkdir -p logs/
       - run: *embed-env-vars
       - run:
@@ -322,7 +328,7 @@ jobs:
       IS_NIGHTLY: '1'
 
   ios-bundle:
-    docker: [{image: 'circleci/node:8'}]
+    docker: *docker-node
     environment:
       task: JS-bundle-ios
     steps:
diff --git a/android/app/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png b/android/app/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png
diff --git a/android/app/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png b/android/app/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png b/android/app/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png b/android/app/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png b/android/app/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png
diff --git a/android/build.gradle b/android/build.gradle
@@ -21,20 +21,20 @@ ext {
 
 allprojects {
     repositories {
-        mavenLocal()
-        jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
-        maven {
-            // react-native-custom-tabs requires this maven repository
-            url "https://jitpack.io"
-        }
         maven {
             // Local Maven repo containing AARs with JSC library built for Android, like RN
             url "$rootDir/../node_modules/jsc-android/dist"
         }
+        mavenLocal()
         google()
+        jcenter()
+        maven {
+            // react-native-custom-tabs requires this maven repository
+            url "https://jitpack.io"
+        }
     }
 }
diff --git a/data/building-hours/2-1-bookstore.yaml b/data/building-hours/2-1-bookstore.yaml
@@ -5,9 +5,8 @@ category: Supplies and Books
 schedule:
   - title: Hours
     hours:
-      # - {days: [Mo, Tu, We, Th, Fr], from: '8:00am', to: '5:00pm'}
-      # - {days: [Sa], from: '10:00am', to: '4:00pm'}
-      - {days: [Mo, Tu, We, Th, Fr], from: '8:00am', to: '4:30pm'}
+      - {days: [Mo, Tu, We, Th, Fr], from: '8:00am', to: '6:00pm'}
+      - {days: [Sa], from: '10:00am', to: '4:00pm'}
 
 breakSchedule:
   fall: []
diff --git a/data/building-hours/2-2-convenience-store.yaml b/data/building-hours/2-2-convenience-store.yaml
@@ -4,11 +4,10 @@ category: Supplies and Books
 
 schedule:
   - title: Hours
-    hours: []
-      # - {days: [Mo, Tu, We, Th, Fr], from: '5:00pm', to: '8:00pm'}
-      # - {days: [Sa], from: '4:00pm', to: '8:00pm'}
-      # - {days: [Su], from: '12:00pm', to: '4:00pm'}
-    notes: The convenience store is closed for the summer? They should be open whenever the bookstore is open.
+    hours:
+      - {days: [Mo, Tu, We, Th, Fr], from: '5:00pm', to: '8:00pm'}
+      - {days: [Sa], from: '4:00pm', to: '8:00pm'}
+      - {days: [Su], from: '12:00pm', to: '4:00pm'}
 
 breakSchedule:
   fall: []
diff --git a/data/building-hours/3-1-post-office.yaml b/data/building-hours/3-1-post-office.yaml
@@ -4,12 +4,10 @@ category: Mail and Packages
 
 schedule:
   - title: Hours
-    # closedForChapelTime: true
+    closedForChapelTime: true
     hours:
-      # - {days: [Mo, Tu, We, Th, Fr], from: '8:00am', to: '5:00pm'}
-      # - {days: [Sa], from: '10:00am', to: '1:00pm'}
-      - {days: [Mo, Tu, We, Th], from: '8:00am', to: '3:00pm'}
-      - {days: [Fr], from: '8:00am', to: '12:00pm'}
+      - {days: [Mo, Tu, We, Th, Fr], from: '8:00am', to: '5:00pm'}
+      - {days: [Sa], from: '10:00am', to: '1:00pm'}
 
 breakSchedule:
   fall: []
diff --git a/data/bus-times/blue-line.yaml b/data/bus-times/blue-line.yaml
@@ -2,6 +2,7 @@ line: Blue Line
 colors:
   bar: rgb(103, 153, 170)
   dot: rgb(13, 26, 35)
+notice: Route that services the north part of the city. Normal route service is $1.25.
 schedules:
   - days: [Mo, Tu, We, Th, Fr]
     coordinates:
diff --git a/data/bus-times/express.yaml b/data/bus-times/express.yaml
@@ -2,6 +2,7 @@ line: Express Bus
 colors:
   bar: rgb(134, 198, 124)
   dot: rgb(32, 87, 14)
+notice: Route that services the majority of the city limits. Normal route service is free with a St. Olaf ID.
 schedules:
   - days: [Mo, Tu, We, Th, Fr]
     coordinates:
diff --git a/data/bus-times/red-line.yaml b/data/bus-times/red-line.yaml
@@ -2,6 +2,7 @@ line: Red Line
 colors:
   bar: rgb(233, 87, 95)
   dot: rgb(151, 27, 16)
+notice: Route that services the south part of the city. Normal route service is $1.25.
 schedules:
   - days: [Mo, Tu, We, Th, Fr]
     coordinates: {}
diff --git a/modules/info-header/index.js b/modules/info-header/index.js
@@ -6,7 +6,8 @@ import * as c from '@frogpond/colors'
 const styles = StyleSheet.create({
 	content: {
 		backgroundColor: c.white,
-		borderWidth: StyleSheet.hairlineWidth,
+		borderTopWidth: StyleSheet.hairlineWidth,
+		borderBottomWidth: StyleSheet.hairlineWidth,
 		borderTopColor: c.iosHeaderTopBorder,
 		borderBottomColor: c.iosHeaderBottomBorder,
 		marginBottom: 10,
diff --git a/modules/tableview/index.js b/modules/tableview/index.js
@@ -1,4 +1,26 @@
 // @flow
 
+import * as React from 'react'
+import {Platform} from 'react-native'
+import {androidLightBackground} from '@frogpond/colors'
+
+import {
+	TableView,
+	Section as IosSection,
+	Cell,
+} from 'react-native-tableview-simple'
+
 export * from './cells'
-export {TableView, Section, Cell} from 'react-native-tableview-simple'
+
+let AndroidSection = props => (
+	<IosSection sectionTintColor={androidLightBackground} {...props} />
+)
+let Section
+
+if (Platform.OS === 'android') {
+	Section = AndroidSection
+} else {
+	Section = IosSection
+}
+
+export {TableView, Section, Cell}
diff --git a/package.json b/package.json
@@ -103,7 +103,7 @@
     "bugsnag-react-native": "2.10.2",
     "delay": "4.0.0",
     "events": "3.0.0",
-    "get-urls": "7.2.0",
+    "get-urls": "8.0.0",
     "glamorous-native": "1.4.0",
     "jsc-android": "224109.x.x",
     "keyword-search": "0.1.1",
@@ -135,7 +135,7 @@
     "react-native-tableview-simple": "0.17.5",
     "react-native-typography": "1.3.0",
     "react-native-vector-icons": "5.0.0",
-    "react-navigation": "2.11.2",
+    "react-navigation": "2.13.0",
     "react-navigation-material-bottom-tabs": "0.3.0",
     "react-redux": "5.0.7",
     "redux": "3.7.2",
@@ -165,7 +165,7 @@
     "directory-tree": "2.1.0",
     "eslint": "5.0.1",
     "eslint-config-prettier": "3.0.1",
-    "eslint-plugin-babel": "5.1.0",
+    "eslint-plugin-babel": "5.2.0",
     "eslint-plugin-flowtype": "2.50.0",
     "eslint-plugin-react": "7.11.1",
     "eslint-plugin-react-native": "3.2.0",
@@ -180,7 +180,7 @@
     "pretty-bytes": "5.1.0",
     "pretty-quick": "1.6.0",
     "prop-types": "15.6.2",
-    "react-test-renderer": "16.4.2",
+    "react-test-renderer": "16.5.0",
     "string-natural-compare": "2.0.2",
     "strip-ansi": "4.0.0",
     "xcode": "1.0.0"
diff --git a/source/views/settings/screens/overview/login-credentials.js b/source/views/settings/screens/overview/login-credentials.js
@@ -13,7 +13,6 @@ import {
 import {type ReduxState} from '../../../../redux'
 import {connect} from 'react-redux'
 import noop from 'lodash/noop'
-import {sectionBgColor} from '@frogpond/colors'
 
 type ReduxStateProps = {
 	initialUsername: string,
@@ -72,7 +71,6 @@ class CredentialsLoginSection extends React.Component<Props, State> {
 			<Section
 				footer="St. Olaf login enables the &quot;meals remaining&quot; feature."
 				header="ST. OLAF LOGIN"
-				sectionTintColor={sectionBgColor}
 			>
 				{loggedIn ? (
 					<Cell title={`Logged in as ${username}.`} />
diff --git a/source/views/settings/screens/overview/miscellany.js b/source/views/settings/screens/overview/miscellany.js
@@ -4,7 +4,6 @@ import {Section, PushButtonCell} from '@frogpond/tableview'
 import {type NavigationScreenProp} from 'react-navigation'
 import {trackedOpenUrl} from '@frogpond/open-url'
 import * as Icons from '@hawkrives/react-native-alternate-icons'
-import {sectionBgColor} from '@frogpond/colors'
 import {GH_BASE_URL} from '../../../../lib/constants'
 
 type Props = {navigation: NavigationScreenProp<*>}
@@ -40,7 +39,7 @@ export class MiscellanySection extends React.Component<Props, State> {
 
 	render() {
 		return (
-			<Section header="MISCELLANY" sectionTintColor={sectionBgColor}>
+			<Section header="MISCELLANY">
 				{this.state.canChangeIcon ? (
 					<PushButtonCell
 						onPress={this.onAppIconButton}
diff --git a/source/views/settings/screens/overview/odds-and-ends.js b/source/views/settings/screens/overview/odds-and-ends.js
@@ -5,7 +5,6 @@ import {appVersion, appBuild} from '@frogpond/constants'
 import {setFeedbackStatus} from '../../../../redux/parts/settings'
 import type {ReduxState} from '../../../../redux'
 import {connect} from 'react-redux'
-import {sectionBgColor} from '@frogpond/colors'
 import {type NavigationScreenProp} from 'react-navigation'
 
 type Props = {
@@ -22,7 +21,7 @@ export class OddsAndEndsSection extends React.Component<Props> {
 		let build = appBuild()
 
 		return (
-			<Section header="ODDS &amp; ENDS" sectionTintColor={sectionBgColor}>
+			<Section header="ODDS &amp; ENDS">
 				<Cell cellStyle="RightDetail" detail={version} title="Version" />
 				{build && (
 					<Cell cellStyle="RightDetail" detail={build} title="Build Number" />
diff --git a/source/views/settings/screens/overview/support.js b/source/views/settings/screens/overview/support.js
@@ -7,7 +7,6 @@ import {sendEmail} from '../../../../components/send-email'
 import DeviceInfo from 'react-native-device-info'
 import {appVersion, appBuild} from '@frogpond/constants'
 import {refreshApp} from '../../../../lib/refresh'
-import {sectionBgColor} from '@frogpond/colors'
 
 type Props = {navigation: NavigationScreenProp<*>}
 
@@ -52,7 +51,7 @@ export class SupportSection extends React.Component<Props> {
 
 	render() {
 		return (
-			<Section header="SUPPORT" sectionTintColor={sectionBgColor}>
+			<Section header="SUPPORT">
 				<PushButtonCell onPress={openEmail} title="Contact Us" />
 				<PushButtonCell onPress={this.onFaqButton} title="FAQs" />
 				<PushButtonCell onPress={this.onResetButton} title="Reset Everything" />
diff --git a/source/views/transportation/bus/line.js b/source/views/transportation/bus/line.js
diff --git a/yarn.lock b/yarn.lock
