Merge branch 'develop' into london2017

# Conflicts:
#	gradle.properties
#	team-props/static-analysis/detekt-config.yml

Author: rock3r

app/build.gradle

@@ -7,7 +7,7 @@ buildscript {
 }
 
 plugins {
-    id 'io.gitlab.arturbosch.detekt' version '1.0.0.RC4-3'
+    id 'io.gitlab.arturbosch.detekt'
 }
 
 apply plugin: 'com.android.application'
@@ -67,7 +67,7 @@ android {
         resValueProperty 'deeplink_scheme', (buildProperties.application['deeplinkScheme'] | "squanchy")
     }
 
-    if (System.getenv('CI') == null) {
+    if (isNotRunningOnCI()) {
         signingConfigs {
             config {
                 signingConfigProperties buildProperties.releaseSigningConfig
@@ -100,19 +100,31 @@ android {
     }
 }
 
+private static boolean isNotRunningOnCI() {
+    System.getenv('CI') == null
+}
+
 play {
     jsonFile = teamPropsFile('play-store-keys.json')
 }
 
 detekt {
-    version = '1.0.0.RC4-3'
+    profile = 'main'
 
     profile('main') {
         input = "$projectDir/src/main/java"
         config = teamPropsFile('static-analysis/detekt-config.yml')
         filters = '.*test.*,.*/resources/.*,.*/tmp/.*'
         output = "$projectDir/build/reports/detekt"
     }
+
+    idea {
+        path = "$rootDir/.idea"
+        codeStyleScheme = "$rootDir/.idea/codeStyleSettings.xml"
+        inspectionsProfile = "$rootDir/.idea/inspectionProfiles/Squanchy.xml"
+        report = "$projectDir/build/reports/detekt-idea"
+        mask = "*.kt,"
+    }
 }
 
 project.afterEvaluate {

app/src/main/java/me/eugeniomarletti/renderthread/RenderThreadMethods.java

@@ -22,7 +22,7 @@
 @SuppressLint("PrivateApi")     // This class wraps the private APIs we rely on
 final class RenderThreadMethods {
 
-    private static final int MAX_SUPPORTED_ANDROID_VERSION = 25;
+    private static final int MAX_SUPPORTED_ANDROID_VERSION = 27;
     private static final int MIN_SUPPORTED_ANDROID_VERSION = 21;
 
     @NonNull

app/src/main/java/net/squanchy/home/HomeActivity.java

@@ -116,14 +116,14 @@ private void selectPageFrom(Intent intent, Optional<Bundle> savedState) {
     private void collectPageViewsInto(Map<BottomNavigationSection, View> pageViews) {
         pageViews.put(BottomNavigationSection.SCHEDULE, pageContainer.findViewById(R.id.schedule_content_root));
         pageViews.put(BottomNavigationSection.FAVORITES, pageContainer.findViewById(R.id.favorites_content_root));
-        pageViews.put(BottomNavigationSection.TWEETS, pageContainer.findViewById(R.id.tweets_content_root));
+        pageViews.put(BottomNavigationSection.TWEETS, pageContainer.findViewById(R.id.tweetsContentRoot));
         pageViews.put(BottomNavigationSection.VENUE_INFO, pageContainer.findViewById(R.id.venueContentRoot));
     }
 
     private void collectLoadablesInto(List<Loadable> loadables) {
         loadables.add(pageContainer.findViewById(R.id.schedule_content_root));
         loadables.add(pageContainer.findViewById(R.id.favorites_content_root));
-        loadables.add(pageContainer.findViewById(R.id.tweets_content_root));
+        loadables.add(pageContainer.findViewById(R.id.tweetsContentRoot));
         loadables.add(pageContainer.findViewById(R.id.venueContentRoot));
     }
 

app/src/main/java/net/squanchy/imageloader/SquanchyGlideAppModule.kt

@@ -86,7 +86,7 @@ private class FirebaseImageLoader : ModelLoader<StorageReference, InputStream> {
             try {
                 inputStream?.close()
             } catch (e: IOException) {
-                Timber.w("Could not close stream", e)
+                Timber.w(e, "Could not close stream")
             }
         }
     }

app/src/main/java/net/squanchy/notification/NotificationCreator.kt

@@ -116,7 +116,7 @@ class NotificationCreator(private val context: Context) {
         val eventDetailIntent = EventDetailsActivity.createIntent(context, eventId)
         taskBuilder.addNextIntent(eventDetailIntent)
 
-        return taskBuilder.getPendingIntent(0, PendingIntent.FLAG_CANCEL_CURRENT)
+        return taskBuilder.getPendingIntent(0, PendingIntent.FLAG_CANCEL_CURRENT)!!
     }
 
     private fun getPlaceName(event: Event): String? {
@@ -131,7 +131,7 @@ class NotificationCreator(private val context: Context) {
 
     private fun createPendingIntentForMultipleEvents(): PendingIntent {
         val taskBuilder = createBaseTaskStackBuilder()
-        return taskBuilder.getPendingIntent(0, PendingIntent.FLAG_CANCEL_CURRENT)
+        return taskBuilder.getPendingIntent(0, PendingIntent.FLAG_CANCEL_CURRENT)!!
     }
 
     private fun createBaseTaskStackBuilder(): TaskStackBuilder {
@@ -197,9 +197,7 @@ class NotificationCreator(private val context: Context) {
         private val EVENTS_ABOUT_TO_START_CHANNEL_ID = "events_about_to_start"
 
         // pulsate every 1 second, indicating a relatively high degree of urgency
-        @SuppressWarnings("MagicNumber")
         private val NOTIFICATION_LED_ON_MS = 100
-        @SuppressWarnings("MagicNumber")
         private val NOTIFICATION_LED_OFF_MS = 1000
         private val ARGB_TRANSPARENT = "#00000000"
     }

app/src/main/java/net/squanchy/notification/NotificationsIntentService.kt

@@ -88,7 +88,6 @@ class NotificationsIntentService : IntentService(NotificationsIntentService::cla
     }
 
     companion object {
-        @SuppressWarnings("MagicNumber")
         private val NOTIFICATION_INTERVAL_MINUTES = 10
         private val SHOW_NOTIFICATIONS_DEFAULT = true
     }

app/src/main/java/net/squanchy/notification/Notifier.kt

@@ -19,7 +19,6 @@ class Notifier(private val notificationManagerCompat: NotificationManagerCompat)
     }
 
     companion object {
-        @SuppressWarnings("MagicNumber")
         private val SINGLE_NOTIFICATION_ID = 42
     }
 }

app/src/main/java/net/squanchy/support/ContextUnwrapper.java

@@ -0,0 +1,15 @@
+@file:JvmName("ContextUnwrapper")
+package net.squanchy.support
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.support.v7.app.AppCompatActivity
+
+tailrec fun unwrapToActivityContext(context: Context?): AppCompatActivity =
+    when (context) {
+        null -> throw IllegalArgumentException("Context must not be null")
+        is AppCompatActivity -> context
+        is ContextWrapper -> unwrapToActivityContext(context.baseContext)
+        else -> throw IllegalArgumentException("Context type not supported: ${context.javaClass.canonicalName}")
+    }
+

app/src/main/java/net/squanchy/support/ContextUnwrapper.kt

@@ -52,7 +52,7 @@ public void animateToColor(@ColorInt int newColor, @IntRange(from = 0) int durat
         revealDuration = durationMillis;
         pendingTargetColor = newColor;
         startAnimationOnNextDraw = true;
-        setColor(pendingTargetColor);
+        setColor(targetColor);
     }
 
     @Override