Merge branch 'master' into greenkeeper/monorepo.react-16.4.2

Author: hawkrives

.eslintrc.yaml

@@ -16,6 +16,11 @@ extends:
   - prettier/flowtype
   - prettier/react
 
+settings:
+  react:
+    version: "16.4"
+    flowVersion: "0.67"
+
 env:
   es6: true
   react-native/react-native: true
@@ -82,7 +87,6 @@ rules:
     - warn
     - reservedFirst: true
       ignoreCase: false
-      callbacksLast: true
   react/no-access-state-in-setstate: error
   react/no-did-mount-set-state: error
   react/no-did-update-set-state: error

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
-    atomos (0.1.2)
+    atomos (0.1.3)
     babosa (1.0.2)
     claide (1.0.2)
     colored (1.2)
@@ -27,7 +27,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.3)
-    fastlane (2.100.1)
+    fastlane (2.101.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -42,7 +42,7 @@ GEM
       faraday_middleware (~> 0.9)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.21.2, < 0.22.0)
+      google-api-client (>= 0.21.2, < 0.24.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
@@ -67,21 +67,20 @@ GEM
       git
       xml-simple
     gh_inspector (1.1.3)
-    git (1.4.0)
-    google-api-client (0.21.2)
+    git (1.5.0)
+    google-api-client (0.23.4)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.6.2)
+    googleauth (0.6.4)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
-      os (~> 0.9)
+      os (>= 0.9, < 2.0)
       signet (~> 0.7)
     highline (1.7.10)
     http-cookie (1.0.3)
@@ -90,10 +89,6 @@ GEM
     jaro_winkler (1.5.1)
     json (2.1.0)
     jwt (2.1.0)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
     memoist (0.16.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -104,7 +99,7 @@ GEM
     multipart-post (2.0.0)
     nanaimo (0.2.6)
     naturally (2.2.0)
-    os (0.9.6)
+    os (1.0.0)
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
@@ -118,15 +113,15 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
-    rubocop (0.58.1)
+    rubocop (0.58.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.10.0)
     rubyzip (1.2.1)
     security (0.1.3)
     signet (0.8.1)

android/app/src/main/res/values-v23/styles.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+</resources>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Change the color value for your needs -->
+    <color name="colorAccent">@color/purple</color>
+
+    <!-- this is used (in our app) solely for the app switcher color -->
+    <color name="colorPrimary">#FFC107</color>
+    <!-- this is used when the app is starting to define the status bar color -->
+    <color name="colorPrimaryDark">#C4C4C4</color>
+
+    <color name="black">#242121</color>
+    <color name="darkGray">#53585A</color>
+    <color name="mediumGray">#E0DAD6</color>
+    <color name="lightGray">#F7F5F2</color>
+    <color name="gold">#E3A025</color>
+    <color name="lightGold">#F7C55A</color>
+    <color name="cranberry">#B11556</color>
+    <color name="lime">#A3D65C</color>
+    <color name="orange">#FA8D29</color>
+    <color name="red">#E84A36</color>
+    <color name="lightBlue">#83DBE0</color>
+    <color name="blue">#00ADD9</color>
+    <color name="teal">#00827E</color>
+    <color name="purple">#6E3A5D</color>
+    <color name="navy">#233746</color>
+    <color name="mint">#CFE1D7</color>
+    <color name="white">#FFFFFF</color>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -3,6 +3,9 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
     </style>
 
 </resources>

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0-alpha09'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

fastlane/Appfile

@@ -9,6 +9,6 @@ team_id 'TMK6S7TPX2'
 itc_team_id '118781268'
 
 # This is a private key. It is not included in the repository.
-# Contact odt@stolaf.edu or another admin if you need access.
+# Contact allaboutolaf@stolaf.edu or another admin if you need access.
 json_key_file 'fastlane/play-private-key.json'
 package_name 'com.allaboutolaf'