Merge branch 'master' into landscape

* master: (135 commits)
  Ignore errors in the testflight upload process
  use the correct path to report-network-problem
  Remove trailing spaces for prettier
  Rename FilterView to FilterViewComponent
  Pass entire title to filter navigation
  Make the caller provide the entire title
  Interpolate the navigation title
  Rearrange streaming view tabs
  Nix todo section in favor of contributing
  Link the bug/general and bug/layout labels
  Remove touch-id and 3d-touch notes
  Item title for navigation
  Prop type for nav title
  Menu name title as prop in fancy-menu
  Title to filterview navigation options
  fix(package): update react-native-google-analytics-bridge to version 5.3.1
  chore(package): update js-yaml to version 3.10.0
  add shouldComponentUpdate and setStateFromProps to BuildingHoursRow
  remove unneeded Column component from BuildingHoursRow
  switch method of defining props on BuildingHoursRow
  ...

Author: hawkrives

.travis.yml

@@ -111,7 +111,7 @@ before_install:
   - npm config set spin=false
   - npm config set progress=false
 
-  - npm install -g npm@5
+  - npm install -g npm@5.4
   - if [[ $JS ]]; then npm install -g greenkeeper-lockfile@1; fi
 
 install:

Gemfile.lock

@@ -41,7 +41,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.54.2)
+    fastlane (2.55.0)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -63,6 +63,7 @@ GEM
       multi_xml (~> 0.5)
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
       rubyzip (>= 1.1.0, < 2.0.0)
       security (= 0.1.3)
       slack-notifier (>= 1.3, < 2.0.0)
@@ -75,7 +76,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-bugsnag (1.1.0)
     gh_inspector (1.0.3)
-    google-api-client (0.13.3)
+    google-api-client (0.13.4)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.5)
       httpclient (>= 2.8.1, < 3.0)
@@ -128,7 +129,7 @@ GEM
     nanaimo (0.2.3)
     os (0.9.6)
     plist (3.3.0)
-    public_suffix (3.0.0)
+    public_suffix (2.0.5)
     rake (12.0.0)
     representable (3.0.4)
       declarative (< 0.1.0)

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)

android/app/build.gradle

