Some tracks do not have album, this fixes a crash trying to retrieve their album cover. Changed the placeholder album cover to be less aggressive to the eye.
This commit is contained in:
parent
9fb9d45e05
commit
ba31a4efcf
|
@ -358,14 +358,14 @@ class MainActivity : AppCompatActivity() {
|
||||||
now_playing_details_toggle.icon = getDrawable(R.drawable.pause)
|
now_playing_details_toggle.icon = getDrawable(R.drawable.pause)
|
||||||
|
|
||||||
Picasso.get()
|
Picasso.get()
|
||||||
.maybeLoad(maybeNormalizeUrl(track.album.cover.original))
|
.maybeLoad(maybeNormalizeUrl(track.album?.cover?.original))
|
||||||
.fit()
|
.fit()
|
||||||
.centerCrop()
|
.centerCrop()
|
||||||
.into(now_playing_cover)
|
.into(now_playing_cover)
|
||||||
|
|
||||||
now_playing_details_cover?.let { now_playing_details_cover ->
|
now_playing_details_cover?.let { now_playing_details_cover ->
|
||||||
Picasso.get()
|
Picasso.get()
|
||||||
.maybeLoad(maybeNormalizeUrl(track.album.cover.original))
|
.maybeLoad(maybeNormalizeUrl(track.album?.cover?.original))
|
||||||
.fit()
|
.fit()
|
||||||
.centerCrop()
|
.centerCrop()
|
||||||
.transform(RoundedCornersTransformation(16, 0))
|
.transform(RoundedCornersTransformation(16, 0))
|
||||||
|
@ -379,7 +379,7 @@ class MainActivity : AppCompatActivity() {
|
||||||
}.widthPixels
|
}.widthPixels
|
||||||
|
|
||||||
val backgroundCover = Picasso.get()
|
val backgroundCover = Picasso.get()
|
||||||
.maybeLoad(maybeNormalizeUrl(track.album.cover.original))
|
.maybeLoad(maybeNormalizeUrl(track.album?.cover?.original))
|
||||||
.get()
|
.get()
|
||||||
.run { Bitmap.createScaledBitmap(this, width, width, false).toDrawable(resources) }
|
.run { Bitmap.createScaledBitmap(this, width, width, false).toDrawable(resources) }
|
||||||
.apply {
|
.apply {
|
||||||
|
@ -410,7 +410,7 @@ class MainActivity : AppCompatActivity() {
|
||||||
|
|
||||||
setOnMenuItemClickListener {
|
setOnMenuItemClickListener {
|
||||||
when (it.itemId) {
|
when (it.itemId) {
|
||||||
R.id.track_info_artist -> ArtistsFragment.openAlbums(this@MainActivity, track.artist, art = track.album.cover.original)
|
R.id.track_info_artist -> ArtistsFragment.openAlbums(this@MainActivity, track.artist, art = track.album?.cover?.original)
|
||||||
R.id.track_info_album -> AlbumsFragment.openTracks(this@MainActivity, track.album)
|
R.id.track_info_album -> AlbumsFragment.openTracks(this@MainActivity, track.album)
|
||||||
R.id.track_info_details -> TrackInfoDetailsFragment.new(track).show(supportFragmentManager, "dialog")
|
R.id.track_info_details -> TrackInfoDetailsFragment.new(track).show(supportFragmentManager, "dialog")
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ class FavoritesAdapter(private val context: Context?, private val favoriteListen
|
||||||
val favorite = data[position]
|
val favorite = data[position]
|
||||||
|
|
||||||
Picasso.get()
|
Picasso.get()
|
||||||
.maybeLoad(maybeNormalizeUrl(favorite.album.cover.original))
|
.maybeLoad(maybeNormalizeUrl(favorite.album?.cover?.original))
|
||||||
.fit()
|
.fit()
|
||||||
.placeholder(R.drawable.cover)
|
.placeholder(R.drawable.cover)
|
||||||
.transform(RoundedCornersTransformation(16, 0))
|
.transform(RoundedCornersTransformation(16, 0))
|
||||||
|
|
|
@ -56,7 +56,7 @@ class PlaylistTracksAdapter(private val context: Context?, private val favoriteL
|
||||||
val track = data[position]
|
val track = data[position]
|
||||||
|
|
||||||
Picasso.get()
|
Picasso.get()
|
||||||
.maybeLoad(maybeNormalizeUrl(track.track.album.cover.original))
|
.maybeLoad(maybeNormalizeUrl(track.track.album?.cover?.original))
|
||||||
.fit()
|
.fit()
|
||||||
.placeholder(R.drawable.cover)
|
.placeholder(R.drawable.cover)
|
||||||
.transform(RoundedCornersTransformation(16, 0))
|
.transform(RoundedCornersTransformation(16, 0))
|
||||||
|
|
|
@ -52,7 +52,7 @@ class TracksAdapter(private val context: Context?, private val favoriteListener:
|
||||||
val track = data[position]
|
val track = data[position]
|
||||||
|
|
||||||
Picasso.get()
|
Picasso.get()
|
||||||
.maybeLoad(maybeNormalizeUrl(track.album.cover.original))
|
.maybeLoad(maybeNormalizeUrl(track.album?.cover?.original))
|
||||||
.fit()
|
.fit()
|
||||||
.transform(RoundedCornersTransformation(8, 0))
|
.transform(RoundedCornersTransformation(8, 0))
|
||||||
.into(holder.cover)
|
.into(holder.cover)
|
||||||
|
|
|
@ -54,7 +54,11 @@ class AlbumsFragment : OtterFragment<Album, AlbumsAdapter>() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun openTracks(context: Context?, album: Album, fragment: Fragment? = null) {
|
fun openTracks(context: Context?, album: Album?, fragment: Fragment? = null) {
|
||||||
|
if (album == null) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
(context as? MainActivity)?.let {
|
(context as? MainActivity)?.let {
|
||||||
fragment?.let { fragment ->
|
fragment?.let { fragment ->
|
||||||
fragment.onViewPager {
|
fragment.onViewPager {
|
||||||
|
|
|
@ -126,7 +126,7 @@ class PlaylistTracksFragment : OtterFragment<PlaylistTrack, PlaylistTracksAdapte
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDataFetched(data: List<PlaylistTrack>) {
|
override fun onDataFetched(data: List<PlaylistTrack>) {
|
||||||
data.map { it.track.album }.toSet().map { it.cover.original }.take(4).forEachIndexed { index, url ->
|
data.map { it.track.album }.toSet().map { it?.cover?.original }.take(4).forEachIndexed { index, url ->
|
||||||
val imageView = when (index) {
|
val imageView = when (index) {
|
||||||
0 -> cover_top_left
|
0 -> cover_top_left
|
||||||
1 -> cover_top_right
|
1 -> cover_top_right
|
||||||
|
|
|
@ -22,7 +22,7 @@ class TrackInfoDetailsFragment : DialogFragment() {
|
||||||
return TrackInfoDetailsFragment().apply {
|
return TrackInfoDetailsFragment().apply {
|
||||||
arguments = bundleOf(
|
arguments = bundleOf(
|
||||||
"artistName" to track.artist.name,
|
"artistName" to track.artist.name,
|
||||||
"albumTitle" to track.album.title,
|
"albumTitle" to track.album?.title,
|
||||||
"trackTitle" to track.title,
|
"trackTitle" to track.title,
|
||||||
"trackCopyright" to track.copyright,
|
"trackCopyright" to track.copyright,
|
||||||
"trackLicense" to track.license,
|
"trackLicense" to track.license,
|
||||||
|
|
|
@ -41,7 +41,7 @@ class MediaControlsManager(val context: Service, private val scope: CoroutineSco
|
||||||
val openIntent = Intent(context, MainActivity::class.java).apply { action = NOTIFICATION_ACTION_OPEN_QUEUE.toString() }
|
val openIntent = Intent(context, MainActivity::class.java).apply { action = NOTIFICATION_ACTION_OPEN_QUEUE.toString() }
|
||||||
val openPendingIntent = PendingIntent.getActivity(context, 0, openIntent, 0)
|
val openPendingIntent = PendingIntent.getActivity(context, 0, openIntent, 0)
|
||||||
|
|
||||||
val coverUrl = maybeNormalizeUrl(track.album.cover.original)
|
val coverUrl = maybeNormalizeUrl(track.album?.cover?.original)
|
||||||
|
|
||||||
notification = NotificationCompat.Builder(
|
notification = NotificationCompat.Builder(
|
||||||
context,
|
context,
|
||||||
|
|
|
@ -342,7 +342,7 @@ class PlayerService : Service() {
|
||||||
|
|
||||||
private fun buildTrackMetadata(track: Track?): MediaMetadataCompat {
|
private fun buildTrackMetadata(track: Track?): MediaMetadataCompat {
|
||||||
track?.let {
|
track?.let {
|
||||||
val coverUrl = maybeNormalizeUrl(track.album.cover.original)
|
val coverUrl = maybeNormalizeUrl(track.album?.cover?.original)
|
||||||
|
|
||||||
return mediaMetadataBuilder.apply {
|
return mediaMetadataBuilder.apply {
|
||||||
putString(MediaMetadataCompat.METADATA_KEY_TITLE, track.title)
|
putString(MediaMetadataCompat.METADATA_KEY_TITLE, track.title)
|
||||||
|
|
|
@ -99,7 +99,7 @@ data class Track(
|
||||||
val id: Int = 0,
|
val id: Int = 0,
|
||||||
val title: String,
|
val title: String,
|
||||||
val artist: Artist,
|
val artist: Artist,
|
||||||
val album: Album,
|
val album: Album?,
|
||||||
val position: Int = 0,
|
val position: Int = 0,
|
||||||
val uploads: List<Upload> = listOf(),
|
val uploads: List<Upload> = listOf(),
|
||||||
val copyright: String? = null,
|
val copyright: String? = null,
|
||||||
|
@ -143,7 +143,7 @@ data class Track(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun cover() = album.cover.original
|
override fun cover() = album?.cover?.original
|
||||||
override fun title() = title
|
override fun title() = title
|
||||||
override fun subtitle() = artist.name
|
override fun subtitle() = artist.name
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Loading…
Reference in New Issue