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.
This commit is contained in:
parent
f65e29af39
commit
feb86fe9c0
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -79,7 +79,7 @@ class AlbumsFragment : FFAFragment<Album, AlbumsAdapter>() {
|
|||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
binding.cover.let { cover ->
|
||||
CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(artistArt))
|
||||
CoverArt.requestCreator(maybeNormalizeUrl(artistArt))
|
||||
.noFade()
|
||||
.fit()
|
||||
.centerCrop()
|
||||
|
|
|
@ -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) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -167,7 +167,7 @@ class PlaylistTracksFragment : FFAFragment<PlaylistTrack, PlaylistTracksAdapter>
|
|||
}
|
||||
|
||||
lifecycleScope.launch(Main) {
|
||||
CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(url))
|
||||
CoverArt.requestCreator(maybeNormalizeUrl(url))
|
||||
.fit()
|
||||
.centerCrop()
|
||||
.transform(RoundedCornersTransformation(16, 0, corner))
|
||||
|
|
|
@ -118,7 +118,7 @@ class TracksFragment : FFAFragment<Track, TracksAdapter>() {
|
|||
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()
|
||||
|
|
|
@ -68,7 +68,7 @@ class MediaControlsManager(
|
|||
.run {
|
||||
coverUrl?.let {
|
||||
try {
|
||||
setLargeIcon(CoverArt.withContext(context, coverUrl).get())
|
||||
setLargeIcon(CoverArt.requestCreator(coverUrl).get())
|
||||
} catch (_: Exception) {
|
||||
}
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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()))
|
||||
|
|
Loading…
Reference in New Issue