@@ -191,6 +191,7 @@ if (propFile.canRead()) {
 dependencies {
     // please keep this list sorted
     compile project(':bugsnag-react-native')
+    compile project(':react-native-calendar-events')
     compile project(':react-native-custom-tabs')
     compile project(':react-native-device-info')
     compile project(':react-native-google-analytics-bridge')

android/app/src/main/java/com/allaboutolaf/MainActivity.java

@@ -2,6 +2,7 @@
 
 import com.facebook.react.ReactActivity;
 import com.bugsnag.BugsnagReactNative;
+import com.calendarevents.CalendarEventsPackage;
 import android.os.Bundle;
 
 public class MainActivity extends ReactActivity {
@@ -23,4 +24,11 @@ public void onCreate(Bundle savedInstanceState) {
             BugsnagReactNative.start(this);
         }
     }
+
+    // Required for react-native-calendar-events
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        CalendarEventsPackage.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
 }

android/app/src/main/java/com/allaboutolaf/MainApplication.java

@@ -8,9 +8,10 @@
 // keep these sorted alphabetically
 import com.airbnb.android.react.maps.MapsPackage;
 import com.avishayil.rnrestart.ReactNativeRestartPackage;
-import com.bugsnag.BugsnagReactNative;
 import com.brentvatne.react.ReactVideoPackage;
+import com.bugsnag.BugsnagReactNative;
 import com.BV.LinearGradient.LinearGradientPackage;
+import com.calendarevents.CalendarEventsPackage;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
@@ -45,6 +46,7 @@ protected List<ReactPackage> getPackages() {
         new MainReactPackage(),
         // please keep these sorted alphabetically
         BugsnagReactNative.getPackage(),
+        new CalendarEventsPackage(),
         new CustomTabsPackage(),
         new GoogleAnalyticsBridgePackage(),
         new KeychainPackage(),

android/settings.gradle

@@ -5,6 +5,9 @@ include ':app'
 include ':bugsnag-react-native'
 project(':bugsnag-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/bugsnag-react-native/android')
 
+include ':react-native-calendar-events'
+project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android')
+
 include ':react-native-custom-tabs'
 project(':react-native-custom-tabs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-custom-tabs/android')
 

data/building-hours/1-1-cage.yaml

@@ -4,20 +4,15 @@ category: Food
 
 schedule:
   - title: Kitchen
+    notes: The kitchen stops cooking at 8 p.m.
     hours:
-      - {days: [Mo, Tu, We, Th], from: '7:30am', to: '3:00pm'}
-      - {days: [Fr], from: '7:30am', to: '1:00pm'}
+      - {days: [Mo, Tu, We, Th, Fr], from: '7:30am', to: '8:00pm'}
+      - {days: [Sa, Su], from: '9:00am', to: '8:00pm'}
 
-  # - title: Kitchen
-  #   notes: The kitchen stops cooking at 8 p.m.
-  #   hours:
-  #     - {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:
-  #     - {days: [Mo, Tu, We, Th], from: '8:00pm', to: '11:00pm'}
-  #     - {days: [Su], from: '8:00pm', to: '11:00pm'}
+  - title: Late Night
+    hours:
+      - {days: [Mo, Tu, We, Th], from: '8:00pm', to: '11:00pm'}
+      - {days: [Su], from: '8:00pm', to: '11:00pm'}
 
 breakSchedule:
   fall: []
@@ -26,4 +21,8 @@ breakSchedule:
   interim: []
   spring: []
   easter: []
-  summer: []
+  summer:
+    - title: Kitchen
+      hours:
+        - {days: [Mo, Tu, We, Th], from: '7:30am', to: '3:00pm'}
+        - {days: [Fr], from: '7:30am', to: '1:00pm'}

data/building-hours/1-2-pause-kitchen.yaml

@@ -3,24 +3,20 @@ image: pause-kitchen
 category: Food
 
 schedule:
-  - title: Hours
-    notes: The Pause Kitchen is closed for the summer.
-    hours: []
+  - title: Daylight
+    notes: The late night menu starts at 9 p.m.
+    hours:
+      - {days: [Mo], from: '10:30am', to: '12:00am'}
+      - {days: [Tu], from: '11:30am', to: '12:00am'}
+      - {days: [We], from: '10:30am', to: '12:00am'}
+      - {days: [Th], from: '11:30am', to: '12:00am'}
+      - {days: [Fr], from: '10:30am', to: '9:00pm'}
+      - {days: [Sa], from: '11:30am', to: '9:00pm'}
+      - {days: [Su], from: '11:30am', to: '12:00am'}
 
-  # - title: Daylight
-  #   notes: The late night menu starts at 9 p.m.
-  #   hours:
-  #     - {days: [Mo], from: '10:30am', to: '12:00am'}
-  #     - {days: [Tu], from: '11:30am', to: '12:00am'}
-  #     - {days: [We], from: '10:30am', to: '12:00am'}
-  #     - {days: [Th], from: '11:30am', to: '12:00am'}
-  #     - {days: [Fr], from: '10:30am', to: '9:00pm'}
-  #     - {days: [Sa], from: '11:30am', to: '9:00pm'}
-  #     - {days: [Su], from: '11:30am', to: '12:00am'}
-
-  # - title: Late Night
-  #   hours:
-  #     - {days: [Fr, Sa], from: '9:00pm', to: '2:00am'}
+  - title: Late Night
+    hours:
+      - {days: [Fr, Sa], from: '9:00pm', to: '2:00am'}
 
 breakSchedule:
   fall: []
@@ -29,4 +25,7 @@ breakSchedule:
   interim: []
   spring: []
   easter: []
-  summer: []
+  summer:
+    - title: Hours
+      notes: The Pause Kitchen is closed for the summer.
+      hours: []

data/building-hours/1-4-bag-lunch-line.yaml

@@ -3,12 +3,8 @@ category: Food
 
 schedule:
   - title: Hours
-    hours: []
-    notes: The Bag Lunch line is closed for the summer.
-
-  # - title: Hours
-  #   hours:
-  #     - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '2:00pm'}
+    hours:
+      - {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '2:00pm'}
 
 breakSchedule:
   fall: []
@@ -17,4 +13,7 @@ breakSchedule:
   interim: []
   spring: []
   easter: []
-  summer: []
+  summer:
+    - title: Hours
+      hours: []
+      notes: The Bag Lunch line is closed for the summer.