From feb86fe9c05916b66990de6deacb342faf64654c Mon Sep 17 00:00:00 2001 From: Hugh Daschbach Date: Mon, 21 Aug 2023 09:56:11 -0700 Subject: [PATCH] Refactor CoverArt.withContext(). Having changed the context object in CoverArt from a received function parameter to an initialization time derived variable, withContext no longer needs a Context parameter. That leaves the method misnamed. So rename withContext -> requestCreator and drop the first parameter. --- .../main/java/audio/funkwhale/ffa/adapters/AlbumsAdapter.kt | 2 +- .../java/audio/funkwhale/ffa/adapters/AlbumsGridAdapter.kt | 2 +- .../main/java/audio/funkwhale/ffa/adapters/ArtistsAdapter.kt | 2 +- .../java/audio/funkwhale/ffa/adapters/FavoritesAdapter.kt | 2 +- .../audio/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt | 2 +- .../java/audio/funkwhale/ffa/adapters/PlaylistsAdapter.kt | 2 +- .../main/java/audio/funkwhale/ffa/adapters/SearchAdapter.kt | 2 +- .../main/java/audio/funkwhale/ffa/adapters/TracksAdapter.kt | 2 +- .../main/java/audio/funkwhale/ffa/fragments/AlbumsFragment.kt | 2 +- .../java/audio/funkwhale/ffa/fragments/NowPlayingFragment.kt | 4 ++-- .../audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt | 2 +- .../main/java/audio/funkwhale/ffa/fragments/TracksFragment.kt | 2 +- .../java/audio/funkwhale/ffa/playback/MediaControlsManager.kt | 2 +- .../main/java/audio/funkwhale/ffa/playback/PlayerService.kt | 2 +- app/src/main/java/audio/funkwhale/ffa/utils/CoverArt.kt | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/audio/funkwhale/ffa/adapters/AlbumsAdapter.kt b/app/src/main/java/audio/funkwhale/ffa/adapters/AlbumsAdapter.kt index 7e28bea..33336c7 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/AlbumsAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/AlbumsAdapter.kt @@ -43,7 +43,7 @@ class AlbumsAdapter( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val album = data[position] - CoverArt.withContext(layoutInflater.context, album.cover()) + CoverArt.requestCreator(album.cover()) .fit() .transform(RoundedCornersTransformation(8, 0)) .into(holder.art) diff --git a/app/src/main/java/audio/funkwhale/ffa/adapters/AlbumsGridAdapter.kt b/app/src/main/java/audio/funkwhale/ffa/adapters/AlbumsGridAdapter.kt index e376617..65a12af 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/AlbumsGridAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/AlbumsGridAdapter.kt @@ -39,7 +39,7 @@ class AlbumsGridAdapter( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val album = data[position] - CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(album.cover())) + CoverArt.requestCreator(maybeNormalizeUrl(album.cover())) .fit() .transform(RoundedCornersTransformation(16, 0)) .into(holder.cover) diff --git a/app/src/main/java/audio/funkwhale/ffa/adapters/ArtistsAdapter.kt b/app/src/main/java/audio/funkwhale/ffa/adapters/ArtistsAdapter.kt index 27de82e..c69b27e 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/ArtistsAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/ArtistsAdapter.kt @@ -62,7 +62,7 @@ class ArtistsAdapter( val artist = active[position] artist.cover()?.let { coverUrl -> - CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(coverUrl)) + CoverArt.requestCreator(maybeNormalizeUrl(coverUrl)) .fit() .transform(RoundedCornersTransformation(8, 0)) .into(holder.art) diff --git a/app/src/main/java/audio/funkwhale/ffa/adapters/FavoritesAdapter.kt b/app/src/main/java/audio/funkwhale/ffa/adapters/FavoritesAdapter.kt index b399cf1..6d38fb3 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/FavoritesAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/FavoritesAdapter.kt @@ -69,7 +69,7 @@ class FavoritesAdapter( val favorite = data[position] val track = favorite.track - CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(track.cover())) + CoverArt.requestCreator(maybeNormalizeUrl(track.cover())) .fit() .transform(RoundedCornersTransformation(16, 0)) .into(holder.cover) diff --git a/app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt b/app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt index 056eda3..3fab812 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt @@ -71,7 +71,7 @@ class PlaylistTracksAdapter( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val playlistTrack = data[position] - CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(playlistTrack.track.cover())) + CoverArt.requestCreator(maybeNormalizeUrl(playlistTrack.track.cover())) .fit() .transform(RoundedCornersTransformation(16, 0)) .into(holder.cover) diff --git a/app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistsAdapter.kt b/app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistsAdapter.kt index 4827f68..e57e279 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistsAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistsAdapter.kt @@ -79,7 +79,7 @@ class PlaylistsAdapter( else -> RoundedCornersTransformation.CornerType.TOP_LEFT } - CoverArt.withContext(layoutInflater.context, url) + CoverArt.requestCreator(url) .transform(RoundedCornersTransformation(32, 0, corner)) .into(imageView) } diff --git a/app/src/main/java/audio/funkwhale/ffa/adapters/SearchAdapter.kt b/app/src/main/java/audio/funkwhale/ffa/adapters/SearchAdapter.kt index 9710ef9..31aba75 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/SearchAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/SearchAdapter.kt @@ -189,7 +189,7 @@ class SearchAdapter( else -> tracks[position] } - CoverArt.withContext(fragment.layoutInflater.context, maybeNormalizeUrl(item.cover())) + CoverArt.requestCreator(maybeNormalizeUrl(item.cover())) .fit() .transform(RoundedCornersTransformation(16, 0)) .into(rowTrackViewHolder?.cover) diff --git a/app/src/main/java/audio/funkwhale/ffa/adapters/TracksAdapter.kt b/app/src/main/java/audio/funkwhale/ffa/adapters/TracksAdapter.kt index 98688c6..0c78c5d 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/TracksAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/TracksAdapter.kt @@ -70,7 +70,7 @@ class TracksAdapter( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val track = data[position] - CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(track.cover())) + CoverArt.requestCreator(maybeNormalizeUrl(track.cover())) .fit() .transform(RoundedCornersTransformation(8, 0)) .into(holder.cover) diff --git a/app/src/main/java/audio/funkwhale/ffa/fragments/AlbumsFragment.kt b/app/src/main/java/audio/funkwhale/ffa/fragments/AlbumsFragment.kt index 1d82783..2d20035 100644 --- a/app/src/main/java/audio/funkwhale/ffa/fragments/AlbumsFragment.kt +++ b/app/src/main/java/audio/funkwhale/ffa/fragments/AlbumsFragment.kt @@ -79,7 +79,7 @@ class AlbumsFragment : FFAFragment() { super.onViewCreated(view, savedInstanceState) binding.cover.let { cover -> - CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(artistArt)) + CoverArt.requestCreator(maybeNormalizeUrl(artistArt)) .noFade() .fit() .centerCrop() diff --git a/app/src/main/java/audio/funkwhale/ffa/fragments/NowPlayingFragment.kt b/app/src/main/java/audio/funkwhale/ffa/fragments/NowPlayingFragment.kt index 23d4211..8602175 100644 --- a/app/src/main/java/audio/funkwhale/ffa/fragments/NowPlayingFragment.kt +++ b/app/src/main/java/audio/funkwhale/ffa/fragments/NowPlayingFragment.kt @@ -170,7 +170,7 @@ class NowPlayingFragment: Fragment(R.layout.fragment_now_playing) { return } - CoverArt.withContext(requireContext(), maybeNormalizeUrl(track.album?.cover())) + CoverArt.requestCreator(maybeNormalizeUrl(track.album?.cover())) .into(binding.header.nowPlayingCover) } @@ -241,4 +241,4 @@ class NowPlayingFragment: Fragment(R.layout.fragment_now_playing) { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt b/app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt index 3073486..b9c089c 100644 --- a/app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt +++ b/app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt @@ -167,7 +167,7 @@ class PlaylistTracksFragment : FFAFragment } lifecycleScope.launch(Main) { - CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(url)) + CoverArt.requestCreator(maybeNormalizeUrl(url)) .fit() .centerCrop() .transform(RoundedCornersTransformation(16, 0, corner)) diff --git a/app/src/main/java/audio/funkwhale/ffa/fragments/TracksFragment.kt b/app/src/main/java/audio/funkwhale/ffa/fragments/TracksFragment.kt index 370a291..9fc5c29 100644 --- a/app/src/main/java/audio/funkwhale/ffa/fragments/TracksFragment.kt +++ b/app/src/main/java/audio/funkwhale/ffa/fragments/TracksFragment.kt @@ -118,7 +118,7 @@ class TracksFragment : FFAFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(args.album.cover())) + CoverArt.requestCreator(maybeNormalizeUrl(args.album.cover())) .noFade() .fit() .centerCrop() diff --git a/app/src/main/java/audio/funkwhale/ffa/playback/MediaControlsManager.kt b/app/src/main/java/audio/funkwhale/ffa/playback/MediaControlsManager.kt index f28633b..7e4ffdd 100644 --- a/app/src/main/java/audio/funkwhale/ffa/playback/MediaControlsManager.kt +++ b/app/src/main/java/audio/funkwhale/ffa/playback/MediaControlsManager.kt @@ -68,7 +68,7 @@ class MediaControlsManager( .run { coverUrl?.let { try { - setLargeIcon(CoverArt.withContext(context, coverUrl).get()) + setLargeIcon(CoverArt.requestCreator(coverUrl).get()) } catch (_: Exception) { } diff --git a/app/src/main/java/audio/funkwhale/ffa/playback/PlayerService.kt b/app/src/main/java/audio/funkwhale/ffa/playback/PlayerService.kt index 60ff098..1e9acc4 100644 --- a/app/src/main/java/audio/funkwhale/ffa/playback/PlayerService.kt +++ b/app/src/main/java/audio/funkwhale/ffa/playback/PlayerService.kt @@ -385,7 +385,7 @@ class PlayerService : Service() { runBlocking(IO) { this@apply.putBitmap( MediaMetadataCompat.METADATA_KEY_ALBUM_ART, - CoverArt.withContext(this@PlayerService.applicationContext, coverUrl).get() + CoverArt.requestCreator(coverUrl).get() ) } } catch (_: Exception) { diff --git a/app/src/main/java/audio/funkwhale/ffa/utils/CoverArt.kt b/app/src/main/java/audio/funkwhale/ffa/utils/CoverArt.kt index bfc972e..9ce71c9 100644 --- a/app/src/main/java/audio/funkwhale/ffa/utils/CoverArt.kt +++ b/app/src/main/java/audio/funkwhale/ffa/utils/CoverArt.kt @@ -256,7 +256,7 @@ open class CoverArt private constructor() { /** * The primary entrypoint for the codebase. */ - fun withContext(context: Context, url: String?): RequestCreator { + fun requestCreator(url: String?): RequestCreator { val request = picasso.load(url) if(url == null) request.placeholder(R.drawable.cover) else request.placeholder(CircularProgressDrawable(FFA.get()))