Merge branch 'master' into ksto-offline

Author: hawkrives

.travis.yml

@@ -27,10 +27,9 @@ matrix:
 
     - &android-base
       os: linux
-      dist: precise
+      dist: trusty
       sudo: required
       language: android
-      jdk: oraclejdk8
       env: [ANDROID=yes, CAN_DEPLOY=yes]
       android:
         components:
@@ -39,7 +38,6 @@ matrix:
           - build-tools-23.0.1
           - build-tools-23.0.2
           - build-tools-25.0.1
-          - build-tools-23.0.3
           - build-tools-25.0.2
           - build-tools-25.0.3
           - build-tools-26.0.1
@@ -121,8 +119,6 @@ install:
   # install fastlane (if at first you don't succeed, try once more)
   - bundle install || bundle install
 
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew install imagemagick; fi
-
 before_script:
   - if [[ $JS ]]; then greenkeeper-lockfile-update; fi
   # Fire up the Android emulator

Gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
-gem "badge"
 gem "fastlane"
 gem "hockeyapp"
 gem "json"

Gemfile.lock

@@ -13,26 +13,20 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
     babosa (1.0.2)
-    badge (0.8.5)
-      curb (~> 0.9)
-      fastimage (>= 1.6)
-      fastlane (>= 2.0)
-      mini_magick (>= 4.5)
     claide (1.0.2)
     colored (1.2)
     colored2 (3.1.2)
     commander-fastlane (4.4.5)
       highline (~> 1.7.2)
     concurrent-ruby (1.0.5)
-    curb (0.9.4)
-    declarative (0.0.9)
+    declarative (0.0.10)
     declarative-option (0.1.0)
     diff-lcs (1.3)
     docile (1.1.5)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.2.1)
-    excon (0.58.0)
+    excon (0.59.0)
     faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
@@ -41,7 +35,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.55.0)
+    fastlane (2.56.0)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -76,7 +70,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-bugsnag (1.1.0)
     gh_inspector (1.0.3)
-    google-api-client (0.13.4)
+    google-api-client (0.13.6)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.5)
       httpclient (>= 2.8.1, < 3.0)
@@ -123,7 +117,7 @@ GEM
     mimemagic (0.3.2)
     mini_magick (4.5.1)
     minitest (5.10.3)
-    multi_json (1.12.1)
+    multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nanaimo (0.2.3)
@@ -190,13 +184,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  badge
   fastlane
   fastlane-plugin-bugsnag
   hockeyapp
   json
   xcodeproj
 
-
 BUNDLED WITH
    1.14.6

android/app/build.gradle

@@ -96,7 +96,7 @@ def enableProguardInReleaseBuilds = false
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "25.0.3"
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.allaboutolaf"
@@ -108,7 +108,7 @@ android {
             abiFilters "armeabi-v7a", "x86"
         }
         manifestPlaceholders = [
-            manifestApplicationId: "${applicationId}",
+            manifestApplicationId: applicationId,
             onesignal_app_id: "aa46a500-ab1c-4127-b9ff-e7373da3ce35",
             onesignal_google_project_number: "185558680648",
             gmaps_key: System.getenv("GMAPS_KEY") ?: "",
@@ -157,7 +157,7 @@ android {
 // borrowed from https://gist.github.com/gabrielemariotti/6856974
 def propFile = new File('android/app//signing.properties')
 if (propFile.canRead()) {
-    def Properties props = new Properties()
+    Properties props = new Properties()
     props.load(new FileInputStream(propFile))
     if (props != null
             && props.containsKey('STORE_FILE')

source/views/contacts/contact-list.js

@@ -93,7 +93,7 @@ export class ContactsListView extends React.PureComponent<void, Props, State> {
   }
 
   renderSectionHeader = ({section: {title}}: any) =>
-    <ListSectionHeader title={title} spacing={{left: 10}} />
+    <ListSectionHeader title={title} />
 
   renderItem = ({item}: {item: ContactType}) =>
     <ContactRow contact={item} onPress={this.onPressContact} />

source/views/streaming/radio.js

@@ -145,9 +145,17 @@ export default class KSTOView extends React.PureComponent<void, Props, State> {
         </View>
 
         <View style={styles.container}>
-          <Title />
+          <View style={styles.titleWrapper}>
+            <Text selectable={true} style={styles.heading}>
+              St. Olaf College Radio
+            </Text>
+            <Text selectable={true} style={styles.subHeading}>
+              KSTO 93.1 FM
+            </Text>
+
+            {error}
+          </View>
 
-          {error}
           {button}
 
           <StreamPlayer
@@ -165,16 +173,6 @@ export default class KSTOView extends React.PureComponent<void, Props, State> {
   }
 }
 
-const Title = () =>
-  <View style={styles.titleWrapper}>
-    <Text selectable={true} style={styles.heading}>
-      St. Olaf College Radio
-    </Text>
-    <Text selectable={true} style={styles.subHeading}>
-      KSTO 93.1 FM
-    </Text>
-  </View>
-
 type StreamPlayerProps = {
   playState: PlayState,
   onWaiting?: () => any,
@@ -420,10 +418,12 @@ const styles = StyleSheet.create({
     textAlign: 'center',
   },
   status: {
-    paddingTop: 10,
     fontWeight: '400',
-    fontSize: 24,
+    fontSize: 18,
+    textAlign: 'center',
     color: c.grapefruit,
+    marginTop: 15,
+    marginBottom: 5,
   },
   webview: {
     display: 'none',