Glide: Drop unused transitionOptions parameter

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
2023-05-01 19:38:22 +05:30
parent f3d5f627e7
commit 943a1c2d49
11 changed files with 8 additions and 26 deletions
--- a/app/src/main/java/com/aurora/extensions/Glide.kt
+++ b/app/src/main/java/com/aurora/extensions/Glide.kt
@@ -85,49 +85,42 @@ fun ImageView.load(
@JvmSynthetic
 inline fun ImageView.load(
    bitmap: Bitmap?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
    requestOptions: RequestOptions.() -> Unit
 ): CustomViewTarget<ImageView, Drawable> = loadAny(bitmap, requestOptions)

@JvmSynthetic
 inline fun ImageView.load(
    byteArray: ByteArray?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
    requestOptions: RequestOptions.() -> Unit
 ): CustomViewTarget<ImageView, Drawable> = loadAny(byteArray, requestOptions)

@JvmSynthetic
 inline fun ImageView.load(
    drawable: Drawable?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
    requestOptions: RequestOptions.() -> Unit
 ): CustomViewTarget<ImageView, Drawable> = loadAny(drawable, requestOptions)

@JvmSynthetic
 inline fun ImageView.load(
    @RawRes @DrawableRes resourceId: Int?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
    requestOptions: RequestOptions.() -> Unit
 ): CustomViewTarget<ImageView, Drawable> = loadAny(resourceId, requestOptions)

@JvmSynthetic
 inline fun ImageView.load(
    uri: Uri?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
    requestOptions: RequestOptions.() -> Unit
 ): CustomViewTarget<ImageView, Drawable> = loadAny(uri, requestOptions)

@JvmSynthetic
 inline fun ImageView.load(
    string: String?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
    requestOptions: RequestOptions.() -> Unit
 ): CustomViewTarget<ImageView, Drawable> = loadAny(string, requestOptions)

@JvmSynthetic
 inline fun ImageView.load(
    file: File?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
    requestOptions: RequestOptions.() -> Unit
 ): CustomViewTarget<ImageView, Drawable> = loadAny(file, requestOptions)

--- a/app/src/main/java/com/aurora/store/MainActivity.kt
+++ b/app/src/main/java/com/aurora/store/MainActivity.kt
@@ -34,7 +34,6 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.addCallback
 import androidx.annotation.IdRes
-import androidx.annotation.NonNull
 import androidx.core.graphics.ColorUtils
 import androidx.core.view.GravityCompat
 import androidx.navigation.NavController
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt
@@ -31,7 +31,6 @@ import com.aurora.store.R
 import com.aurora.store.databinding.ViewCategoryBinding
 import com.aurora.extensions.clear
 import com.aurora.extensions.load
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions

@ModelView(
    autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT,
@@ -65,7 +64,7 @@ class CategoryView : RelativeLayout {
    @ModelProp
    fun category(category: Category) {
        B.txtName.text = category.title
-        B.imgBackground.load(category.imageUrl, DrawableTransitionOptions.withCrossFade()) {
+        B.imgBackground.load(category.imageUrl) {
        }
    }

--- a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt
@@ -37,7 +37,6 @@ import com.aurora.store.util.CommonUtil.humanReadableByteValue
 import com.aurora.extensions.clear
 import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.tonyodev.fetch2.Status
@@ -84,7 +83,7 @@ class DownloadView : RelativeLayout {
        val app = gson.fromJson(extras, App::class.java)

        app?.let {
-            B.imgDownload.load(app.iconArtwork.url, DrawableTransitionOptions.withCrossFade()) {
+            B.imgDownload.load(app.iconArtwork.url) {
                placeholder(R.drawable.bg_placeholder)
                transform(RoundedCorners(32))
            }
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/EditorImageView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/EditorImageView.kt
@@ -33,7 +33,6 @@ import com.aurora.extensions.clear
 import com.aurora.extensions.load
 import com.aurora.extensions.px
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions

@ModelView(
    autoLayout = ModelView.Size.WRAP_WIDTH_WRAP_HEIGHT,
@@ -72,7 +71,7 @@ class EditorImageView : RelativeLayout {
                B.img.layoutParams.width = 192.px.toInt()
                B.img.requestLayout()

-                B.img.load(artwork.url, DrawableTransitionOptions.withCrossFade()) {
+                B.img.load(artwork.url) {
                    transform(RoundedCorners(8.px.toInt()))
                }
            }
@@ -80,7 +79,7 @@ class EditorImageView : RelativeLayout {
                B.img.layoutParams.width = 24.px.toInt()
                B.img.layoutParams.height = 24.px.toInt()
                B.img.requestLayout()
-                B.img.load(artwork.url, DrawableTransitionOptions.withCrossFade()) {
+                B.img.load(artwork.url) {
                    transform(RoundedCorners(4.px.toInt()))
                }
            }
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
@@ -38,7 +38,6 @@ import com.aurora.store.databinding.ViewAppUpdateBinding
 import com.aurora.store.util.CommonUtil
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade

@ModelView(
    autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT,
@@ -76,7 +75,7 @@ class AppUpdateView : RelativeLayout {
            /*Inflate App details*/
            with(updateFile.app) {
                B.txtLine1.text = displayName
-                B.imgIcon.load(iconArtwork.url, withCrossFade()) {
+                B.imgIcon.load(iconArtwork.url) {
                    placeholder(R.drawable.bg_placeholder)
                    transform(RoundedCorners(8.px.toInt()))
                }
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt
@@ -34,7 +34,6 @@ import com.aurora.extensions.load
 import com.aurora.extensions.px
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions

@ModelView(
    autoLayout = ModelView.Size.WRAP_WIDTH_WRAP_HEIGHT,
@@ -79,7 +78,7 @@ class MiniScreenshotView : RelativeLayout {
    @ModelProp
    fun artwork(artwork: Artwork) {
        normalizeSize(artwork)
-        B.img.load("${artwork.url}=rw-w480-v1-e15", DrawableTransitionOptions.withCrossFade()) {
+        B.img.load("${artwork.url}=rw-w480-v1-e15") {
            placeholder(R.drawable.bg_rounded)
            transform(RoundedCorners(8.px.toInt()))
        }
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/ReviewView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/ReviewView.kt
@@ -34,7 +34,6 @@ import com.aurora.extensions.load
 import com.aurora.extensions.toDate
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions

@ModelView(
    autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT,
@@ -71,7 +70,7 @@ class ReviewView : RelativeLayout {
        B.txtTime.text = ("${review.timeStamp.toDate()}  •  v${review.appVersion}")
        B.txtComment.text = review.comment

-        B.img.load(review.userPhotoUrl, DrawableTransitionOptions.withCrossFade()) {
+        B.img.load(review.userPhotoUrl) {
            placeholder(R.drawable.bg_placeholder)
            transform(RoundedCorners(32))
        }
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt
@@ -34,7 +34,6 @@ import com.aurora.extensions.load
 import com.aurora.extensions.px
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions

@ModelView(
    autoLayout = ModelView.Size.WRAP_WIDTH_WRAP_HEIGHT,
@@ -79,7 +78,7 @@ class ScreenshotView : RelativeLayout {
    @ModelProp
    fun artwork(artwork: Artwork) {
        normalizeSize(artwork)
-        B.img.load("${artwork.url}=rw-w480-v1-e15", DrawableTransitionOptions.withCrossFade()) {
+        B.img.load("${artwork.url}=rw-w480-v1-e15") {
            placeholder(R.drawable.bg_rounded)
            transform(RoundedCorners(8.px.toInt()))
        }
--- a/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt
@@ -46,7 +46,6 @@ import com.aurora.store.util.NavigationUtil
 import com.aurora.store.view.custom.RatingView
 import com.aurora.store.view.epoxy.controller.DetailsCarouselController
 import com.aurora.store.view.epoxy.controller.GenericCarouselController
-import com.aurora.store.view.epoxy.views.*
 import com.aurora.store.view.epoxy.views.details.ReviewViewModel_
 import com.aurora.store.view.epoxy.views.details.ScreenshotView
 import com.aurora.store.view.epoxy.views.details.ScreenshotViewModel_
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/InstallErrorDialogSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/InstallErrorDialogSheet.kt
@@ -26,13 +26,11 @@ import android.view.ViewGroup
 import com.aurora.Constants
 import com.aurora.extensions.copyToClipBoard
 import com.aurora.extensions.load
-import com.aurora.extensions.px
 import com.aurora.extensions.toast
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.SheetInstallErrorBinding
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners

 class InstallErrorDialogSheet : BaseBottomSheet() {