Skip to content

Commit

Permalink
Merge pull request #10706 from woocommerce/bump_glide
Browse files Browse the repository at this point in the history
build: bump Glide to `4.16.0`
  • Loading branch information
wzieba authored Feb 9, 2024
2 parents 541c2d0 + 4e3c619 commit 3c97bdf
Show file tree
Hide file tree
Showing 20 changed files with 44 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.core.view.isVisible
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.google.android.material.card.MaterialCardView
import com.woocommerce.android.R
import com.woocommerce.android.databinding.AnalyticsListCardItemViewBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.util.StringUtils
import org.wordpress.android.util.PhotonUtils

Expand All @@ -36,7 +36,7 @@ class AnalyticsHubListCardItemView @JvmOverloads constructor(
value = viewState.value
)

GlideApp
Glide
.with(binding.root.context)
.load(PhotonUtils.getPhotonImageUrl(viewState.imageUri, imageSize, imageSize))
.transform(CenterCrop(), RoundedCorners(imageCornerRadius))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import com.bumptech.glide.Glide
import com.google.android.material.snackbar.BaseTransientBottomBar
import com.google.android.material.snackbar.Snackbar
import com.woocommerce.android.AppPrefs
Expand All @@ -27,7 +28,6 @@ import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_JETPAC
import com.woocommerce.android.databinding.FragmentLoginNoJetpackBinding
import com.woocommerce.android.databinding.ViewLoginNoStoresBinding
import com.woocommerce.android.databinding.ViewLoginUserInfoBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.widgets.WooClickableSpan
import dagger.hilt.android.AndroidEntryPoint
import org.wordpress.android.login.LoginListener
Expand Down Expand Up @@ -141,7 +141,7 @@ class LoginNoJetpackFragment : Fragment(layout.fragment_login_no_jetpack) {
}

