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

Author: rock3r

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

@@ -32,6 +32,10 @@ private class GlideImageRequest(private val request: RequestBuilder<Drawable>) :
         request.apply(RequestOptions.errorOf(errorImageResId))
     }
 
+    override fun placeholder(@DrawableRes placeholderImageResId: Int) = apply {
+        request.apply(RequestOptions.placeholderOf(placeholderImageResId))
+    }
+
     override fun into(target: ImageView) {
         request.into(target)
     }

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

@@ -15,5 +15,7 @@ interface ImageRequest {
 
     fun error(@DrawableRes errorImageResId: Int): ImageRequest
 
+    fun placeholder(@DrawableRes placeholderImageResId: Int): ImageRequest
+
     fun into(target: ImageView)
 }

app/src/main/java/net/squanchy/schedule/view/EventItemView.kt

@@ -12,5 +12,5 @@ abstract class EventItemView : CardLayout {
 
     constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
 
-    abstract fun updateWith(event: Event, showRoom: Boolean = false)
+    abstract fun updateWith(event: Event, showRoom: Boolean = false, showDay: Boolean = false)
 }

app/src/main/java/net/squanchy/schedule/view/OtherEventItemView.kt

@@ -14,7 +14,7 @@ class OtherEventItemView @JvmOverloads constructor(
     defStyleAttr: Int = R.attr.cardViewDefaultStyle
 ) : EventItemView(context, attrs, defStyleAttr) {
 
-    override fun updateWith(event: Event, showRoom: Boolean) {
+    override fun updateWith(event: Event, showRoom: Boolean, showDay: Boolean) {
         event.type.ensureSupported()
 
         timestamp.text = startTimeAsFormattedString(event)

app/src/main/java/net/squanchy/schedule/view/TalkEventItemView.kt

@@ -17,10 +17,13 @@ class TalkEventItemView @JvmOverloads constructor(
     defStyleAttr: Int = R.attr.cardViewDefaultStyle
 ) : EventItemView(context, attrs, defStyleAttr) {
 
-    override fun updateWith(event: Event, showRoom: Boolean) {
+    private val timeFormatter = DateTimeFormat.shortTime()
+    private val dateFormatter = DateTimeFormat.forPattern("EEE d")
+
+    override fun updateWith(event: Event, showRoom: Boolean, showDay: Boolean) {
         ensureSupportedType(event.type)
 
-        timestamp.text = startTimeAsFormattedString(event)
+        timestamp.text = startTimeAsFormattedString(event, showDay)
         title.text = event.title
         room.apply {
             text = event.place.orNull().toPlaceLabel()
@@ -47,10 +50,14 @@ class TalkEventItemView @JvmOverloads constructor(
         }
     }
 
-    private fun startTimeAsFormattedString(event: Event): String {
-        val formatter = DateTimeFormat.shortTime()
-            .withZone(event.timeZone)
+    private fun startTimeAsFormattedString(event: Event, showDay: Boolean): String {
+        val timeZone = event.timeZone
+        val startDateTime = event.startTime.toDateTime(timeZone)
+
+        // Note: the space at the end of the template string is not a typo, it separates the date from the time
+        val formattedDate = if (showDay) "${dateFormatter.withZone(timeZone).print(startDateTime)} " else ""
+        val formattedTime = timeFormatter.withZone(timeZone).print(startDateTime)
 
-        return formatter.print(event.startTime.toDateTime())
+        return "$formattedDate$formattedTime"
     }
 }

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

@@ -50,6 +50,7 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         setContentView(R.layout.activity_search)
         enableLightNavigationBar(this)
         setupToolbar()
@@ -245,7 +246,7 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
     companion object {
 
         private const val SPEECH_REQUEST_CODE = 100
-        private const val QUERY_DEBOUNCE_TIMEOUT = 250L
+        private const val QUERY_DEBOUNCE_TIMEOUT = 350L
         private const val MIN_QUERY_LENGTH = 2
         private const val QUERY_KEY = "SearchActivity.query_key"
     }

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

@@ -38,7 +38,10 @@ class SearchItemView @JvmOverloads constructor(
 
         val avatarImageURL = speaker.photoUrl
         if (avatarImageURL.isDefined()) {
-            imageLoader.load(avatarImageURL.getOrThrow()).into(speakerPhoto)
+            imageLoader.load(avatarImageURL.getOrThrow())
+                .placeholder(R.drawable.ic_avatar_placeholder)
+                .error(R.drawable.ic_no_avatar)
+                .into(speakerPhoto)
         } else {
             speakerPhoto.setImageResource(R.drawable.ic_no_avatar)
         }

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

@@ -12,7 +12,6 @@ import net.squanchy.R
 import net.squanchy.imageloader.ImageLoader
 import net.squanchy.imageloader.imageLoaderComponent
 import net.squanchy.schedule.view.EventItemView
-import net.squanchy.search.SearchResult
 import net.squanchy.search.SearchListElement
 import net.squanchy.search.SearchListElement.EventElement
 import net.squanchy.search.SearchListElement.SpeakerElement
@@ -28,8 +27,6 @@ internal class SearchAdapter(activity: AppCompatActivity) : ListAdapter<SearchLi
 
     private lateinit var listener: SearchRecyclerView.OnSearchResultClickListener
 
-    private var searchResult = SearchResult.Success(emptyList())
-
     init {
         this.activity = activity
 
@@ -95,11 +92,18 @@ internal class SearchAdapter(activity: AppCompatActivity) : ListAdapter<SearchLi
 
     private fun isEmpty() = itemCount == 0
 
-    fun updateWith(searchResult: SearchResult.Success, listener: SearchRecyclerView.OnSearchResultClickListener) {
+    fun updateWith(items: List<SearchListElement>, listener: SearchRecyclerView.OnSearchResultClickListener) {
         this.listener = listener
-        this.searchResult = searchResult
+        super.submitList(items)
+    }
 
-        submitList(searchResult.elements)
+    @Deprecated(
+        message = "Use updateWith() instead",
+        replaceWith = ReplaceWith("updateWith(items, onSearchResultClickListener)"),
+        level = DeprecationLevel.ERROR
+    )
+    override fun submitList(items: MutableList<SearchListElement>?) {
+        throw UnsupportedOperationException("Use updateWith() instead")
     }
 
     companion object {

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

@@ -34,7 +34,7 @@ sealed class SearchItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     class SearchEventViewHolder(itemView: EventItemView) : SearchItemViewHolder(itemView) {
 
         fun updateWith(event: Event, listener: (Event) -> Unit) {
-            (itemView as EventItemView).updateWith(event)
+            (itemView as EventItemView).updateWith(event, showRoom = true, showDay = true)
             itemView.setOnClickListener { listener(event) }
         }
     }

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

@@ -21,12 +21,14 @@ class SearchRecyclerView @JvmOverloads constructor(
     defStyle: Int = 0
 ) : RecyclerView(context, attrs, defStyle) {
 
+    private val columnsCount = context.resources.getInteger(R.integer.search_columns_count)
+
     private lateinit var adapter: SearchAdapter
 
     override fun onFinishInflate() {
         super.onFinishInflate()
 
-        val gridLayoutManager = GridLayoutManager(context, COLUMNS_COUNT)
+        val gridLayoutManager = GridLayoutManager(context, columnsCount)
         layoutManager = gridLayoutManager
 
         val horizontalSpacing = resources.getDimensionPixelSize(R.dimen.card_horizontal_margin)
@@ -40,9 +42,9 @@ class SearchRecyclerView @JvmOverloads constructor(
     fun updateWith(searchResult: SearchResult.Success, listener: OnSearchResultClickListener) {
         setAdapterIfNone(adapter)
 
-        adapter.updateWith(searchResult, listener)
+        adapter.updateWith(searchResult.elements, listener)
 
-        val spanSizeLookup = adapter.createSpanSizeLookup(COLUMNS_COUNT)
+        val spanSizeLookup = adapter.createSpanSizeLookup(columnsCount)
         (layoutManager as GridLayoutManager).spanSizeLookup = spanSizeLookup
     }
 
@@ -72,9 +74,4 @@ class SearchRecyclerView @JvmOverloads constructor(
             outRect.set(horizontalSpacing, topSpacing, horizontalSpacing, bottomSpacing)
         }
     }
-
-    companion object {
-
-        private const val COLUMNS_COUNT = 4
-    }
 }