application/live-plot-graph/src/main/java/org/videolan/liveplotgraph/LegendView.kt

@@ -57,11 +57,11 @@ class LegendView : ConstraintLayout, PlotViewDataChangeListener {
     private fun initAttributes(attrs: AttributeSet, defStyle: Int) {
         attrs.let {
 
-            val a = context.theme.obtainStyledAttributes(attrs, R.styleable.LPGPlotView, 0, defStyle)
+            val a = context.theme.obtainStyledAttributes(attrs, R.styleable.LPGLegendView, 0, defStyle)
             try {
-                plotViewId = a.getResourceId(a.getIndex(R.styleable.LPGLegendView_lpg_plot_view), -1)
+                plotViewId = a.getResourceId(R.styleable.LPGLegendView_lpg_plot_view, -1)
             } catch (e: Exception) {
-                Log.w("", e.message, e)
+                Log.w("LegendView", e.message, e)
             } finally {
                 a.recycle()
             }
@@ -72,11 +72,12 @@ class LegendView : ConstraintLayout, PlotViewDataChangeListener {
         super.onAttachedToWindow()
         //workaround for editor
         if (!isInEditMode) {
-            context?.let {
-                plotView = (it as Activity).findViewById(plotViewId)
-                if (!::plotView.isInitialized) throw IllegalStateException("A valid plot view has to be provided")
-                plotView.addListener(this)
-            }
+            (context as? Activity)?.let { activity ->
+                activity.findViewById<PlotView>(plotViewId)?.let {
+                    plotView = it
+                    plotView.addListener(this)
+                }
+            } ?: Log.w("LegendView", "Cannot find the plot view with id $plotViewId")
         }
         layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
     }

application/vlc-android/res/layout/audio_player.xml

@@ -41,16 +41,6 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-                android:id="@+id/bottom_gradient"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:background="?attr/audio_player_gradient_bottom"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/guideline8" />
-
         <View
                 android:id="@+id/top_gradient"
                 android:layout_width="0dp"
@@ -346,6 +336,16 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/header" />
 
+        <View
+                android:id="@+id/bottom_gradient"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:background="?attr/audio_player_gradient_bottom"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/guideline8" />
+
         <TextView
                 android:id="@+id/audio_play_progress"
                 android:layout_width="wrap_content"

application/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.kt

@@ -171,6 +171,13 @@ open class AudioPlayerContainerActivity : BaseActivity() {
         if (bottomIsHiddden)  bottomBehavior?.setCollapsed()
         playerBehavior.peekHeight = resources.getDimensionPixelSize(R.dimen.player_peek_height)
         updateFragmentMargins()
+        playerBehavior.setLayoutListener {
+            // [AudioPlayer.showCover] applies a new [ConstraintSet]. It cannot be done in [AudioPlayer.onCreate] because it would compete with
+            // [BottomSheetBehavior.onLayoutChild] and prevent any scroll event to be forwarded by the ConstraintLayout views (the bookmark list for example)
+            // That why we wait that the layout has been done to perform this. See https://code.videolan.org/videolan/vlc-android/-/issues/2241#note_291050
+            audioPlayer.showCover(settings.getBoolean("audio_player_show_cover", false))
+            if (playerBehavior.state == STATE_COLLAPSED) audioPlayer.onSlide(0f)
+        }
         playerBehavior.addBottomSheetCallback(object : BottomSheetCallback() {
             override fun onSlide(bottomSheet: View, slideOffset: Float) {
                 audioPlayer.onSlide(slideOffset)

application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt

@@ -164,7 +164,6 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, IAudioPlay
 
         registerForContextMenu(binding.songsList)
         userVisibleHint = true
-        showCover(settings.getBoolean("audio_player_show_cover", false))
         binding.playlistSwitch.setImageResource(if (isShowingCover()) R.drawable.ic_playlist_audio else R.drawable.ic_playlist_audio_on)
         binding.timeline.setOnSeekBarChangeListener(timelineListener)
 

application/vlc-android/src/org/videolan/vlc/gui/helpers/PlayerBehavior.kt

@@ -10,12 +10,15 @@ import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
 import org.videolan.tools.dp
+import java.util.concurrent.atomic.AtomicBoolean
 
 @ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
 class PlayerBehavior<V : View> : com.google.android.material.bottomsheet.BottomSheetBehavior<V> {
     private var lock = false
     private var listener : ((top:Int) -> Unit)? = null
+    private var layoutListener : (() -> Unit)? = null
+    private var layoutDone = AtomicBoolean(false)
 
     constructor() {
         isHideable = true
@@ -42,6 +45,10 @@ class PlayerBehavior<V : View> : com.google.android.material.bottomsheet.BottomS
         this.listener = null
     }
 
+    fun setLayoutListener(listener : () -> Unit) {
+        this.layoutListener = listener
+    }
+
     fun lock(lock: Boolean) {
         this.lock = lock
     }
@@ -145,6 +152,8 @@ class PlayerBehavior<V : View> : com.google.android.material.bottomsheet.BottomS
         super.onLayoutChild(parent, child, layoutDirection)
     } catch (ignored: IndexOutOfBoundsException) {
         false
+    } finally {
+        if (!layoutDone.getAndSet(true)) layoutListener?.invoke()
     }
 
     override fun onTouchEvent(parent: CoordinatorLayout, child: V, event: MotionEvent): Boolean {

application/vlc-android/src/org/videolan/vlc/gui/video/PopupManager.kt

@@ -127,7 +127,7 @@ class PopupManager constructor(private val service: PlaybackService) : PlaybackS
         return false
     }
 
-    override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
+    override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, distanceX: Float, distanceY: Float): Boolean {
         return false
     }