userAvatarUrl?.let {
GlideApp.with(this)
Glide.with(this)
.load(it)
.placeholder(ContextCompat.getDrawable(requireContext(), R.drawable.img_gravatar_placeholder))
.circleCrop()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.woocommerce.android.databinding.MediaUploadErrorItemBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.ui.media.MediaUploadErrorListAdapter.MediaUploadErrorListItemViewHolder
import com.woocommerce.android.ui.media.MediaUploadErrorListViewModel.ErrorUiModel
import java.io.File
Expand Down Expand Up @@ -54,7 +54,7 @@ class MediaUploadErrorListAdapter : RecyclerView.Adapter<MediaUploadErrorListIte
viewBinding.mediaFileName.text = fileName
viewBinding.mediaFileErrorText.text = errorMessage
if (filePath.isNotBlank()) {
GlideApp.with(viewBinding.root.context)
Glide.with(viewBinding.root.context)
.load(File(filePath))
.into(viewBinding.productImage)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import androidx.core.view.isVisible
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.google.android.material.card.MaterialCardView
Expand All @@ -17,7 +18,6 @@ import com.woocommerce.android.analytics.AnalyticsEvent
import com.woocommerce.android.analytics.AnalyticsTracker
import com.woocommerce.android.databinding.MyStoreTopPerformersBinding
import com.woocommerce.android.databinding.TopPerformersListItemBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.tools.SelectedSite
import com.woocommerce.android.util.DateUtils
import com.woocommerce.android.widgets.SkeletonView
Expand Down Expand Up @@ -135,7 +135,7 @@ class MyStoreTopPerformersView @JvmOverloads constructor(
holder.viewBinding.itemsSoldTextView.text = topPerformer.timesOrdered
holder.viewBinding.netSalesTextView.text = topPerformer.netSales
holder.viewBinding.divider.isVisible = position < itemCount - 1
GlideApp.with(holder.itemView.context)
Glide.with(holder.itemView.context)
.load(topPerformer.imageUrl)
.transform(CenterCrop(), RoundedCorners(imageCornerRadius))
.placeholder(ContextCompat.getDrawable(holder.itemView.context, R.drawable.ic_product))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.isVisible
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.woocommerce.android.AppPrefs
import com.woocommerce.android.R
import com.woocommerce.android.databinding.OrderDetailProductItemBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.extensions.formatToString
import com.woocommerce.android.model.Order
import com.woocommerce.android.util.StringUtils
Expand Down Expand Up @@ -64,7 +64,7 @@ class OrderDetailProductItemView @JvmOverloads constructor(
val imageSize = context.resources.getDimensionPixelSize(R.dimen.image_minor_100)
val imageCornerRadius = context.resources.getDimensionPixelSize(R.dimen.corner_radius_image)
val imageUrl = PhotonUtils.getPhotonImageUrl(it, imageSize, imageSize)
GlideApp.with(context)
Glide.with(context)
.load(imageUrl)
.placeholder(R.drawable.ic_product)
.transform(CenterCrop(), RoundedCorners(imageCornerRadius))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.woocommerce.android.R
import com.woocommerce.android.databinding.OrderDetailProductChildItemBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.extensions.formatToString
import com.woocommerce.android.extensions.getColorCompat
import com.woocommerce.android.tools.ProductImageMap
Expand Down Expand Up @@ -88,7 +88,7 @@ class OrderDetailProductChildItemListAdapter(
productImage?.let {
val imageCornerRadius = itemView.resources.getDimensionPixelSize(R.dimen.corner_radius_image)
val imageUrl = PhotonUtils.getPhotonImageUrl(it, imageSize, imageSize)
GlideApp.with(binding.productInfoIcon)
Glide.with(binding.productInfoIcon)
.load(imageUrl)
.placeholder(R.drawable.ic_product)
.transform(CenterCrop(), RoundedCorners(imageCornerRadius))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import androidx.constraintlayout.widget.ConstraintLayout.VISIBLE
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.DiffUtil.Callback
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.woocommerce.android.AppPrefs
import com.woocommerce.android.R
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.extensions.formatToString
import com.woocommerce.android.extensions.hide
import com.woocommerce.android.extensions.isEqualTo
Expand Down Expand Up @@ -118,7 +118,7 @@ class RefundProductListAdapter(
val imageCornerRadius = itemView.context.resources.getDimensionPixelSize(R.dimen.corner_radius_image)
val imageSize = itemView.context.resources.getDimensionPixelSize(R.dimen.image_minor_100)
val imageUrl = PhotonUtils.getPhotonImageUrl(it, imageSize, imageSize)
GlideApp.with(itemView.context)
Glide.with(itemView.context)
.load(imageUrl)
.transform(CenterCrop(), RoundedCorners(imageCornerRadius))
.placeholder(R.drawable.ic_product)
Expand Down Expand Up @@ -157,7 +157,7 @@ class RefundProductListAdapter(
val imageCornerRadius = itemView.context.resources.getDimensionPixelSize(R.dimen.corner_radius_image)
val imageSize = itemView.context.resources.getDimensionPixelSize(R.dimen.image_minor_100)
val imageUrl = PhotonUtils.getPhotonImageUrl(it, imageSize, imageSize)
GlideApp.with(itemView.context)
Glide.with(itemView.context)
.load(imageUrl)
.transform(CenterCrop(), RoundedCorners(imageCornerRadius))
.placeholder(R.drawable.ic_product)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import android.os.Bundle
import android.view.View
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import com.bumptech.glide.Glide
import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.GlideException
import com.bumptech.glide.request.RequestListener
import com.bumptech.glide.request.target.Target
import com.woocommerce.android.R
import com.woocommerce.android.analytics.AnalyticsTracker
import com.woocommerce.android.databinding.FragmentImageViewerBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.model.Product

/**
Expand Down Expand Up @@ -80,7 +80,7 @@ class ImageViewerFragment : Fragment(R.layout.fragment_image_viewer), RequestLis
private fun loadImage() {
showProgress(true)

GlideApp.with(this)
Glide.with(this)
.load(imageUrl)
.listener(this)
.into(binding.photoView)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
import androidx.core.text.HtmlCompat
import androidx.core.view.isVisible
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.woocommerce.android.R
import com.woocommerce.android.databinding.ProductItemViewBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.model.Product
import com.woocommerce.android.ui.orders.creation.OrderCreationProduct
import com.woocommerce.android.ui.orders.creation.product.discount.CalculateItemDiscountAmount
Expand Down Expand Up @@ -117,7 +117,7 @@ class ProductItemView @JvmOverloads constructor(
else -> {
size = imageSize
val photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, imageSize, imageSize)
GlideApp.with(context)
Glide.with(context)
.load(photonUrl)
.transform(CenterCrop(), RoundedCorners(imageCornerRadius))
.placeholder(R.drawable.ic_product)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package com.woocommerce.android.ui.products.adapters

import android.view.View
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.woocommerce.android.R
import com.woocommerce.android.databinding.BundledProductItemViewBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.extensions.isNotNullOrEmpty
import com.woocommerce.android.model.BundledProduct
import com.woocommerce.android.ui.products.ProductStockStatus
Expand All @@ -33,7 +33,7 @@ class BundleProductViewHolder(val viewBinding: BundledProductItemViewBinding) :
else -> {
size = imageSize
val photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, imageSize, imageSize)
GlideApp.with(viewBinding.productImage)
Glide.with(viewBinding.productImage)
.load(photonUrl)
.transform(CenterCrop(), RoundedCorners(imageCornerRadius))
.placeholder(R.drawable.ic_product)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import androidx.core.view.isVisible
import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.woocommerce.android.R
import com.woocommerce.android.databinding.FragmentComponentDetailsBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.extensions.takeIfNotEqualTo
import com.woocommerce.android.model.QueryType
import com.woocommerce.android.ui.base.BaseFragment
Expand Down Expand Up @@ -111,7 +111,7 @@ class ComponentDetailsFragment : BaseFragment(R.layout.fragment_component_detail
else -> {
val imageSize = resources.getDimensionPixelSize(R.dimen.image_major_120)
val photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, imageSize, imageSize)
GlideApp.with(requireContext()).load(photonUrl)
Glide.with(requireContext()).load(photonUrl)
.transform(CenterCrop()).placeholder(R.drawable.ic_product)
.into(binding.componentImage)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import androidx.core.view.isVisible
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.woocommerce.android.R
import com.woocommerce.android.databinding.ComponentOptionItemViewBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.ui.products.ComponentOption
import org.wordpress.android.util.PhotonUtils

Expand Down Expand Up @@ -59,7 +59,7 @@ class ComponentOptionViewHolder(val viewBinding: ComponentOptionItemViewBinding)
else -> {
size = imageSize
val photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, imageSize, imageSize)
GlideApp.with(viewBinding.componentOptionImage).load(photonUrl)
Glide.with(viewBinding.componentOptionImage).load(photonUrl)
.transform(CenterCrop(), RoundedCorners(imageCornerRadius)).placeholder(R.drawable.ic_product)
.into(viewBinding.componentOptionImage)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import androidx.core.view.isVisible
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.woocommerce.android.R
import com.woocommerce.android.databinding.ComponentItemViewBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.model.Component
import org.wordpress.android.util.PhotonUtils

Expand Down Expand Up @@ -76,7 +76,7 @@ class ComponentViewHolder(val viewBinding: ComponentItemViewBinding) : RecyclerV
else -> {
size = imageSize
val photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, imageSize, imageSize)
GlideApp.with(viewBinding.componentImage).load(photonUrl)
Glide.with(viewBinding.componentImage).load(photonUrl)
.transform(CenterCrop(), RoundedCorners(imageCornerRadius)).placeholder(R.drawable.ic_product)
.into(viewBinding.componentImage)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.RequestManager
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.woocommerce.android.R
import com.woocommerce.android.databinding.VariationListItemBinding
import com.woocommerce.android.di.GlideRequests
import com.woocommerce.android.extensions.appendWithIfNotEmpty
import com.woocommerce.android.extensions.isSet
import com.woocommerce.android.model.Product
Expand All @@ -29,7 +29,7 @@ import org.wordpress.android.util.PhotonUtils

class VariationListAdapter(
private val context: Context,
private val glideRequest: GlideRequests,
private val glideRequest: RequestManager,
private val loadMoreListener: OnLoadMoreListener,
private val parentProduct: Product?,
private val onItemClick: (variation: ProductVariation) -> Unit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.LayoutManager
import com.bumptech.glide.Glide
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.woocommerce.android.R
import com.woocommerce.android.analytics.AnalyticsEvent
import com.woocommerce.android.analytics.AnalyticsTracker
import com.woocommerce.android.databinding.FragmentVariationListBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.extensions.handleDialogNotice
import com.woocommerce.android.extensions.handleResult
import com.woocommerce.android.extensions.navigateBackWithResult
Expand Down Expand Up @@ -347,7 +347,7 @@ class VariationListFragment :
if (binding.variationList.adapter == null) {
adapter = VariationListAdapter(
requireContext(),
GlideApp.with(this),
Glide.with(this),
this,
parentProduct,
viewModel::onItemClick
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import androidx.core.view.ViewCompat
import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import com.bumptech.glide.Glide
import com.google.android.material.transition.MaterialContainerTransform
import com.woocommerce.android.NavGraphMainDirections
import com.woocommerce.android.R
import com.woocommerce.android.analytics.AnalyticsEvent
import com.woocommerce.android.analytics.AnalyticsTracker
import com.woocommerce.android.databinding.FragmentReviewDetailBinding
import com.woocommerce.android.di.GlideApp
import com.woocommerce.android.extensions.fastStripHtml
import com.woocommerce.android.extensions.handleResult
import com.woocommerce.android.extensions.navigateSafely
Expand Down Expand Up @@ -184,7 +184,7 @@ class ReviewDetailFragment :
val avatarUrl = UrlUtils.removeQuery(review.reviewerAvatarUrl) + "?s=" + size + "&d=404"

// Populate reviewer section
GlideApp.with(binding.reviewGravatar.context)
Glide.with(binding.reviewGravatar.context)
.load(avatarUrl)
.placeholder(ContextCompat.getDrawable(requireContext(), R.drawable.ic_user_circle_24dp))
.circleCrop()
Expand Down Expand Up @@ -227,7 +227,7 @@ class ReviewDetailFragment :
// call this method to show the image for the just-downloaded product model
productImageMap.get(remoteProductId)?.let { productImage ->
val imageUrl = PhotonUtils.getPhotonImageUrl(productImage, productIconSize, productIconSize)
GlideApp.with(activity as Context)
Glide.with(activity as Context)
.load(imageUrl)
.placeholder(ContextCompat.getDrawable(requireContext(), R.drawable.ic_product))
.into(binding.reviewProductIcon)
Expand Down
Loading

0 comments on commit 3c97bdf

Please sign in to comment.