diff --git a/app/src/main/java/com/github/libretube/helpers/ImageHelper.kt b/app/src/main/java/com/github/libretube/helpers/ImageHelper.kt index e97548538..f2eba4e0d 100644 --- a/app/src/main/java/com/github/libretube/helpers/ImageHelper.kt +++ b/app/src/main/java/com/github/libretube/helpers/ImageHelper.kt @@ -63,7 +63,7 @@ object ImageHelper { /** * load an image from a url into an imageView */ - fun loadImage(url: String?, target: ImageView) { + fun loadImage(url: String?, target: ImageView, whiteBackground: Boolean = false) { // only load the image if the data saver mode is disabled if (DataSaverMode.isEnabled(target.context) || url.isNullOrEmpty()) return val urlToLoad = ProxyHelper.unwrapImageUrl(url) @@ -72,7 +72,7 @@ object ImageHelper { .data(urlToLoad) .listener { _, result -> // set the background to white for transparent images - target.setBackgroundColor(Color.WHITE) + if (whiteBackground) target.setBackgroundColor(Color.WHITE) target.setImageDrawable(result.drawable) } diff --git a/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt index a962f269a..4620cb584 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt @@ -83,11 +83,11 @@ class CommentsAdapter( commentText.text = comment.commentText?.replace("", " ") ?.parseAsHtml(tagHandler = HtmlParser(LinkHandler(handleLink ?: {}))) - ImageHelper.loadImage(comment.thumbnail, commentorImage) + ImageHelper.loadImage(comment.thumbnail, commentorImage, true) likesTextView.text = comment.likeCount.formatShort() if (comment.creatorReplied && !channelAvatar.isNullOrBlank()) { - ImageHelper.loadImage(channelAvatar, creatorReplyImageView) + ImageHelper.loadImage(channelAvatar, creatorReplyImageView, true) creatorReplyImageView.isVisible = true } diff --git a/app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt index e67e461e7..156851fea 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt @@ -32,7 +32,8 @@ class LegacySubscriptionAdapter( channelName.text = subscription.name ImageHelper.loadImage( subscription.avatar, - channelAvatar + channelAvatar, + true ) root.setOnClickListener { NavigationHelper.navigateChannel(root.context, subscription.url) diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt index 929e1ba62..a765ee77e 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt @@ -98,7 +98,7 @@ class SearchAdapter( // only display channel related info if not in a channel tab if (!isChannelAdapter) { channelName.text = item.uploaderName - ImageHelper.loadImage(item.uploaderAvatar, channelImage) + ImageHelper.loadImage(item.uploaderAvatar, channelImage, true) } else { channelContainer.isGone = true } @@ -133,7 +133,7 @@ class SearchAdapter( private fun bindChannel(item: ContentItem, binding: ChannelRowBinding) { binding.apply { - ImageHelper.loadImage(item.thumbnail, searchChannelImage) + ImageHelper.loadImage(item.thumbnail, searchChannelImage, true) searchChannelName.text = item.name val subscribers = item.subscribers.formatShort() diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt index 98f0cc4f9..c4ce94ab3 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt @@ -43,7 +43,7 @@ class SubscriptionChannelAdapter( holder.binding.apply { subscriptionChannelName.text = subscription.name - ImageHelper.loadImage(subscription.avatar, subscriptionChannelImage) + ImageHelper.loadImage(subscription.avatar, subscriptionChannelImage, true) root.setOnClickListener { NavigationHelper.navigateChannel(root.context, subscription.url) diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionGroupChannelsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionGroupChannelsAdapter.kt index 6f0c30a99..b8e04c373 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionGroupChannelsAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionGroupChannelsAdapter.kt @@ -34,7 +34,7 @@ class SubscriptionGroupChannelsAdapter( NavigationHelper.navigateChannel(root.context, channel.url) } subscriptionChannelName.text = channel.name - ImageHelper.loadImage(channel.avatar, subscriptionChannelImage) + ImageHelper.loadImage(channel.avatar, subscriptionChannelImage, true) val channelId = channel.url.toID() channelIncluded.setOnCheckedChangeListener(null) diff --git a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt index 6d8cf2a72..8f7360ff0 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt @@ -147,7 +147,7 @@ class VideosAdapter( NavigationHelper.navigateChannel(root.context, video.uploaderUrl) } ImageHelper.loadImage(video.thumbnail, thumbnail) - ImageHelper.loadImage(video.uploaderAvatar, channelImage) + ImageHelper.loadImage(video.uploaderAvatar, channelImage, true) root.setOnClickListener { NavigationHelper.navigateVideo(root.context, video.url) } @@ -181,7 +181,7 @@ class VideosAdapter( ImageHelper.loadImage(video.thumbnail, thumbnail) if (forceMode != LayoutMode.CHANNEL_ROW) { - ImageHelper.loadImage(video.uploaderAvatar, channelImage) + ImageHelper.loadImage(video.uploaderAvatar, channelImage, true) channelName.text = video.uploaderName channelContainer.setOnClickListener { diff --git a/app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt index 32443abba..a51262d6d 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt @@ -60,7 +60,7 @@ class WatchHistoryAdapter( videoInfo.text = video.uploadDate?.let { TextUtils.localizeDate(it) } thumbnailDuration.setFormattedDuration(video.duration!!, null) ImageHelper.loadImage(video.thumbnailUrl, thumbnail) - ImageHelper.loadImage(video.uploaderAvatar, channelImage) + ImageHelper.loadImage(video.uploaderAvatar, channelImage, true) channelImage.setOnClickListener { NavigationHelper.navigateChannel(root.context, video.uploaderUrl) diff --git a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt index c7c9aa3e4..b4826249c 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt @@ -216,7 +216,7 @@ class ChannelFragment : DynamicLayoutManagerFragment() { } ImageHelper.loadImage(response.bannerUrl, binding.channelBanner) - ImageHelper.loadImage(response.avatarUrl, binding.channelImage) + ImageHelper.loadImage(response.avatarUrl, binding.channelImage, true) binding.channelImage.setOnClickListener { NavigationHelper.openImagePreview( diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt index 566c6a1e0..fa6955fa7 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt @@ -1038,7 +1038,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions { binding.descriptionLayout.setStreams(streams) binding.apply { - ImageHelper.loadImage(streams.uploaderAvatar, binding.playerChannelImage) + ImageHelper.loadImage(streams.uploaderAvatar, binding.playerChannelImage, true) playerChannelName.text = streams.uploader titleTextView.text = streams.title playerChannelSubCount.text = context?.getString(