Funkwhale
/
funkwhale-app-android
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale-android
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
Hugh Daschbach 2023-08-21 09:56:11 -07:00 committed by Georg Krause
parent f65e29af39
commit feb86fe9c0
15 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/audio/funkwhale/ffa/adapters/AlbumsAdapter.kt
View File

@ -43,7 +43,7 @@ class AlbumsAdapter(
override fun onBindViewHolder(holder: ViewHolder, position: Int) { override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val album = data[position] val album = data[position]
CoverArt.withContext(layoutInflater.context, album.cover()) CoverArt.requestCreator(album.cover())
.fit() .fit()
.transform(RoundedCornersTransformation(8, 0)) .transform(RoundedCornersTransformation(8, 0))
.into(holder.art) .into(holder.art)

2
app/src/main/java/audio/funkwhale/ffa/adapters/AlbumsGridAdapter.kt
View File

@ -39,7 +39,7 @@ class AlbumsGridAdapter(
override fun onBindViewHolder(holder: ViewHolder, position: Int) { override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val album = data[position] val album = data[position]
CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(album.cover())) CoverArt.requestCreator(maybeNormalizeUrl(album.cover()))
.fit() .fit()
.transform(RoundedCornersTransformation(16, 0)) .transform(RoundedCornersTransformation(16, 0))
.into(holder.cover) .into(holder.cover)

2
app/src/main/java/audio/funkwhale/ffa/adapters/ArtistsAdapter.kt
View File

@ -62,7 +62,7 @@ class ArtistsAdapter(
val artist = active[position] val artist = active[position]
artist.cover()?.let { coverUrl -> artist.cover()?.let { coverUrl ->
CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(coverUrl)) CoverArt.requestCreator(maybeNormalizeUrl(coverUrl))
.fit() .fit()
.transform(RoundedCornersTransformation(8, 0)) .transform(RoundedCornersTransformation(8, 0))
.into(holder.art) .into(holder.art)

2
app/src/main/java/audio/funkwhale/ffa/adapters/FavoritesAdapter.kt
View File

@ -69,7 +69,7 @@ class FavoritesAdapter(
val favorite = data[position] val favorite = data[position]
val track = favorite.track val track = favorite.track
CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(track.cover())) CoverArt.requestCreator(maybeNormalizeUrl(track.cover()))
.fit() .fit()
.transform(RoundedCornersTransformation(16, 0)) .transform(RoundedCornersTransformation(16, 0))
.into(holder.cover) .into(holder.cover)

2
app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt
View File

@ -71,7 +71,7 @@ class PlaylistTracksAdapter(
override fun onBindViewHolder(holder: ViewHolder, position: Int) { override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val playlistTrack = data[position] val playlistTrack = data[position]
CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(playlistTrack.track.cover())) CoverArt.requestCreator(maybeNormalizeUrl(playlistTrack.track.cover()))
.fit() .fit()
.transform(RoundedCornersTransformation(16, 0)) .transform(RoundedCornersTransformation(16, 0))
.into(holder.cover) .into(holder.cover)

2
app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistsAdapter.kt
View File

@ -79,7 +79,7 @@ class PlaylistsAdapter(
else -> RoundedCornersTransformation.CornerType.TOP_LEFT else -> RoundedCornersTransformation.CornerType.TOP_LEFT
} }
CoverArt.withContext(layoutInflater.context, url) CoverArt.requestCreator(url)
.transform(RoundedCornersTransformation(32, 0, corner)) .transform(RoundedCornersTransformation(32, 0, corner))
.into(imageView) .into(imageView)
} }

2
app/src/main/java/audio/funkwhale/ffa/adapters/SearchAdapter.kt
View File

@ -189,7 +189,7 @@ class SearchAdapter(
else -> tracks[position] else -> tracks[position]
} }
CoverArt.withContext(fragment.layoutInflater.context, maybeNormalizeUrl(item.cover())) CoverArt.requestCreator(maybeNormalizeUrl(item.cover()))
.fit() .fit()
.transform(RoundedCornersTransformation(16, 0)) .transform(RoundedCornersTransformation(16, 0))
.into(rowTrackViewHolder?.cover) .into(rowTrackViewHolder?.cover)

2
app/src/main/java/audio/funkwhale/ffa/adapters/TracksAdapter.kt
View File

@ -70,7 +70,7 @@ class TracksAdapter(
override fun onBindViewHolder(holder: ViewHolder, position: Int) { override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val track = data[position] val track = data[position]
CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(track.cover())) CoverArt.requestCreator(maybeNormalizeUrl(track.cover()))
.fit() .fit()
.transform(RoundedCornersTransformation(8, 0)) .transform(RoundedCornersTransformation(8, 0))
.into(holder.cover) .into(holder.cover)

2
app/src/main/java/audio/funkwhale/ffa/fragments/AlbumsFragment.kt
View File

@ -79,7 +79,7 @@ class AlbumsFragment : FFAFragment<Album, AlbumsAdapter>() {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
binding.cover.let { cover -> binding.cover.let { cover ->
CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(artistArt)) CoverArt.requestCreator(maybeNormalizeUrl(artistArt))
.noFade() .noFade()
.fit() .fit()
.centerCrop() .centerCrop()

4
app/src/main/java/audio/funkwhale/ffa/fragments/NowPlayingFragment.kt
View File

@ -170,7 +170,7 @@ class NowPlayingFragment: Fragment(R.layout.fragment_now_playing) {
return return
} }
CoverArt.withContext(requireContext(), maybeNormalizeUrl(track.album?.cover())) CoverArt.requestCreator(maybeNormalizeUrl(track.album?.cover()))
.into(binding.header.nowPlayingCover) .into(binding.header.nowPlayingCover)
} }
@ -241,4 +241,4 @@ class NowPlayingFragment: Fragment(R.layout.fragment_now_playing) {
} }
} }
} }
} }

