updates glide library and fixes image cropping problems on conference tiles

Author: stefanmedack

app/build.gradle

@@ -16,7 +16,7 @@ ext {
     crashlyticsVersion = "2.9.0"
     daggerVersion = "2.14.1"
     exoplayerVersion = "2.7.0"
-    glideVersion = "3.8.0"
+    glideVersion = "4.6.1"
     gsonVersion = "2.8.2"
     playServicesVersion = "11.4.0"
     rxAndroidVersion = "2.0.2"

app/src/main/java/de/stefanmedack/ccctv/ui/cards/ConferenceCardPresenter.kt

@@ -6,6 +6,7 @@ import android.support.v4.content.ContextCompat
 import android.support.v7.view.ContextThemeWrapper
 import android.view.ViewGroup
 import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
 import de.stefanmedack.ccctv.R
 import de.stefanmedack.ccctv.persistence.entities.Conference
 import kotlin.properties.Delegates
@@ -34,13 +35,18 @@ class ConferenceCardPresenter : Presenter() {
 
     override fun onBindViewHolder(viewHolder: Presenter.ViewHolder, item: Any) {
         if (item is Conference) {
+            val width = viewHolder.view.resources.getDimensionPixelSize(R.dimen.grid_card_width)
+            val height = viewHolder.view.resources.getDimensionPixelSize(R.dimen.grid_card_height)
             (viewHolder.view as ImageCardView).let {
                 it.titleText = item.title
                 it.contentText = item.acronym
-                Glide.with(viewHolder.view.context)
+                Glide.with(viewHolder.view)
                         .load(item.logoUrl)
-                        .fitCenter() // TODO check why fitCenter does not work
-                        .error(R.drawable.voctocat)
+                        .apply(RequestOptions()
+                                .error(R.drawable.voctocat)
+                                .override(width, height)
+                                .centerInside()
+                        )
                         .into(it.mainImageView)
             }
         }

app/src/main/java/de/stefanmedack/ccctv/ui/cards/EventCardPresenter.kt

@@ -6,6 +6,7 @@ import android.support.v4.content.ContextCompat
 import android.support.v7.view.ContextThemeWrapper
 import android.view.ViewGroup
 import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
 import de.stefanmedack.ccctv.R
 import de.stefanmedack.ccctv.persistence.entities.Event
 import de.stefanmedack.ccctv.util.stripHtml
@@ -38,10 +39,12 @@ class EventCardPresenter : Presenter() {
             (viewHolder.view as ImageCardView).let {
                 it.titleText = item.title.stripHtml()
                 it.contentText = item.description.stripHtml()
-                Glide.with(viewHolder.view.context)
+                Glide.with(viewHolder.view)
                         .load(item.thumbUrl)
-                        .centerCrop()
-                        .error(R.drawable.voctocat)
+                        .apply(RequestOptions()
+                                .error(R.drawable.voctocat)
+                                .centerCrop()
+                        )
                         .into(it.mainImageView)
             }
         }

app/src/main/java/de/stefanmedack/ccctv/ui/cards/StreamCardPresenter.kt

@@ -6,6 +6,7 @@ import android.support.v4.content.ContextCompat
 import android.support.v7.view.ContextThemeWrapper
 import android.view.ViewGroup
 import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
 import de.stefanmedack.ccctv.R
 import info.metadude.java.library.brockman.models.Stream
 import kotlin.properties.Delegates
@@ -37,10 +38,12 @@ class StreamCardPresenter(val thumbPictureUrl: String) : Presenter() {
             (viewHolder.view as ImageCardView).let {
                 it.titleText = item.display
                 it.contentText = item.slug
-                Glide.with(viewHolder.view.context)
+                Glide.with(viewHolder.view)
                         .load(thumbPictureUrl)
-                        .centerCrop()
-                        .error(R.drawable.voctocat)
+                        .apply(RequestOptions()
+                                .error(R.drawable.voctocat)
+                                .centerCrop()
+                        )
                         .into(it.mainImageView)
             }
         }

app/src/main/java/de/stefanmedack/ccctv/ui/detail/DetailFragment.kt

@@ -3,6 +3,7 @@ package de.stefanmedack.ccctv.ui.detail
 import android.arch.lifecycle.ViewModelProvider
 import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
+import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.support.v17.leanback.app.DetailsSupportFragment
@@ -13,9 +14,9 @@ import android.view.KeyEvent
 import android.view.View
 import android.widget.Toast
 import com.bumptech.glide.Glide
-import com.bumptech.glide.load.resource.drawable.GlideDrawable
-import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.transition.Transition
 import dagger.android.support.AndroidSupportInjection
 import de.stefanmedack.ccctv.R
 import de.stefanmedack.ccctv.persistence.entities.Event
@@ -113,15 +114,14 @@ class DetailFragment : DetailsSupportFragment() {
     private fun showPoster(context: Context, detailsOverview: DetailsOverviewRow) {
         detailsOverview.imageDrawable = ContextCompat.getDrawable(context, R.drawable.voctocat)
 
-        Glide.with(activity)
+        Glide.with(this)
                 .load(arguments?.getString(EVENT_PICTURE))
-                .centerCrop()
-                .error(R.drawable.voctocat)
-                .into<SimpleTarget<GlideDrawable>>(object : SimpleTarget<GlideDrawable>(
-                        resources.getDimensionPixelSize(R.dimen.event_card_width),
-                        resources.getDimensionPixelSize(R.dimen.event_card_height)) {
-                    override fun onResourceReady(resource: GlideDrawable,
-                                                 glideAnimation: GlideAnimation<in GlideDrawable>) {
+                .apply(RequestOptions()
+                        .error(R.drawable.voctocat)
+                        .centerCrop()
+                )
+                .into(object : SimpleTarget<Drawable>() {
+                    override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
                         detailsOverview.imageDrawable = resource
                     }
                 })

app/src/main/java/de/stefanmedack/ccctv/ui/events/EventsFragment.kt

@@ -14,9 +14,11 @@ import android.util.DisplayMetrics
 import android.view.View
 import android.widget.Toast
 import com.bumptech.glide.Glide
-import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.transition.Transition
 import dagger.android.support.AndroidSupportInjection
+import de.stefanmedack.ccctv.R
 import de.stefanmedack.ccctv.model.Resource
 import de.stefanmedack.ccctv.persistence.entities.Event
 import de.stefanmedack.ccctv.ui.cards.EventCardPresenter
@@ -113,13 +115,15 @@ class EventsFragment : VerticalGridSupportFragment() {
 
             val logoUrl = arguments?.getString(CONFERENCE_LOGO_URL)
             if (logoUrl != null) {
-                Glide.with(activityContext)
-                        .load(logoUrl)
+                Glide.with(this)
                         .asBitmap()
-                        .override(width, height)
-                        .fitCenter()
-                        .into<SimpleTarget<Bitmap>>(object : SimpleTarget<Bitmap>(width, height) {
-                            override fun onResourceReady(resource: Bitmap, glideAnimation: GlideAnimation<in Bitmap>) {
+                        .load(logoUrl)
+                        .apply(RequestOptions()
+                                .error(R.drawable.voctocat)
+                                .centerCrop()
+                        )
+                        .into(object : SimpleTarget<Bitmap>(width, height) {
+                            override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
                                 backgroundManager?.setBitmap(darkenBitMap(resource))
                             }
                         })

app/src/main/res/values/styles.xml

@@ -42,6 +42,7 @@
     <style name="GridCardImageStyle" parent="Widget.Leanback.ImageCardView.ImageStyle">
         <item name="android:layout_width">@dimen/grid_card_width</item>
         <item name="android:layout_height">@dimen/grid_card_height</item>
+        <item name="android:scaleType">fitCenter</item>
     </style>
 
     <style name="ConferenceCardStyle" parent="Theme.Leanback">