From fbbd90111dd55dc819b31de5cf497389fc5bb419 Mon Sep 17 00:00:00 2001 From: Christophe Henry Date: Tue, 11 Apr 2023 13:16:03 +0200 Subject: [PATCH] Fix a few regressions with the new bottom sheet --- .../audio/funkwhale/ffa/adapters/FavoritesAdapter.kt | 1 - .../funkwhale/ffa/adapters/PlaylistTracksAdapter.kt | 1 - .../audio/funkwhale/ffa/views/NowPlayingBottomSheet.kt | 9 +++++++-- 3 files changed, 7 insertions(+), 4 deletions(-) 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 590f929..b399cf1 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/FavoritesAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/FavoritesAdapter.kt @@ -71,7 +71,6 @@ class FavoritesAdapter( CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(track.cover())) .fit() - .placeholder(R.drawable.cover) .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 1f0bdad..056eda3 100644 --- a/app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt +++ b/app/src/main/java/audio/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt @@ -73,7 +73,6 @@ class PlaylistTracksAdapter( CoverArt.withContext(layoutInflater.context, maybeNormalizeUrl(playlistTrack.track.cover())) .fit() - .placeholder(R.drawable.cover) .transform(RoundedCornersTransformation(16, 0)) .into(holder.cover) diff --git a/app/src/main/java/audio/funkwhale/ffa/views/NowPlayingBottomSheet.kt b/app/src/main/java/audio/funkwhale/ffa/views/NowPlayingBottomSheet.kt index b0e079f..aa0881e 100644 --- a/app/src/main/java/audio/funkwhale/ffa/views/NowPlayingBottomSheet.kt +++ b/app/src/main/java/audio/funkwhale/ffa/views/NowPlayingBottomSheet.kt @@ -10,6 +10,9 @@ import audio.funkwhale.ffa.utils.BottomSheetIneractable import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.card.MaterialCardView +import androidx.core.content.res.use + + class NowPlayingBottomSheet @JvmOverloads constructor ( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : MaterialCardView(context, attrs), BottomSheetIneractable { @@ -19,8 +22,10 @@ class NowPlayingBottomSheet @JvmOverloads constructor ( init { - context.theme.obtainStyledAttributes(attrs, R.styleable.NowPlaying, defStyleAttr, 0).use { - targetHeaderId = it.getResourceId(R.styleable.NowPlaying_target_header, NO_ID) + targetHeaderId =context.theme.obtainStyledAttributes( + attrs, R.styleable.NowPlaying, defStyleAttr, 0 + ).use { + it.getResourceId(R.styleable.NowPlaying_target_header, NO_ID) } }