2
app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt
View File

@ -167,7 +167,7 @@ class PlaylistTracksFragment : FFAFragment<PlaylistTrack, PlaylistTracksAdapter>
} }
lifecycleScope.launch(Main) { lifecycleScope.launch(Main) {
CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(url)) CoverArt.requestCreator(maybeNormalizeUrl(url))
.fit() .fit()
.centerCrop() .centerCrop()
.transform(RoundedCornersTransformation(16, 0, corner)) .transform(RoundedCornersTransformation(16, 0, corner))

2
app/src/main/java/audio/funkwhale/ffa/fragments/TracksFragment.kt
View File

@ -118,7 +118,7 @@ class TracksFragment : FFAFragment<Track, TracksAdapter>() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(args.album.cover())) CoverArt.requestCreator(maybeNormalizeUrl(args.album.cover()))
.noFade() .noFade()
.fit() .fit()
.centerCrop() .centerCrop()

2
app/src/main/java/audio/funkwhale/ffa/playback/MediaControlsManager.kt
View File

@ -68,7 +68,7 @@ class MediaControlsManager(
.run { .run {
coverUrl?.let { coverUrl?.let {
try { try {
setLargeIcon(CoverArt.withContext(context, coverUrl).get()) setLargeIcon(CoverArt.requestCreator(coverUrl).get())
} catch (_: Exception) { } catch (_: Exception) {
} }

2
app/src/main/java/audio/funkwhale/ffa/playback/PlayerService.kt
View File

@ -385,7 +385,7 @@ class PlayerService : Service() {
runBlocking(IO) { runBlocking(IO) {
this@apply.putBitmap( this@apply.putBitmap(
MediaMetadataCompat.METADATA_KEY_ALBUM_ART, MediaMetadataCompat.METADATA_KEY_ALBUM_ART,
CoverArt.withContext(this@PlayerService.applicationContext, coverUrl).get() CoverArt.requestCreator(coverUrl).get()
) )
} }
} catch (_: Exception) { } catch (_: Exception) {

2
app/src/main/java/audio/funkwhale/ffa/utils/CoverArt.kt
View File

@ -256,7 +256,7 @@ open class CoverArt private constructor() {
/** /**
* The primary entrypoint for the codebase. * The primary entrypoint for the codebase.
*/ */
fun withContext(context: Context, url: String?): RequestCreator { fun requestCreator(url: String?): RequestCreator {
val request = picasso.load(url) val request = picasso.load(url)
if(url == null) request.placeholder(R.drawable.cover) if(url == null) request.placeholder(R.drawable.cover)
else request.placeholder(CircularProgressDrawable(FFA.get())) else request.placeholder(CircularProgressDrawable(FFA.get()))