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

Author: rock3r

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

@@ -46,13 +46,16 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
     private lateinit var searchTextWatcher: SearchTextWatcher
 
     private var hasQuery: Boolean = false
+    private lateinit var initialQuery: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_search)
         enableLightNavigationBar(this)
         setupToolbar()
 
+        initialQuery = savedInstanceState?.getString(QUERY_KEY) ?: ""
+
         with(searchComponent(this)) {
             searchService = service()
             navigator = navigator()
@@ -74,7 +77,7 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
 
         val searchSubscription = querySubject.throttleLast(QUERY_DEBOUNCE_TIMEOUT, TimeUnit.MILLISECONDS)
             .doOnNext(::updateSearchActionIcon)
-            .startWith(getInitialQuery())
+            .startWith(initialQuery)
             .flatMap(searchService::find)
             .distinctUntilChanged()
             .subscribeOn(Schedulers.io())
@@ -93,11 +96,6 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
         searchField.requestFocus()
     }
 
-    private fun getInitialQuery(): String {
-        val text = searchField.text
-        return text?.toString() ?: EMPTY_QUERY
-    }
-
     private fun updateSearchActionIcon(query: String) {
         hasQuery = query.isNotEmpty()
         invalidateOptionsMenu()
@@ -122,9 +120,8 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
         } else {
             emptyView.isInvisible = true
             searchRecyclerView.isVisible = true
-
-            searchRecyclerView.updateWith(searchResult, this)
         }
+        searchRecyclerView.updateWith(searchResult, this)
     }
 
     private fun onSearchError() {
@@ -192,6 +189,11 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle?) {
+        outState?.putString(QUERY_KEY, searchField.text?.toString())
+        super.onSaveInstanceState(outState)
+    }
+
     private fun onVoiceSearchClicked() {
         Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
             putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 1)
@@ -245,6 +247,6 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
         private const val SPEECH_REQUEST_CODE = 100
         private const val QUERY_DEBOUNCE_TIMEOUT = 250L
         private const val MIN_QUERY_LENGTH = 2
-        private const val EMPTY_QUERY = ""
+        private const val QUERY_KEY = "SearchActivity.query_key"
     }
 }

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

@@ -3,16 +3,16 @@ package net.squanchy.search
 import io.reactivex.Observable
 import io.reactivex.functions.Function3
 import net.squanchy.schedule.domain.view.Event
+import net.squanchy.search.SearchListElement.AlgoliaLogo
+import net.squanchy.search.SearchListElement.EventElement
+import net.squanchy.search.SearchListElement.EventHeader
+import net.squanchy.search.SearchListElement.SpeakerElement
+import net.squanchy.search.SearchListElement.SpeakerHeader
 import net.squanchy.search.algolia.AlgoliaSearchEngine
 import net.squanchy.search.algolia.model.AlgoliaSearchResult
-import net.squanchy.search.algolia.model.AlgoliaSearchResult.QueryNotLongEnough
 import net.squanchy.search.algolia.model.AlgoliaSearchResult.ErrorSearching
 import net.squanchy.search.algolia.model.AlgoliaSearchResult.Matches
-import net.squanchy.search.SearchListElement.SpeakerHeader
-import net.squanchy.search.SearchListElement.EventHeader
-import net.squanchy.search.SearchListElement.SpeakerElement
-import net.squanchy.search.SearchListElement.AlgoliaLogo
-import net.squanchy.search.SearchListElement.EventElement
+import net.squanchy.search.algolia.model.AlgoliaSearchResult.QueryNotLongEnough
 import net.squanchy.service.repository.AuthService
 import net.squanchy.service.repository.EventRepository
 import net.squanchy.service.repository.SpeakerRepository
