Merge branch 'develop' into conf/droidcon-turin-2018

Author: rock3r

app/build.gradle

@@ -25,8 +25,8 @@ android {
     compileSdkVersion Integer.parseInt(project.COMPILE_SDK_VERSION)
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
 
     defaultConfig {
@@ -153,6 +153,7 @@ dependencies {
 
     implementation libraries.app.jodaTimeAndroid
     implementation libraries.app.kotlin
+    implementation libraries.app.kotlinReflect
 
     implementation libraries.app.playServicesAuth
     implementation libraries.app.rxJava

app/proguard-rules.pro

@@ -1,6 +1,27 @@
 -dontobfuscate
 
--keep class com.bumptech.glide.load.model.stream.StreamModelLoader
--dontwarn com.bumptech.glide.load.model.stream.StreamModelLoader
+# Glide rules
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
 
+# Preserve API models
 -keep class net.squanchy.service.firebase.model.** { *; }
+
+# Moshi rules
+-dontwarn okio.**
+-dontwarn javax.annotation.**
+-keepclasseswithmembers class * {
+    @com.squareup.moshi.* <methods>;
+}
+-keep @com.squareup.moshi.JsonQualifier interface *
+
+-keepclassmembers class kotlin.Metadata {
+    public <methods>;
+}
+
+# Arrow rules
+-dontwarn java.util.concurrent.**

app/src/main/java/net/squanchy/favorites/FavoritesPageView.kt

@@ -80,10 +80,6 @@ class FavoritesPageView @JvmOverloads constructor(
                 showSettings()
                 true
             }
-            R.id.action_filter -> {
-                navigator.toScheduleFiltering(context)
-                true
-            }
             else -> false
         }
     }

app/src/main/java/net/squanchy/navigation/Navigator.kt

@@ -1,7 +1,6 @@
 package net.squanchy.navigation
 
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
@@ -21,6 +20,7 @@ import net.squanchy.settings.SettingsActivity
 import net.squanchy.signin.SignInActivity
 import net.squanchy.signin.SignInOrigin
 import net.squanchy.speaker.SpeakerDetailsActivity
+import net.squanchy.support.widget.OriginCoordinates
 import net.squanchy.tweets.domain.TweetLinkInfo
 import net.squanchy.venue.domain.view.Venue
 import timber.log.Timber
@@ -62,8 +62,8 @@ class Navigator(
         attemptDeeplinkOrFallback(deeplinkStatusUrl, fallbackStatusUrl)
     }
 
-    fun toScheduleFiltering(ctx: Context) {
-        start(Intent(ctx, ScheduleTracksFilterActivity::class.java))
+    fun toScheduleFiltering(originCoordinates: OriginCoordinates?) {
+        start(ScheduleTracksFilterActivity.createIntent(activity, originCoordinates))
     }
 
     private fun attemptDeeplinkOrFallback(deeplinkUrl: String, fallbackUrl: String) {

app/src/main/java/net/squanchy/schedule/SchedulePageView.kt

@@ -25,6 +25,7 @@ import net.squanchy.support.text.applyTypeface
 import net.squanchy.support.text.getFontFor
 import net.squanchy.support.text.hasTypefaceSpan
 import net.squanchy.support.unwrapToActivityContext
+import net.squanchy.support.widget.calculateMenuItemCenterCoordinates
 import timber.log.Timber
 
 class SchedulePageView @JvmOverloads constructor(
@@ -64,6 +65,8 @@ class SchedulePageView @JvmOverloads constructor(
     private fun setupToolbar() {
         toolbar.setTitle(R.string.activity_schedule)
         toolbar.inflateMenu(R.menu.homepage)
+        toolbar.menu.findItem(R.id.action_filter).isVisible = true
+
         toolbar.setOnMenuItemClickListener { item ->
             when (item.itemId) {
                 R.id.action_search -> {
@@ -75,7 +78,7 @@ class SchedulePageView @JvmOverloads constructor(
                     true
                 }
                 R.id.action_filter -> {
-                    navigate.toScheduleFiltering(context)
+                    navigate.toScheduleFiltering(toolbar.calculateMenuItemCenterCoordinates(R.id.action_filter))
                     true
                 }
                 else -> false

app/src/main/java/net/squanchy/schedule/tracksfilter/ScheduleTracksFilter.kt

@@ -1,5 +1,7 @@
 package net.squanchy.schedule.tracksfilter
 
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.View
@@ -21,7 +23,7 @@ import net.squanchy.R
 import net.squanchy.schedule.domain.view.Track
 import net.squanchy.service.repository.TracksRepository
 import net.squanchy.support.view.setAdapterIfNone
-import java.util.concurrent.atomic.AtomicBoolean
+import net.squanchy.support.widget.OriginCoordinates
 import kotlin.math.hypot
 
 class ScheduleTracksFilterActivity : AppCompatActivity() {
@@ -35,20 +37,22 @@ class ScheduleTracksFilterActivity : AppCompatActivity() {
     private var subscription: Disposable? = null
     private var checkableTracks: List<CheckableTrack> = emptyList()
 
-    private val needsAppearAnimation: AtomicBoolean = AtomicBoolean(true)
+    private var needsAppearAnimation = true
+    private var appearAnimationOrigin: OriginCoordinates? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_track_filters)
 
         savedInstanceState?.apply {
-            val restoredNeedsAppearAnimation = getBoolean(EXTRA_NEEDS_APPEAR_ANIMATION, true)
-            needsAppearAnimation.set(restoredNeedsAppearAnimation)
+            needsAppearAnimation = getBoolean(EXTRA_NEEDS_APPEAR_ANIMATION, true)
+            appearAnimationOrigin = getParcelable(EXTRA_APPEAR_ANIMATION_ORIGIN)
         }
 
-        backgroundDim.setOnClickListener { animateDisappearance() }
-        closeButton.setOnClickListener { animateDisappearance() }
+        appearAnimationOrigin = appearAnimationOrigin ?: intent.getParcelableExtra(EXTRA_APPEAR_ANIMATION_ORIGIN)
+
+        backgroundDim.setOnClickListener { closeFilters() }
 
         val component = tracksFilterComponent(this)
         tracksRepository = component.tracksRepository()
@@ -68,14 +72,18 @@ class ScheduleTracksFilterActivity : AppCompatActivity() {
         trackFiltersList.itemAnimator = null
     }
 
-    private fun Set<Track>.addOrRemove(track: Track, selected: Boolean): Set<Track> =
-        if (selected) this + track else this - track
+    private fun closeFilters() {
+        if (appearAnimationOrigin == null) {
+            finish()
+        } else {
+            animateDisappearance(appearAnimationOrigin!!)
+        }
+    }
 
-    private fun animateDisappearance() {
+    private fun animateDisappearance(origin: OriginCoordinates) {
         backgroundDim.isEnabled = false
 
-        val centerX = closeButton.x + closeButton.width / 2
-        val centerY = closeButton.y + closeButton.height / 2
+        val (centerX, centerY) = origin
 
         ViewAnimationUtils.createCircularReveal(
             filtersRoot,
@@ -93,12 +101,16 @@ class ScheduleTracksFilterActivity : AppCompatActivity() {
         }.start()
     }
 
+    private fun Set<Track>.addOrRemove(track: Track, selected: Boolean): Set<Track> =
+        if (selected) this + track else this - track
+
     override fun onStart() {
         super.onStart()
 
-        if (needsAppearAnimation.getAndSet(false)) {
+        if (needsAppearAnimation && appearAnimationOrigin != null) {
+            needsAppearAnimation = false
             prepareAppearAnimation()
-            filtersRoot.postOnAnimation { animateAppearing() }
+            filtersRoot.postOnAnimation { animateAppearing(appearAnimationOrigin!!) }
         }
 
         subscription = Observable.combineLatest(tracksRepository.tracks(), tracksFilter.selectedTracks, combineIntoCheckableTracks())
@@ -113,10 +125,32 @@ class ScheduleTracksFilterActivity : AppCompatActivity() {
             }
     }
 
+    private fun prepareAppearAnimation() {
+        appearInterpolator = AnimationUtils.loadInterpolator(this, android.R.interpolator.linear_out_slow_in)
+        filtersRoot.visibility = View.VISIBLE
+
+        val titleDeltaY = resources.getDimension(R.dimen.track_filters_title_appear_delta_y)
+        dialogTitle.apply {
+            translationY = -titleDeltaY
+            alpha = 0F
+        }
+
+        val subtitleDeltaY = resources.getDimension(R.dimen.track_filters_subtitle_appear_delta_y)
+        dialogSubtitle.apply {
+            translationY = -subtitleDeltaY
+            alpha = 0F
+        }
+
+        val tracksDeltaY = resources.getDimension(R.dimen.track_filters_tracks_appear_delta_y)
+        trackFiltersList.apply {
+            translationY = -tracksDeltaY
+            alpha = 0F
+        }
+    }
+
     @Suppress("MagicNumber") // Just animation code… needs a few magic numbers
-    private fun animateAppearing() {
-        val centerX = closeButton.x + closeButton.width / 2
-        val centerY = closeButton.y + closeButton.height / 2
+    private fun animateAppearing(origin: OriginCoordinates) {
+        val (centerX, centerY) = origin
 
         ViewAnimationUtils.createCircularReveal(
             filtersRoot,
@@ -146,29 +180,6 @@ class ScheduleTracksFilterActivity : AppCompatActivity() {
         .setStartDelay(delay)
         .start()
 
-    private fun prepareAppearAnimation() {
-        appearInterpolator = AnimationUtils.loadInterpolator(this, android.R.interpolator.linear_out_slow_in)
-        filtersRoot.visibility = View.VISIBLE
-
-        val titleDeltaY = resources.getDimension(R.dimen.track_filters_title_appear_delta_y)
-        dialogTitle.apply {
-            translationY = -titleDeltaY
-            alpha = 0F
-        }
-
-        val subtitleDeltaY = resources.getDimension(R.dimen.track_filters_subtitle_appear_delta_y)
-        dialogSubtitle.apply {
-            translationY = -subtitleDeltaY
-            alpha = 0F
-        }
-
-        val tracksDeltaY = resources.getDimension(R.dimen.track_filters_tracks_appear_delta_y)
-        trackFiltersList.apply {
-            translationY = -tracksDeltaY
-            alpha = 0F
-        }
-    }
-
     private fun combineIntoCheckableTracks(): BiFunction<List<Track>, Set<Track>, List<CheckableTrack>> {
         return BiFunction { tracks, selectedTracks ->
             tracks.map { track -> CheckableTrack(track, selectedTracks.contains(track)) }
@@ -177,7 +188,8 @@ class ScheduleTracksFilterActivity : AppCompatActivity() {
 
     override fun onSaveInstanceState(outState: Bundle?) {
         super.onSaveInstanceState(outState)
-        outState?.putBoolean(EXTRA_NEEDS_APPEAR_ANIMATION, needsAppearAnimation.get())
+        outState?.putBoolean(EXTRA_NEEDS_APPEAR_ANIMATION, needsAppearAnimation)
+        outState?.putParcelable(EXTRA_APPEAR_ANIMATION_ORIGIN, appearAnimationOrigin)
     }
 
     override fun onStop() {
@@ -187,5 +199,12 @@ class ScheduleTracksFilterActivity : AppCompatActivity() {
 
     companion object {
         private const val EXTRA_NEEDS_APPEAR_ANIMATION = "ScheduleTracksFilterActivity.EXTRA_NEEDS_APPEAR_ANIMATION"
+        private const val EXTRA_APPEAR_ANIMATION_ORIGIN = "ScheduleTracksFilterActivity.EXTRA_APPEAR_ANIMATION_ORIGIN"
+
+        fun createIntent(context: Context, originCoordinates: OriginCoordinates?): Intent {
+            return Intent(context, ScheduleTracksFilterActivity::class.java).apply {
+                putExtra(EXTRA_APPEAR_ANIMATION_ORIGIN, originCoordinates)
+            }
+        }
     }
 }

app/src/main/java/net/squanchy/search/SearchActivity.kt

@@ -211,10 +211,10 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
         searchField.setText("")
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == SPEECH_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
-            val results = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
-            searchField.setText(results[0])
+            val results = data?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
+            if (results != null) searchField.setText(results[0])
             return
         }
         super.onActivityResult(requestCode, resultCode, data)

app/src/main/java/net/squanchy/service/firebase/model/schedule/FirestoreSchedule.kt

@@ -1,17 +1,20 @@
 package net.squanchy.service.firebase.model.schedule
 
+import com.google.firebase.firestore.IgnoreExtraProperties
 import java.util.Date
 
 class FirestoreSchedulePage {
     lateinit var day: FirestoreDay
     var events: List<FirestoreEvent> = emptyList()
 }
 
+@IgnoreExtraProperties
 class FirestoreDay {
     lateinit var id: String
     lateinit var date: Date
 }
 
+@IgnoreExtraProperties
 class FirestoreEvent {
     lateinit var id: String
     lateinit var title: String

app/src/main/java/net/squanchy/signin/SignInActivity.kt

@@ -92,7 +92,7 @@ class SignInActivity : AppCompatActivity() {
         window.setGravity(Gravity.FILL_HORIZONTAL or Gravity.BOTTOM)
     }
 
-    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
         if (requestCode == RC_SIGN_IN) {

app/src/main/java/net/squanchy/speaker/widget/SpeakerDetailsLayout.kt

@@ -1,21 +1,13 @@
 package net.squanchy.speaker.widget
 
 import android.content.Context
+import android.support.constraint.ConstraintLayout
 import android.util.AttributeSet
-import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.activity_speaker_details.view.*
 import net.squanchy.speaker.domain.view.Speaker
 import net.squanchy.support.text.parseHtml
 
-class SpeakerDetailsLayout(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs) {
-
-    init {
-        super.setOrientation(LinearLayout.VERTICAL)
-    }
-
-    override fun setOrientation(orientation: Int): Nothing {
-        throw UnsupportedOperationException("Changing orientation is not supported for SpeakerDetailsLayout")
-    }
+class SpeakerDetailsLayout(context: Context, attrs: AttributeSet) : ConstraintLayout(context, attrs) {
 
     fun updateWith(speaker: Speaker) {
         speakerDetailsHeader.updateWith(speaker)