@@ -51,7 +51,7 @@ class SearchService(
     }
 
     private fun createResultForQueryNotLongEnough(speakers: List<Speaker>): List<SearchListElement> {
-        return listOf(SpeakerHeader) + speakers.map(::SpeakerElement)
+        return listOf(SpeakerHeader) + speakers.map(::SpeakerElement).sortedBy { it.speaker.name }
     }
 
     private fun createResultForSuccessfulSearch(events: List<Event>, speakers: List<Speaker>): List<SearchListElement> {

app/src/main/java/net/squanchy/search/view/GridSpanSizeLookup.kt

@@ -3,14 +3,22 @@ package net.squanchy.search.view
 import android.support.v7.widget.GridLayoutManager
 import net.squanchy.search.SearchListElement
 
-internal class GridSpanSizeLookup(private val items: List<SearchListElement>, private val columnCount: Int) : GridLayoutManager.SpanSizeLookup() {
+internal class GridSpanSizeLookup(
+    private val itemRetriever: (Int) -> SearchListElement,
+    private val isAdapterEmpty: () -> Boolean,
+    private val columnCount: Int
+) : GridLayoutManager.SpanSizeLookup() {
 
     init {
         super.setSpanIndexCacheEnabled(true)
     }
 
     override fun getSpanSize(position: Int): Int {
-        return if (items.isEmpty()) SINGLE_COLUMN_SPAN_SIZE else getSpanSizeFor(items[position])
+        if (isAdapterEmpty()) {
+            return SINGLE_COLUMN_SPAN_SIZE
+        } else {
+            return getSpanSizeFor(itemRetriever(position))
+        }
     }
 
     private fun getSpanSizeFor(element: SearchListElement): Int =

app/src/main/java/net/squanchy/search/view/SearchAdapter.kt

@@ -79,7 +79,7 @@ internal class SearchAdapter(activity: AppCompatActivity) : ListAdapter<SearchLi
     }
 
     override fun onBindViewHolder(holder: SearchItemViewHolder, position: Int) {
-        val item = searchResult.elements[position]
+        val item = getItem(position)
         when (item) {
             is SearchListElement.EventHeader -> (holder as HeaderViewHolder).updateWith(HeaderType.EVENTS)
             is SearchListElement.SpeakerHeader -> (holder as HeaderViewHolder).updateWith(HeaderType.SPEAKERS)
@@ -90,9 +90,11 @@ internal class SearchAdapter(activity: AppCompatActivity) : ListAdapter<SearchLi
     }
 
     fun createSpanSizeLookup(columnsCount: Int): GridLayoutManager.SpanSizeLookup {
-        return GridSpanSizeLookup(searchResult.elements, columnsCount)
+        return GridSpanSizeLookup(::getItem, ::isEmpty, columnsCount)
     }
 
+    private fun isEmpty() = itemCount == 0
+
     fun updateWith(searchResult: SearchResult.Success, listener: SearchRecyclerView.OnSearchResultClickListener) {
         this.listener = listener
         this.searchResult = searchResult

app/src/main/java/net/squanchy/search/view/SearchRecyclerView.kt

@@ -12,6 +12,7 @@ import net.squanchy.schedule.domain.view.Event
 import net.squanchy.search.SearchResult
 import net.squanchy.speaker.domain.view.Speaker
 import net.squanchy.support.unwrapToActivityContext
+import net.squanchy.support.view.setAdapterIfNone
 import net.squanchy.support.widget.CardLayout
 
 class SearchRecyclerView @JvmOverloads constructor(
@@ -33,20 +34,16 @@ class SearchRecyclerView @JvmOverloads constructor(
         addItemDecoration(CardOnlySpacingItemDecorator(horizontalSpacing, verticalSpacing))
 
         adapter = SearchAdapter(context.unwrapToActivityContext())
-        setAdapter(adapter)
         clipToPadding = false
     }
 
     fun updateWith(searchResult: SearchResult.Success, listener: OnSearchResultClickListener) {
-        if (getAdapter() == null) {
-            super.setAdapter(adapter)
-        }
+        setAdapterIfNone(adapter)
 
         adapter.updateWith(searchResult, listener)
 
-        val layoutManager = layoutManager as GridLayoutManager
         val spanSizeLookup = adapter.createSpanSizeLookup(COLUMNS_COUNT)
-        layoutManager.spanSizeLookup = spanSizeLookup
+        (layoutManager as GridLayoutManager).spanSizeLookup = spanSizeLookup
     }
 
     interface OnSearchResultClickListener {

dependencies.gradle

@@ -63,7 +63,7 @@ ext {
     ]
 
     buildScript = [
-        android                   : 'com.android.tools.build:gradle:3.1.0',
+        android                   : 'com.android.tools.build:gradle:3.1.1',
         firebase                  : 'com.google.firebase:firebase-plugins:1.1.5',
         googleServices            : 'com.google.gms:google-services:3.2.0',
         gradleStaticAnalysisPlugin: 'com.novoda:gradle-static-analysis-plugin:0.5.2',