vlc-android/res/drawable/rectangle_circle_right_white.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white_more_transparent" />
+    <corners
+        android:topRightRadius="24dp"
+        android:bottomRightRadius="24dp" />
+
+</shape>
\ No newline at end of file

vlc-android/res/drawable/rectangle_circle_right_white_selector.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@drawable/rectangle_circle_right_white" />
+    <item android:state_selected="true" android:drawable="@drawable/rectangle_circle_right_white" />
+    <item android:state_pressed="true" android:drawable="@drawable/rectangle_circle_right_white" />
+    <item android:drawable="@drawable/empty" />
+</selector>
\ No newline at end of file

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

@@ -76,26 +76,35 @@
                 android:src="?attr/ic_playasaudio_off" />
 
             <org.videolan.vlc.gui.view.HeaderMediaSwitcher
-                android:id="@+id/audio_media_switcher"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:layout_constraintStart_toEndOf="@+id/playlist_playasaudio_off"
-                app:layout_constraintEnd_toStartOf="@+id/barrier"
-                android:background="#00000000" />
+                    android:id="@+id/audio_media_switcher"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintStart_toEndOf="@+id/playlist_playasaudio_off"
+                    app:layout_constraintEnd_toStartOf="@+id/barrier"
+                    android:background="#00000000"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    />
 
             <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/playlist_search_text"
-                android:layout_marginEnd="2dp"
-                android:focusable="true"
-                android:visibility="gone">
-                <EditText
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:hint="@string/search_hint"
-                    android:inputType="textFilter"
-                    android:imeOptions="actionSearch"/>
+                    android:id="@+id/playlist_search_text"
+                    android:focusable="true"
+                    android:visibility="gone"
+                    android:layout_marginTop="4dp"
+                    app:layout_constraintEnd_toEndOf="@+id/header_play_pause"
+                    app:layout_constraintStart_toEndOf="@+id/playlist_playasaudio_off"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginStart="8dp">
+
+                <EditText
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/search_hint"
+                        android:inputType="textFilter"
+                        android:imeOptions="actionSearch"/>
             </com.google.android.material.textfield.TextInputLayout>
 
             <ImageView
@@ -164,17 +173,17 @@
                 android:focusable="true"
                 android:scaleType="fitXY"
                 android:onClick="@{fragment::onPlayPauseClick}"
-                android:onLongClick="@{fragment::onStopClick}"
-                android:src="?attr/ic_pause" />
+                android:onLongClick="@{fragment::onStopClick}" />
 
             <androidx.constraintlayout.widget.Barrier
-                android:id="@+id/barrier"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:barrierDirection="start"
-                app:constraint_referenced_ids="header_time, playlist_ab_repeat"/>
+                    android:id="@+id/barrier"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:barrierDirection="start"
+                    app:constraint_referenced_ids="header_time,playlist_search"
+                    tools:layout_editor_absoluteX="609dp"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -292,19 +301,18 @@
             android:src="?attr/ic_repeat" />
 
         <ImageView
-            android:id="@+id/play_pause"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            app:layout_constraintBottom_toTopOf="@+id/timeline"
-            app:layout_constraintStart_toEndOf="@+id/previous"
-            app:layout_constraintEnd_toStartOf="@+id/next"
-            android:contentDescription="@string/play"
-            android:layout_marginBottom="@dimen/audioplayer_controls_margin"
-            android:focusable="true"
-            android:scaleType="fitXY"
-            android:onClick="@{fragment::onPlayPauseClick}"
-            android:onLongClick="@{fragment::onStopClick}"
-            android:src="?attr/ic_pause" />
+                android:id="@+id/play_pause"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                app:layout_constraintBottom_toTopOf="@+id/timeline"
+                app:layout_constraintStart_toEndOf="@+id/previous"
+                app:layout_constraintEnd_toStartOf="@+id/next"
+                android:contentDescription="@string/play"
+                android:layout_marginBottom="@dimen/audioplayer_controls_margin"
+                android:focusable="true"
+                android:scaleType="fitXY"
+                android:onClick="@{fragment::onPlayPauseClick}"
+                android:onLongClick="@{fragment::onStopClick}" />
 
         <ImageView
             android:id="@+id/next"

vlc-android/res/layout/activity_media_list_tv.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:targetApi="jelly_bean">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <import type="android.text.TextUtils" />
+
+        <import type="org.videolan.medialibrary.media.MediaLibraryItem" />
+
+
+        <variable
+            name="item"
+            type="MediaLibraryItem" />
+
+        <variable
+            name="cover"
+            type="android.graphics.drawable.BitmapDrawable" />
+
+        <variable
+            name="title"
+            type="String" />
+
+        <variable
+            name="subtitle"
+            type="String" />
+
+        <variable
+            name="totalTime"
+            type="String" />
+
+        <variable
+            name="imageWidth"
+            type="int" />
+
+    </data>
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context="org.videolan.vlc.gui.tv.details.MediaListActivity"
+        tools:theme="@style/Theme.VLC.TV">
+
+        <FrameLayout
+            android:id="@+id/frameLayout"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:background="@color/tv_card_content_darker"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+        </FrameLayout>
+
+        <ImageView
+            android:id="@+id/cover"
+            android:layout_width="0dp"
+            android:layout_height="90dp"
+            android:layout_marginStart="@dimen/tv_overscan_horizontal"
+            android:layout_marginBottom="8dp"
+            android:background="@{cover}"
+            app:imageWidth="@{imageWidth}"
+            app:layout_constraintBottom_toBottomOf="@+id/frameLayout"
+            app:layout_constraintDimensionRatio="1"
+            app:layout_constraintStart_toStartOf="parent"
+            app:mediaWithWidth="@{item}"
+            tools:srcCompat="@tools:sample/avatars" />
+
+        <TextView
+            android:id="@+id/albumTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:text="@{title}"
+            android:textColor="@color/white"
+            android:textSize="18sp"
+            app:layout_constraintStart_toEndOf="@+id/cover"
+            app:layout_constraintTop_toTopOf="@+id/cover"
+            tools:text="Symphony No. 1" />
+
+        <TextView
+            android:id="@+id/albumSubtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:text="@{subtitle}"
+            app:layout_constraintStart_toEndOf="@+id/cover"
+            app:layout_constraintTop_toBottomOf="@+id/albumTitle"
+            tools:text="Ludwig van Beethoven" />
+
+        <TextView
+            android:id="@+id/albumTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:text="@{totalTime}"
+            app:layout_constraintStart_toEndOf="@+id/cover"
+            app:layout_constraintTop_toBottomOf="@+id/albumSubtitle"
+            tools:text="01:38:27" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="end"
+            app:constraint_referenced_ids="albumSubtitle,albumTitle"
+            tools:layout_editor_absoluteX="960dp" />
+
+        <HorizontalScrollView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginBottom="8dp"
+            app:layout_constraintBottom_toBottomOf="@+id/frameLayout"
+            app:layout_constraintEnd_toEndOf="@+id/media_list"
+            app:layout_constraintStart_toEndOf="@+id/barrier2">
+
+            <LinearLayout
+                style="?android:attr/buttonBarStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:orientation="horizontal">
+
+                <androidx.appcompat.widget.AppCompatImageButton
+                    android:id="@+id/play"
+                    android:layout_marginEnd="8dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/button_circle_white_selector"
+                    android:padding="8dp"
+                    android:text="@string/play"
+                    app:srcCompat="@drawable/ic_tv_list_play" />
+
+                <androidx.appcompat.widget.AppCompatImageButton
+                    android:id="@+id/delete"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:background="@drawable/button_circle_white_selector"
+                    android:padding="8dp"
+                    android:text="@string/delete"
+                    app:srcCompat="@drawable/ic_tv_list_delete" />
+
+                <androidx.appcompat.widget.AppCompatImageButton
+                    android:id="@+id/insert_next"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:background="@drawable/button_circle_white_selector"
+                    android:padding="8dp"
+                    android:text="@string/insert_next"
+                    app:srcCompat="@drawable/ic_tv_list_playnext" />
+
+                <androidx.appcompat.widget.AppCompatImageButton
+                    android:id="@+id/append"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:background="@drawable/button_circle_white_selector"
+                    android:padding="8dp"
+                    android:text="@string/append"
+                    app:srcCompat="@drawable/ic_tv_list_append" />
+
+                <androidx.appcompat.widget.AppCompatImageButton
+                    android:id="@+id/add_playlist"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/button_circle_white_selector"
+                    android:padding="8dp"
+                    android:text="@string/add_to_playlist"
+                    app:srcCompat="@drawable/ic_tv_list_addtoplaylist" />
+
+            </LinearLayout>
+        </HorizontalScrollView>
+
+        <org.videolan.vlc.gui.tv.FocusableRecyclerView
+            android:id="@+id/media_list"
+            android:layout_width="800dp"
+            android:layout_height="0dp"
+            android:clipToPadding="false"
+            android:paddingTop="40dp"
+            android:paddingBottom="150dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/frameLayout" />
+
+        <include layout="@layout/tv_time" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

vlc-android/res/layout/activity_media_list_tv_item.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:targetApi="jelly_bean">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <import type="org.videolan.medialibrary.Tools" />
+
+        <import type="android.text.TextUtils" />
+
+        <import type="org.videolan.medialibrary.media.MediaWrapper" />
+
+
+        <variable
+            name="item"
+            type="MediaWrapper" />
+
+        <variable
+            name="cover"
+            type="android.graphics.drawable.BitmapDrawable" />
+
+        <variable
+            name="holder"
+            type="org.videolan.vlc.gui.tv.details.MediaListAdapter.MediaListViewHolder" />
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="@color/tv_card_content_dark"
+        android:descendantFocusability="afterDescendants"
+        tools:context="org.videolan.vlc.gui.tv.details.MediaListActivity"
+        tools:theme="@style/Theme.VLC.TV">
+
+
+        <ImageView
+            android:id="@+id/cover"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:background="@{cover}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="1"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:media="@{item}"
+            tools:srcCompat="@tools:sample/avatars" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/item_play"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:alpha="0"
+            android:background="@color/blacktransparent"
+            android:padding="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/item_selector"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_tv_list_play_big" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:text="@{item.title}"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toTopOf="@+id/textView16"
+            app:layout_constraintEnd_toStartOf="@+id/textView17"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/item_play"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:text="Symphony No. 1" />
+
+        <TextView
+            android:id="@+id/textView16"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:text="@{item.artist}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/textView17"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/item_play"
+            app:layout_constraintTop_toBottomOf="@+id/title"
+            tools:text="Ludwig van Beethoven" />
+
+        <TextView
+            android:id="@+id/textView17"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:text="@{Tools.millisToString(item.length)}"
+            android:textAlignment="textEnd"
+            android:textColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/item_selector"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="1:05:56" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/item_move_up"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:alpha="0"
+            android:focusableInTouchMode="true"
+            tools:alpha="1"
+            android:background="@drawable/button_circle_white_selector"
+            android:onClick="@{holder::onClickMoveUp}"
+            android:padding="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/item_move_down"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_tv_list_moveup" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/item_move_down"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:alpha="0"
+            android:background="@drawable/button_circle_white_selector"
+            android:focusableInTouchMode="true"
+            android:onClick="@{holder::onClickMoveDown}"
+            android:padding="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/item_insert_next"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_tv_list_movedown"
+            tools:alpha="1" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/item_remove"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:alpha="0"
+            android:background="@drawable/button_circle_white_selector"
+            android:focusableInTouchMode="true"
+            android:onClick="@{holder::onClickRemove}"
+            android:padding="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_tv_list_removefromplaylist"
+            tools:alpha="1" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/item_insert_next"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:alpha="0"
+            android:background="@drawable/button_circle_white_selector"
+            android:focusableInTouchMode="true"
+            android:padding="8dp"
+            android:onClick="@{holder::onClickPlayNext}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/item_append"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_tv_list_playnext"
+            tools:alpha="1" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/item_append"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:focusableInTouchMode="true"
+            android:alpha="0"
+            tools:alpha="1"
+            android:background="@drawable/button_circle_white_selector"
+            android:onClick="@{holder::onClickAppend}"
+            android:padding="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/item_add_playlist"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_tv_list_append" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/item_add_playlist"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:alpha="0"
+            android:background="@drawable/button_circle_white_selector"
+            android:focusableInTouchMode="true"
+            android:onClick="@{holder::onClickAddToPlaylist}"
+            android:padding="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/item_remove"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_tv_list_addtoplaylist"
+            tools:alpha="1" />
+
+        <View
+            android:id="@+id/item_selector"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:focusableInTouchMode="true"
+            android:onClick="@{holder::onClickPlay}"
+            android:focusable="true"
+            android:background="@drawable/rectangle_circle_right_white_selector"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/item_move_up"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

vlc-android/res/layout/audio_player.xml

@@ -85,18 +85,24 @@
                 android:background="#00000000" />
 
             <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:id="@+id/playlist_search_text"
-                android:layout_marginEnd="2dp"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginEnd="8dp"
                 android:focusable="true"
-                android:visibility="gone">
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="@+id/header_play_pause"
+                app:layout_constraintStart_toEndOf="@+id/playlist_playasaudio_off"
+                app:layout_constraintTop_toTopOf="parent">
+
                 <EditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/search_hint"
-                    android:inputType="textFilter"
-                    android:imeOptions="actionSearch"/>
+                    android:imeOptions="actionSearch"
+                    android:inputType="textFilter" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <ImageView
@@ -165,8 +171,7 @@
                 android:focusable="true"
                 android:scaleType="fitXY"
                 android:onClick="@{fragment::onPlayPauseClick}"
-                android:onLongClick="@{fragment::onStopClick}"
-                android:src="?attr/ic_pause" />
+                android:onLongClick="@{fragment::onStopClick}" />
 
             <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/barrier"
@@ -218,6 +223,15 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/header" />
 
+        <include
+                layout="@layout/shadow_bottom"
+                android:layout_width="0dp"
+                android:layout_height="6dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintBottom_toBottomOf="@+id/songs_list"
+                android:id="@+id/include"/>
+
         <TextView
             android:id="@+id/time"
             android:layout_width="wrap_content"
@@ -232,6 +246,19 @@
             app:layout_constraintBottom_toTopOf="@+id/timeline"
             app:layout_constraintStart_toStartOf="parent" />
 
+        <!--<View-->
+        <!--android:layout_width="0dp"-->
+        <!--android:layout_height="0dp"-->
+        <!--android:background="@color/transparent"-->
+        <!--android:outlineProvider="bounds"-->
+        <!--android:clipToPadding="false"-->
+        <!--app:layout_constraintLeft_toLeftOf="parent"-->
+        <!--app:layout_constraintRight_toRightOf="parent"-->
+        <!--app:layout_constraintTop_toBottomOf="@+id/songs_list"-->
+        <!--android:id="@+id/view"-->
+        <!--android:elevation="8dp"-->
+        <!--app:layout_constraintBottom_toBottomOf="parent"/>-->
+
         <SeekBar
             android:id="@+id/timeline"
             android:layout_width="0dp"
@@ -294,18 +321,17 @@
 
         <ImageView
             android:id="@+id/play_pause"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            app:layout_constraintBottom_toTopOf="@+id/time"
-            app:layout_constraintLeft_toRightOf="@+id/previous"
-            app:layout_constraintRight_toLeftOf="@+id/next"
-            android:contentDescription="@string/play"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_marginBottom="@dimen/audioplayer_controls_margin"
+            android:contentDescription="@string/play"
             android:focusable="true"
-            android:scaleType="fitXY"
             android:onClick="@{fragment::onPlayPauseClick}"
             android:onLongClick="@{fragment::onStopClick}"
-            android:src="?attr/ic_pause" />
+            android:scaleType="fitXY"
+            app:layout_constraintBottom_toTopOf="@+id/time"
+            app:layout_constraintLeft_toRightOf="@+id/previous"
+            app:layout_constraintRight_toLeftOf="@+id/next" />
 
         <ImageView
             android:id="@+id/next"

vlc-android/res/layout/audio_player_header.xml

@@ -120,8 +120,7 @@
             android:focusable="true"
             android:scaleType="fitXY"
             android:onClick="@{fragment::onPlayPauseClick}"
-            android:onLongClick="@{fragment::onStopClick}"
-            android:src="?attr/ic_pause" />
+            android:onLongClick="@{fragment::onStopClick}" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

vlc-android/res/layout/browser_path_item.xml

 <?xml version="1.0" encoding="utf-8"?>
 <TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingBottom="4dp"
-    android:paddingTop="3dp"
-    android:textColor="@color/grey50"
-    tools:text="folder"/>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="4dp"
+        android:paddingTop="3dp"
+        android:textColor="?attr/ariane_text_color"
+        tools:text="folder"/>
\ No newline at end of file

vlc-android/res/layout/dialog_playlist.xml

@@ -6,8 +6,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="@dimen/default_margin">
+        android:layout_height="match_parent">
 
 
         <TextView
@@ -15,6 +14,7 @@
             style="@style/Theme.VLC.BottomSheetTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:text="@string/add_to_playlist"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -46,6 +46,7 @@
             style="@style/Theme.VLC.BottomSheetTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:layout_marginTop="16dp"
             android:text="@string/add_to_new_playlist"
             app:layout_constraintStart_toStartOf="parent"
@@ -55,6 +56,7 @@
             android:id="@+id/dialog_playlist_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             app:layout_constraintEnd_toStartOf="@+id/dialog_playlist_save"
@@ -77,6 +79,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/dialog_playlist_name"
             android:layout_alignParentEnd="true"
+            android:layout_marginEnd="8dp"
             android:text="@string/add"
             app:layout_constraintBottom_toBottomOf="@+id/dialog_playlist_name"
             app:layout_constraintEnd_toEndOf="parent" />

vlc-android/res/layout/info_activity.xml

 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout
+        xmlns:vlc="http://schemas.android.com/apk/res-auto"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
+
     <data>
-        <import type="android.view.View" />
-        <import type="org.videolan.medialibrary.Tools" />
-        <import type="org.videolan.medialibrary.media.MediaLibraryItem" />
+
+        <import type="android.view.View"/>
+
+        <import type="org.videolan.medialibrary.Tools"/>
+
+        <import type="org.videolan.medialibrary.media.MediaLibraryItem"/>
+
+        <import type="android.text.TextUtils"/>
+
+
         <variable
-            name="item"
-            type="MediaLibraryItem" />
+                name="item"
+                type="MediaLibraryItem"/>
+
         <variable
-            name="cover"
-            type="android.graphics.drawable.BitmapDrawable"/>
+                name="cover"
+                type="android.graphics.drawable.BitmapDrawable"/>
+
         <variable
-            name="length"
-            type="String" />
+                name="length"
+                type="String"/>
+
         <variable
-            name="path"
-            type="String" />
+                name="path"
+                type="String"/>
+
         <variable
-            name="sizeTitleText"
-            type="String" />
+                name="sizeTitleText"
+                type="String"/>
+
+        <variable
+                name="extraTitleText"
+                type="String"/>
+
         <variable
-            name="extraTitleText"
-            type="String" />
+                name="sizeValueText"
+                type="String"/>
+
         <variable
-            name="sizeValueText"
-            type="String" />
+                name="extraValueText"
+                type="String"/>
+
         <variable
-            name="extraValueText"
-            type="String" />
+                name="progress"
+                type="int"/>
+
         <variable
-            name="progress"
-            type="int" />
+                name="resolution"
+                type="String"/>
+
     </data>
+
     <androidx.coordinatorlayout.widget.CoordinatorLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:vlc="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/coordinator"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appbar"
+            android:id="@+id/coordinator"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/info_appbar_height"
-            android:fitsSystemWindows="true">
-            <com.google.android.material.appbar.CollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
+            android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+                android:id="@+id/appbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fitsSystemWindows="true"
-                vlc:title="@{item.title}"
-                vlc:theme="@style/Toolbar.VLC"
-                vlc:contentScrim="?attr/background_actionbar"
-                vlc:expandedTitleMarginEnd="64dp"
-                vlc:expandedTitleMarginStart="48dp"
-                vlc:layout_scrollFlags="scroll|exitUntilCollapsed" >
-                <ImageView
-                    android:id="@+id/playlist_cover"
+                android:layout_height="@dimen/info_appbar_height"
+                android:fitsSystemWindows="true">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                    android:id="@+id/collapsing_toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    android:src="@{cover}"
-                    vlc:layout_collapseMode="parallax" />
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/main_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    vlc:navigationContentDescription="@string/abc_action_bar_up_description"
-                    vlc:popupTheme="?attr/toolbar_popup_style"
+                    android:fitsSystemWindows="true"
+                    vlc:title="@{item.title}"
                     vlc:theme="@style/Toolbar.VLC"
-                    vlc:navigationIcon="?attr/homeAsUpIndicator"
-                    vlc:titleMarginStart="@dimen/default_margin"
-                    vlc:layout_scrollFlags="scroll|enterAlways"
-                    vlc:layout_collapseMode="pin"/>
+                    vlc:contentScrim="?attr/background_actionbar"
+                    vlc:expandedTitleMarginEnd="64dp"
+                    vlc:expandedTitleMarginStart="48dp"
+                    vlc:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+                <ImageView
+                        android:id="@+id/playlist_cover"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        android:src="@{cover}"
+                        vlc:layout_collapseMode="parallax"/>
+
+                <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="100dp"
+                        android:layout_gravity="bottom"
+                        android:background="@drawable/black_gradient"
+                        vlc:layout_collapseMode="parallax"/>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                    <TextView
+                            android:id="@+id/ml_item_resolution"
+                            style="@style/VLC.TextViewDescription"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:text="@{resolution}"
+                            android:padding="@dimen/kl_half"
+                            android:background="@drawable/rounded_corners"
+                            android:textColor="@color/grey50"
+                            android:visibility="@{resolution == null ? View.GONE : View.VISIBLE, default=gone}"
+                            vlc:layout_collapseMode="parallax"
+                            vlc:layout_constraintTop_toTopOf="parent"
+                            vlc:layout_constraintEnd_toEndOf="parent"
+                            tools:visibility="visible"
+                            tools:text="4K"
+                            android:layout_marginEnd="16dp"/>
+
+                    <ImageView
+                            android:id="@+id/info_subtitles"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="@dimen/default_margin"
+                            vlc:layout_constraintEnd_toEndOf="parent"
+                            android:src="@drawable/ic_audiosub_circle_normal_o"
+                            android:visibility="gone"
+                            tools:visibility="visible"
+                            android:layout_marginTop="8dp"
+                            vlc:layout_constraintTop_toBottomOf="@+id/ml_item_resolution"/>
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                <androidx.appcompat.widget.Toolbar
+                        android:id="@+id/main_toolbar"
+                        android:layout_width="match_parent"
+                        android:layout_height="?attr/actionBarSize"
+                        vlc:navigationContentDescription="@string/abc_action_bar_up_description"
+                        vlc:popupTheme="?attr/toolbar_popup_style"
+                        vlc:theme="@style/Toolbar.VLC"
+                        vlc:navigationIcon="?attr/homeAsUpIndicator"
+                        vlc:titleMarginStart="@dimen/default_margin"
+                        vlc:layout_scrollFlags="scroll|enterAlways"
+                        vlc:layout_collapseMode="pin"/>
             </com.google.android.material.appbar.CollapsingToolbarLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="@dimen/default_margin"
-            vlc:layout_behavior="@string/appbar_scrolling_view_behavior" >
-            <ProgressBar
-                android:id="@+id/image_progress"
-                android:layout_width="0dp"
-                android:layout_height="2dp"
-                android:layout_marginTop="@dimen/info_default_margin"
-                android:layout_marginRight="@dimen/info_progress_end_margin"
-                android:layout_marginEnd="@dimen/info_progress_end_margin"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                android:progressDrawable="?attr/gridview_progressbar"
-                android:background="@color/transparent"
-                android:indeterminate="false"
-                android:max="100"
-                android:progress="@{progress}"
-                android:secondaryProgress="100"
-                vlc:layout_constraintStart_toStartOf="parent"
-                vlc:layout_constraintEnd_toEndOf="parent"
-                android:visibility="@{progress > 0 ? View.VISIBLE : View.GONE}"/>
-            <TextView
-                android:id="@+id/info_path"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/info_default_margin"
-                vlc:layout_constraintTop_toBottomOf="@+id/image_progress"
-                vlc:layout_constraintStart_toStartOf="parent"
-                vlc:layout_constraintEnd_toEndOf="parent"
-                android:visibility="@{path != null ? View.VISIBLE : View.INVISIBLE}"
-                android:textColor="?attr/font_light"
-                android:text="@{path}" />
-            <TextView
-                android:id="@+id/length_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                vlc:layout_constraintTop_toBottomOf="@+id/info_path"
-                vlc:layout_constraintStart_toStartOf="parent"
-                android:visibility="@{length != null ? View.VISIBLE : View.INVISIBLE}"
-                android:layout_marginTop="@dimen/half_default_margin"
-                android:text="@string/length"
-                android:textColor="?attr/font_light" />
-            <TextView
-                android:id="@+id/length_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                vlc:layout_constraintTop_toBottomOf="@+id/info_path"
-                vlc:layout_constraintStart_toStartOf="@+id/barrier"
-                android:visibility="@{length != null ? View.VISIBLE : View.INVISIBLE}"
-                android:layout_margin="@dimen/half_default_margin"
-                android:textColor="?attr/font_light"
-                android:text="@{length}" />
-            <TextView
-                android:id="@+id/size_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                vlc:layout_constraintTop_toBottomOf="@+id/length_title"
-                vlc:layout_constraintStart_toStartOf="parent"
-                android:layout_marginTop="@dimen/half_default_margin"
-                android:text="@{sizeTitleText}"
-                android:textColor="?attr/font_light"
-                android:visibility="@{sizeValue != null ? View.VISIBLE : View.INVISIBLE}" />
-            <TextView
-                android:id="@+id/size_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                vlc:layout_constraintTop_toBottomOf="@+id/length_title"
-                vlc:layout_constraintStart_toStartOf="@+id/barrier"
-                android:layout_margin="@dimen/half_default_margin"
-                android:textColor="?attr/font_light"
-                android:text="@{sizeValueText}"
-                android:visibility="@{sizeValue != null ? View.VISIBLE : View.INVISIBLE}" />
-            <androidx.constraintlayout.widget.Barrier
-                android:id="@+id/barrier"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                vlc:layout_constraintTop_toTopOf="@id/length_title"
-                vlc:layout_constraintBottom_toBottomOf="@id/size_title"
-                vlc:barrierDirection="end"
-                vlc:constraint_referenced_ids="size_title, length_title"/>
-            <TextView
-                android:id="@+id/extra_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                vlc:layout_constraintTop_toBottomOf="@+id/size_title"
-                vlc:layout_constraintStart_toStartOf="parent"
-                android:layout_marginTop="@dimen/half_default_margin"
-                android:textColor="?attr/font_light"
-                android:text="@{extraTitleText}"
-                android:visibility="@{extraValue != null ? View.VISIBLE : View.INVISIBLE}" />
-            <TextView
-                android:id="@+id/extra_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                vlc:layout_constraintTop_toBottomOf="@+id/size_title"
-                vlc:layout_constraintStart_toEndOf="@+id/extra_title"
-                android:layout_margin="@dimen/half_default_margin"
-                android:textColor="?attr/font_light"
-                android:text="@{extraValueText}"
-                android:visibility="@{extraValue != null ? View.VISIBLE : View.INVISIBLE}"/>
-            <ImageView
-                android:id="@+id/info_subtitles"
+        <androidx.core.widget.NestedScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true"
+                vlc:layout_behavior="@string/appbar_scrolling_view_behavior"
+                android:id="@+id/container">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                <ProgressBar
+                        android:id="@+id/image_progress"
+                        android:layout_width="0dp"
+                        android:layout_height="4dp"
+                        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                        android:progressDrawable="@drawable/gridview_progressbar"
+                        android:background="@color/transparent"
+                        android:indeterminate="false"
+                        android:max="100"
+                        android:padding="0dp"
+                        android:progress="@{progress}"
+                        android:secondaryProgress="0"
+                        vlc:layout_constraintStart_toStartOf="parent"
+                        vlc:layout_constraintEnd_toEndOf="parent"
+                        android:visibility="@{progress > 0 ? View.VISIBLE : View.GONE}"
+                        vlc:layout_constraintTop_toTopOf="parent"/>
+
+                <androidx.constraintlayout.widget.Guideline
+                        android:orientation="vertical"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/guideline9"
+                        vlc:layout_constraintGuide_begin="16dp"/>
+
+                <androidx.constraintlayout.widget.Guideline
+                        android:orientation="vertical"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/guideline10"
+                        vlc:layout_constraintGuide_end="16dp"/>
+
+                <androidx.recyclerview.widget.RecyclerView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/ariane"
+                        vlc:layout_constraintTop_toBottomOf="@+id/image_progress"
+                        vlc:layout_constraintStart_toStartOf="parent"
+                        vlc:layout_constraintEnd_toEndOf="parent"
+                        tools:layout_height="48dp"
+                        android:paddingLeft="16dp"
+                        android:paddingRight="16dp"
+                        android:clipToPadding="false"
+                        android:layout_marginTop="8dp"/>
+
+                <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        vlc:srcCompat="@drawable/ic_duration"
+                        android:id="@+id/length_icon"
+                        android:layout_marginTop="24dp"
+                        android:padding="8dp"
+                        vlc:layout_constraintTop_toBottomOf="@+id/ariane"
+                        vlc:layout_constraintStart_toStartOf="parent"
+                        android:layout_marginStart="16dp"/>
+
+                <TextView
+                        android:id="@+id/length_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/length"
+                        android:textColor="?attr/font_audio_light"
+                        android:textStyle="bold"
+                        vlc:layout_constraintStart_toEndOf="@+id/length_icon"
+                        android:layout_marginStart="16dp"
+                        vlc:layout_constraintBottom_toTopOf="@+id/length_value"
+                        vlc:layout_constraintVertical_chainStyle="packed"
+                        vlc:layout_constraintTop_toTopOf="@+id/length_icon"/>
+
+                <TextView
+                        android:id="@+id/length_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="?attr/font_audio_light"
+                        android:text="@{length}"
+                        vlc:layout_constraintStart_toEndOf="@+id/length_icon"
+                        android:layout_marginStart="16dp"
+                        vlc:layout_constraintTop_toBottomOf="@+id/length_title"
+                        vlc:layout_constraintBottom_toBottomOf="@+id/length_icon"/>
+
+                <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        vlc:srcCompat="@drawable/ic_storage"
+                        android:id="@+id/size_icon"
+                        android:layout_marginTop="24dp"
+                        android:padding="8dp"
+                        android:visibility="@{TextUtils.isEmpty(sizeTitleText) ? View.GONE : View.VISIBLE}"
+                        vlc:layout_constraintTop_toBottomOf="@+id/length_icon"
+                        vlc:layout_constraintStart_toStartOf="parent"
+                        android:layout_marginStart="16dp"/>
+
+                <TextView
+                        android:id="@+id/size_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{sizeTitleText}"
+                        android:textColor="?attr/font_audio_light"
+                        android:textStyle="bold"
+                        vlc:layout_constraintStart_toEndOf="@+id/size_icon"
+                        android:layout_marginStart="16dp"
+                        vlc:layout_constraintBottom_toTopOf="@+id/size_value"
+                        vlc:layout_constraintTop_toTopOf="@+id/size_icon"
+                        vlc:layout_constraintVertical_chainStyle="packed"/>
+
+                <TextView
+                        android:id="@+id/size_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="?attr/font_audio_light"
+                        android:text="@{sizeValueText}"
+                        vlc:layout_constraintStart_toEndOf="@+id/size_icon"
+                        android:layout_marginStart="16dp"
+                        vlc:layout_constraintTop_toBottomOf="@+id/size_title"
+                        vlc:layout_constraintBottom_toBottomOf="@+id/size_icon"/>
+
+                <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        vlc:srcCompat="@drawable/ic_song"
+                        android:id="@+id/extra_icon"
+                        android:padding="8dp"
+                        android:layout_marginTop="24dp"
+                        android:visibility="@{TextUtils.isEmpty(extraTitleText) ? View.GONE : View.VISIBLE}"
+                        vlc:layout_constraintTop_toBottomOf="@+id/size_icon"
+                        vlc:layout_constraintStart_toStartOf="parent"
+                        android:layout_marginStart="16dp"/>
+
+                <TextView
+                        android:id="@+id/extra_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="?attr/font_audio_light"
+                        android:text="@{extraTitleText}"
+                        android:textStyle="bold"
+                        vlc:layout_constraintStart_toEndOf="@+id/extra_icon"
+                        android:layout_marginStart="16dp"
+                        vlc:layout_constraintBottom_toTopOf="@+id/extra_value"
+                        android:layout_marginTop="8dp"
+                        vlc:layout_constraintTop_toTopOf="@+id/extra_icon"
+                        vlc:layout_constraintVertical_chainStyle="packed"/>
+
+                <TextView
+                        android:id="@+id/extra_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        vlc:layout_constraintStart_toEndOf="@+id/extra_icon"
+                        android:textColor="?attr/font_audio_light"
+                        android:text="@{extraValueText}"
+                        android:layout_marginStart="16dp"
+                        vlc:layout_constraintTop_toBottomOf="@+id/extra_title"
+                        android:layout_marginBottom="8dp"
+                        vlc:layout_constraintBottom_toBottomOf="@+id/extra_icon"/>
+
+
+                <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/list"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        vlc:layout_constraintTop_toBottomOf="@+id/extra_icon"
+                        vlc:layout_constraintStart_toStartOf="parent"
+                        vlc:layout_constraintEnd_toEndOf="parent"
+                        android:clipToPadding="false"
+                        android:overScrollMode="never"
+                        android:paddingBottom="@dimen/listview_bottom_padding"
+                        android:visibility="@{item.itemType == MediaLibraryItem.TYPE_MEDIA ? View.VISIBLE : View.INVISIBLE}"
+                        android:layout_marginBottom="16dp"
+                        vlc:layout_constraintBottom_toBottomOf="parent"
+                        android:layout_marginTop="24dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"/>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.core.widget.NestedScrollView>
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+                vlc:rippleColor="@color/orange50"
+                android:id="@+id/fab"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/default_margin"
-                android:layout_marginEnd="@dimen/default_margin"
-                vlc:layout_constraintTop_toBottomOf="@+id/info_path"
-                vlc:layout_constraintEnd_toEndOf="parent"
-                android:src="@drawable/ic_audiosub_circle_normal_o"
-                android:visibility="gone" />
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/list"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                vlc:layout_constraintTop_toBottomOf="@+id/extra_title"
-                vlc:layout_constraintBottom_toBottomOf="parent"
-                vlc:layout_constraintStart_toStartOf="parent"
-                vlc:layout_constraintEnd_toEndOf="parent"
-                android:clipToPadding="false"
-                android:overScrollMode="never"
-                android:paddingBottom="@dimen/listview_bottom_padding"
-                android:visibility="@{item.itemType == MediaLibraryItem.TYPE_MEDIA ? View.VISIBLE : View.INVISIBLE}" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                vlc:layout_anchor="@+id/container"
+                vlc:layout_anchorGravity="bottom|end"
+                android:layout_margin="16dp"
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            vlc:rippleColor="@color/orange50"
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="25dp"
-            android:layout_marginEnd="25dp"
-            vlc:layout_anchor="@+id/appbar"
-            vlc:layout_anchorGravity="bottom|right|end"
-            android:src="@drawable/ic_fab_play"
-            android:tint="@color/grey50" />
+                vlc:layout_behavior="org.videolan.vlc.gui.helpers.FloatingActionButtonBehavior"
+                android:src="@drawable/ic_fab_play"
+                android:tint="@color/grey50"/>
 
         <include layout="@layout/audioplayercontainer"/>
 

vlc-android/res/layout/info_item.xml

@@ -20,29 +20,27 @@
         android:orientation="vertical" >
 
         <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/half_default_margin"
-            android:layout_marginEnd="@dimen/half_default_margin"
-            android:layout_marginTop="@dimen/half_default_margin"
-            android:gravity="center_vertical"
-            android:fontFamily="sans-serif"
-            android:textColor="?attr/list_title"
-            android:textSize="16sp"
-            android:scrollHorizontally="true"
-            tools:targetApi="jelly_bean" />
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/half_default_margin"
+                android:layout_marginEnd="@dimen/half_default_margin"
+                android:layout_marginTop="@dimen/half_default_margin"
+                android:gravity="center_vertical"
+                android:fontFamily="sans-serif"
+                android:textColor="?attr/font_audio_light"
+                android:textSize="18sp"
+                android:scrollHorizontally="true"
+                tools:targetApi="jelly_bean"
+                android:textStyle="bold"/>
         <TextView
-            android:id="@+id/subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/half_default_margin"
-            android:layout_marginLeft="@dimen/half_default_margin"
-            android:layout_marginRight="@dimen/half_default_margin"
-            android:fontFamily="sans-serif"
-            android:textColor="?attr/list_subtitle"
-            android:maxLines="2"
-            tools:targetApi="jelly_bean" />
+                android:id="@+id/subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/half_default_margin"
+                android:fontFamily="sans-serif"
+                android:textColor="?attr/list_subtitle"
+                tools:targetApi="jelly_bean"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file

vlc-android/res/layout/media_browser_tv_item.xml

@@ -54,113 +54,117 @@
     </data>
 
     <org.videolan.vlc.gui.tv.FocusableConstraintLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/tv_card_background"
-        android:clickable="true"
-        android:focusable="true"
-        android:longClickable="true"
-        android:minHeight="@dimen/audio_browser_item_size"
-        android:onClick="@{holder::onClick}"
-        android:onLongClick="@{holder::onLongClick}"
-        android:paddingBottom="@dimen/kl_small"
-        android:stateListAnimator="@animator/tv_recyclerview_item_pop"
-        vlc:elevation="1dp">
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/tv_card_background"
+            android:clickable="true"
+            android:focusable="true"
+            android:longClickable="true"
+            android:minHeight="@dimen/audio_browser_item_size"
+            android:onClick="@{holder::onClick}"
+            android:onLongClick="@{holder::onLongClick}"
+            android:paddingBottom="@dimen/kl_small"
+            android:stateListAnimator="@animator/tv_recyclerview_item_pop"
+            vlc:elevation="1dp">
 
 
         <!-- Image loading is handled by org.videolan.vlc.gui.helpers.ImageLoader.loadImage() -->
 
 
         <ImageView
-            android:id="@+id/media_cover"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:background="@color/lb_details_overview_bg_color"
-            tools:srcCompat="@drawable/ic_album_big"
-            vlc:constraintRatio="@{isSquare}"
-            android:src="@{cover}"
-            vlc:layout_constraintEnd_toEndOf="parent"
-            vlc:layout_constraintStart_toStartOf="parent"
-            vlc:layout_constraintTop_toTopOf="parent"
-            vlc:media="@{item}" />
+                android:id="@+id/media_cover"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_gravity="center"
+                android:background="@color/lb_details_overview_bg_color"
+                tools:srcCompat="@drawable/ic_album_big"
+                vlc:constraintRatio="@{isSquare}"
+                android:src="@{cover}"
+                vlc:layout_constraintEnd_toEndOf="parent"
+                vlc:layout_constraintStart_toStartOf="parent"
+                vlc:layout_constraintTop_toTopOf="parent"
+                vlc:media="@{item}"/>
 
         <ImageView
-            android:id="@+id/ml_item_seen"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_seen_normal"
-            android:visibility="@{seen == 0L ? View.GONE : View.VISIBLE}"
-            vlc:layout_constraintRight_toRightOf="parent"
-            vlc:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/ml_item_seen"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_seen_normal"
+                android:visibility="@{seen == 0L ? View.GONE : View.VISIBLE}"
+                vlc:layout_constraintRight_toRightOf="parent"
+                vlc:layout_constraintTop_toTopOf="parent"/>
 
 
         <TextView
-            android:id="@+id/badgeTV"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="@drawable/rounded_corners"
-            android:padding="@dimen/kl_half"
-            android:text="@{badge}"
-            android:textSize="12sp"
-            tools:text="4K"
-            vlc:layout_constraintBottom_toBottomOf="@id/media_cover"
-            vlc:layout_constraintEnd_toEndOf="parent" />
+                android:id="@+id/badgeTV"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginBottom="8dp"
+                android:background="@drawable/rounded_corners"
+                android:padding="@dimen/kl_half"
+                android:text="@{badge}"
+                android:textSize="12sp"
+                tools:text="4K"
+                vlc:layout_constraintBottom_toBottomOf="@id/media_cover"
+                vlc:layout_constraintEnd_toEndOf="parent"/>
 
         <ProgressBar
-            android:id="@+id/progressBar"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="0dp"
-            android:layout_height="2dp"
-            android:background="@color/transparent"
-            android:indeterminate="false"
-            android:max="@{max}"
-            android:progress="@{progress}"
-            android:progressDrawable="@drawable/gridview_progressbar"
-            android:visibility="@{progress > 0 ? View.VISIBLE : View.GONE}"
-            vlc:layout_constraintEnd_toEndOf="parent"
-            vlc:layout_constraintStart_toStartOf="parent"
-            vlc:layout_constraintTop_toBottomOf="@id/media_cover" />
+                android:id="@+id/progressBar"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="0dp"
+                android:layout_height="2dp"
+                android:background="@color/transparent"
+                android:indeterminate="false"
+                android:max="@{max}"
+                android:progress="@{progress}"
+                android:progressDrawable="@drawable/gridview_progressbar"
+                android:visibility="@{progress > 0 ? View.VISIBLE : View.GONE}"
+                vlc:layout_constraintEnd_toEndOf="parent"
+                vlc:layout_constraintStart_toStartOf="parent"
+                vlc:layout_constraintTop_toBottomOf="@id/media_cover"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:maxLines="2"
-            android:textSize="12sp"
-            tools:text="Title"
-            vlc:asyncText="@{item.title}"
-            vlc:layout_constraintEnd_toEndOf="parent"
-            vlc:layout_constraintStart_toStartOf="parent"
-            vlc:layout_constraintTop_toBottomOf="@+id/progressBar"
-            vlc:placeholder="@{item}" />
+                android:id="@+id/title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:maxLines="2"
+                android:textSize="12sp"
+                tools:text="Title"
+                vlc:asyncText="@{item.title}"
+                vlc:layout_constraintEnd_toEndOf="parent"
+                vlc:layout_constraintStart_toStartOf="parent"
+                vlc:layout_constraintTop_toBottomOf="@+id/progressBar"
+                vlc:placeholder="@{item}"
+                vlc:layout_constraintHorizontal_bias="0.5"
+                vlc:layout_constraintBottom_toTopOf="@+id/subtitle"
+                vlc:layout_constraintVertical_chainStyle="packed"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:textAppearance="@style/VLCImageCardViewContentStyleTextAppearance"
-            android:textSize="11sp"
-            tools:text="@string/add_custom_path_description"
-            vlc:asyncText="@{description}"
-            vlc:layout_constraintBottom_toBottomOf="parent"
-            vlc:layout_constraintEnd_toEndOf="parent"
-            vlc:layout_constraintStart_toStartOf="parent"
-            vlc:layout_constraintTop_toBottomOf="@+id/title"
-            vlc:placeholder="@{item}" />
+                android:id="@+id/subtitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:textAppearance="@style/VLCImageCardViewContentStyleTextAppearance"
+                android:textSize="11sp"
+                tools:text="@string/add_custom_path_description"
+                vlc:asyncText="@{description}"
+                vlc:layout_constraintBottom_toBottomOf="parent"
+                vlc:layout_constraintEnd_toEndOf="parent"
+                vlc:layout_constraintStart_toStartOf="parent"
+                vlc:layout_constraintTop_toBottomOf="@+id/title"
+                vlc:placeholder="@{item}"
+                vlc:layout_constraintHorizontal_bias="0.5"/>
 
 
     </org.videolan.vlc.gui.tv.FocusableConstraintLayout>

vlc-android/res/layout/simple_item.xml

@@ -17,8 +17,8 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:orientation="horizontal" android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:padding="8dp"
+        android:focusable="true"
         android:onClick="@{(v) -> handler.onClick(item)}">
 
         <ImageView
@@ -32,7 +32,8 @@
             android:layout_height="match_parent"
             android:minHeight="36dp"
             android:fontFamily="sans-serif"
-            android:textColor="?attr/list_title"
+            android:textColor="@color/simple_list_title"
+            android:duplicateParentState="true"
             android:textSize="16sp"
             android:text="@{item.title}"
             android:gravity="center_vertical"

vlc-android/res/layout/tv_audio_player.xml

 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <data>
         <variable
             name="progress"
             type="androidx.lifecycle.LiveData&lt;org.videolan.vlc.viewmodels.PlaybackProgress>" />
     </data>
-    <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
+
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent">
+
         <ImageView
             android:id="@+id/background"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:scaleType="centerCrop"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"/>
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <ImageView
             android:id="@+id/album_cover"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_margin="@dimen/half_default_margin"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/playlist"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_no_artwork_big"
             app:layout_constraintBottom_toTopOf="@+id/media_title"
-            app:layout_constraintVertical_chainStyle="spread"
             app:layout_constraintHorizontal_chainStyle="spread"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_no_artwork_big" />
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/playlist"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="spread" />
 
         <TextView
             android:id="@+id/media_title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textAppearance="@style/TextAppearance.AppCompat.SearchResult.Title"
+            app:layout_constraintBottom_toTopOf="@+id/media_artist"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/album_cover"
             app:layout_constraintRight_toLeftOf="@+id/playlist"
-            app:layout_constraintBottom_toTopOf="@+id/media_artist"
-            tools:text="Title"
-            android:gravity="center_horizontal"
-            android:textAppearance="@style/TextAppearance.AppCompat.SearchResult.Title" />
+            app:layout_constraintTop_toBottomOf="@+id/album_cover"
+            tools:text="Title" />
 
         <TextView
             android:id="@+id/media_artist"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textAppearance="@style/TextAppearance.AppCompat.SearchResult.Subtitle"
+            app:layout_constraintBottom_toTopOf="@+id/media_progress"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/media_title"
             app:layout_constraintRight_toLeftOf="@+id/playlist"
-            app:layout_constraintBottom_toTopOf="@+id/media_progress"
-            tools:text="Artist"
-            android:gravity="center_horizontal"
-            android:textAppearance="@style/TextAppearance.AppCompat.SearchResult.Subtitle" />
+            app:layout_constraintTop_toBottomOf="@+id/media_title"
+            tools:text="Artist" />
 
         <TextView
             android:id="@+id/media_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:text="@{progress.timeText}"
+            app:layout_constraintBottom_toBottomOf="@+id/media_progress"
             app:layout_constraintLeft_toLeftOf="@+id/album_cover"
-            app:layout_constraintTop_toTopOf="@+id/media_progress"
             app:layout_constraintRight_toLeftOf="@+id/media_progress"
-            app:layout_constraintBottom_toBottomOf="@+id/media_progress"
-            android:text="@{progress.timeText}"
+            app:layout_constraintTop_toTopOf="@+id/media_progress"
             tools:text="0:30" />
 
         <ProgressBar
@@ -75,108 +76,108 @@
             android:layout_width="0dp"
             android:layout_height="2dp"
             android:layout_margin="@dimen/half_default_margin"
-            app:layout_constraintLeft_toRightOf="@+id/media_time"
-            app:layout_constraintTop_toBottomOf="@+id/media_artist"
-            app:layout_constraintRight_toLeftOf="@+id/media_length"
-            app:layout_constraintBottom_toTopOf="@+id/button_play"
-            android:layoutDirection="ltr"
-            android:progress="@{(int)progress.time}"
-            android:max="@{(int)progress.length}"
+            android:background="@drawable/background_item"
             android:focusable="true"
             android:indeterminate="false"
-            android:nextFocusDown="@+id/button_play"
+            android:layoutDirection="ltr"
+            android:max="@{(int)progress.length}"
             android:nextFocusUp="@+id/playlist"
-            android:background="@drawable/background_item"
-            android:progressDrawable="@drawable/tv_audioprogressbar" />
+            android:nextFocusDown="@+id/button_play"
+            android:progress="@{(int)progress.time}"
+            android:progressDrawable="@drawable/tv_audioprogressbar"
+            app:layout_constraintBottom_toTopOf="@+id/button_play"
+            app:layout_constraintLeft_toRightOf="@+id/media_time"
+            app:layout_constraintRight_toLeftOf="@+id/media_length"
+            app:layout_constraintTop_toBottomOf="@+id/media_artist" />
 
         <TextView
             android:id="@+id/media_length"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:text="@{progress.lengthText}"
+            app:layout_constraintBottom_toBottomOf="@+id/media_progress"
             app:layout_constraintLeft_toRightOf="@+id/media_progress"
-            app:layout_constraintTop_toTopOf="@+id/media_progress"
             app:layout_constraintRight_toRightOf="@+id/album_cover"
-            app:layout_constraintBottom_toBottomOf="@+id/media_progress"
-            android:text="@{progress.lengthText}"
+            app:layout_constraintTop_toTopOf="@+id/media_progress"
             tools:text="3:52" />
 
         <ImageView
             android:id="@+id/button_repeat"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintLeft_toLeftOf="@+id/album_cover"
-            app:layout_constraintTop_toBottomOf="@+id/media_progress"
-            app:layout_constraintRight_toLeftOf="@+id/button_previous"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHorizontal_chainStyle="spread"
             android:clickable="true"
             android:focusable="true"
             android:nextFocusDown="@+id/playlist"
             android:onClick="onClick"
             android:src="@drawable/ic_repeat_w"
+            app:layout_constraintBottom_toBottomOf="@+id/button_previous"
+            app:layout_constraintHorizontal_chainStyle="spread"
+            app:layout_constraintLeft_toLeftOf="@+id/album_cover"
+            app:layout_constraintRight_toLeftOf="@+id/button_previous"
+            app:layout_constraintTop_toTopOf="@+id/button_previous"
             tools:src="@drawable/ic_repeat" />
 
         <ImageView
             android:id="@+id/button_previous"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintLeft_toRightOf="@+id/button_repeat"
-            app:layout_constraintTop_toBottomOf="@+id/media_progress"
-            app:layout_constraintRight_toLeftOf="@+id/button_play"
-            app:layout_constraintBottom_toBottomOf="parent"
             android:clickable="true"
             android:focusable="true"
             android:nextFocusDown="@+id/playlist"
             android:onClick="onClick"
             android:src="@drawable/ic_previous_w"
+            app:layout_constraintBottom_toBottomOf="@+id/button_play"
+            app:layout_constraintLeft_toRightOf="@+id/button_repeat"
+            app:layout_constraintRight_toLeftOf="@+id/button_play"
+            app:layout_constraintTop_toTopOf="@+id/button_play"
             tools:src="@drawable/ic_previous" />
 
         <ImageView
             android:id="@+id/button_play"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintLeft_toRightOf="@+id/button_previous"
-            app:layout_constraintTop_toBottomOf="@+id/media_progress"
-            app:layout_constraintRight_toLeftOf="@+id/button_next"
-            app:layout_constraintBottom_toBottomOf="parent"
             android:clickable="true"
             android:focusable="true"
             android:nextFocusDown="@+id/playlist"
             android:onClick="onClick"
-            android:src="@drawable/ic_play_w"
-            tools:src="@drawable/ic_play" >
-            <requestFocus/>
+            app:layout_constraintBottom_toBottomOf="@+id/button_next"
+            app:layout_constraintLeft_toRightOf="@+id/button_previous"
+            app:layout_constraintRight_toLeftOf="@+id/button_next"
+            app:layout_constraintTop_toTopOf="@+id/button_next"
+            tools:src="@drawable/ic_play">
+
+            <requestFocus />
         </ImageView>
 
         <ImageView
             android:id="@+id/button_next"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintLeft_toRightOf="@+id/button_play"
-            app:layout_constraintTop_toBottomOf="@+id/media_progress"
-            app:layout_constraintRight_toLeftOf="@+id/button_shuffle"
-            app:layout_constraintBottom_toBottomOf="parent"
             android:clickable="true"
             android:focusable="true"
             android:nextFocusDown="@+id/playlist"
             android:onClick="onClick"
             android:src="@drawable/ic_next_w"
+            app:layout_constraintBottom_toBottomOf="@+id/button_shuffle"
+            app:layout_constraintLeft_toRightOf="@+id/button_play"
+            app:layout_constraintRight_toLeftOf="@+id/button_shuffle"
+            app:layout_constraintTop_toTopOf="@+id/button_shuffle"
             tools:src="@drawable/ic_next" />
 
         <ImageView
             android:id="@+id/button_shuffle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintLeft_toRightOf="@+id/button_next"
-            app:layout_constraintTop_toBottomOf="@+id/media_progress"
-            app:layout_constraintRight_toRightOf="@+id/album_cover"
-            app:layout_constraintBottom_toBottomOf="parent"
             android:clickable="true"
             android:focusable="true"
-            android:nextFocusDown="@+id/button_shuffle"
             android:nextFocusRight="@id/playlist"
+            android:nextFocusDown="@+id/button_shuffle"
             android:onClick="onClick"
             android:src="@drawable/ic_shuffle_w"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toRightOf="@+id/button_next"
+            app:layout_constraintRight_toRightOf="@+id/album_cover"
+            app:layout_constraintTop_toBottomOf="@+id/media_progress"
             tools:src="@drawable/ic_shuffle" />
 
         <!-- Playlist -->
@@ -184,14 +185,14 @@
             android:id="@+id/playlist"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="@+id/background"
-            app:layout_constraintLeft_toRightOf="@+id/album_cover"
+            android:layout_margin="@dimen/half_default_margin"
             android:nextFocusLeft="@+id/button_play"
-            android:nextFocusUp="@+id/playlist"
             android:nextFocusRight="@+id/playlist"
+            android:nextFocusUp="@+id/playlist"
             android:nextFocusDown="@+id/playlist"
-            android:layout_margin="@dimen/half_default_margin" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toRightOf="@+id/album_cover"
+            app:layout_constraintRight_toRightOf="@+id/background"
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

vlc-android/res/values-night/styles.xml

@@ -2,4 +2,7 @@
 <resources>
     <style name="Theme.VLC"
         parent="Theme.VLC.Black" />
+
+    <style name="Theme.VLC.Info"
+           parent="Theme.VLC.Info.Black"/>
 </resources>
\ No newline at end of file

vlc-android/res/values/attrs.xml

@@ -31,6 +31,7 @@
     <attr name="audio_player_background_tint" format="reference|color" />
     <attr name="progress_background" format="reference|color" />
     <attr name="progress_indeterminate_tint" format="reference|color" />
+    <attr name="ariane_text_color" format="reference|color"/>
 
     <!--Main Icons-->
     <attr name="ic_down_style" format="reference" />
@@ -44,8 +45,6 @@
     <attr name="ic_shuffle" format="reference" />
     <attr name="ic_shuffle_on" format="reference" />
     <attr name="ic_audio_player_more" format="reference" />
-    <attr name="ic_play" format="reference" />
-    <attr name="ic_pause" format="reference" />
     <attr name="ic_previous" format="reference" />
     <attr name="ic_next" format="reference" />
     <attr name="ic_close" format="reference" />

vlc-android/res/values/colors.xml

@@ -14,7 +14,7 @@
     <color name="orange200">#ffca7d</color>
     <color name="orange300">#ffb54c</color>
     <color name="orange400">#ffa11a</color>
-    <color name="orange500">#ff8800</color>
+    <color name="orange500">#FF8800</color>
     <color name="orange600">#ff7d00</color>
     <color name="orange700">#ff7200</color>
     <color name="orange800">#ff610a</color>
@@ -50,6 +50,7 @@
     <color name="blacktransparent">#b4000000</color>
     <color name="whitetransparent">#b4ffffff</color>
     <color name="ripple_white">#88ffffff</color>
+    <color name="white_more_transparent">#33ffffff</color>
     <color name="transparent">#00000000</color>
 
     <color name="white_selection_transparent">#44ffffff</color>

vlc-android/res/values/strings.xml

@@ -498,7 +498,7 @@
     <string name="network_browsing">Local Network</string>
     <string name="browsing">Browsing</string>
 
-    <string name="file_size">File size:</string>
+    <string name="file_size">File size</string>
 
     <string name="audio_delay">Audio delay</string>
     <string name="spu_delay">Subtitle delay</string>
@@ -713,4 +713,6 @@
     <string name="preamp">Preamp</string>
     <string name="presets">Presets</string>
     <string name="reset">Reset</string>
+    <string name="appended">Track(s) appended</string>
+    <string name="inserted">Track(s) inserted</string>
 </resources>

vlc-android/res/values/styles.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.VLC" parent="Theme.VLC.7" />
+    <style name="Theme.VLC" parent="Theme.VLC.7"/>
+
     <style name="Theme.VLC.7" parent="Theme.VLC.Apearance">
         <item name="actionBarStyle">@style/ActionBar</item>
         <item name="android:textViewStyle">@style/VLC.TextView</item>
@@ -50,7 +51,7 @@
         <item name="list_menu">@color/grey600</item>
         <item name="list_subtitle">@color/list_subtitle</item>
         <item name="list_title_last">@color/list_title_last</item>
-        <item name="list_title">@color/list_title</item>
+        <item name="list_title">@color/grey900</item>
         <item name="android:windowBackground">@color/grey200</item>
 
         <item name="ic_playlist">@drawable/ic_playlist</item>
@@ -62,8 +63,6 @@
         <item name="ic_shuffle">@drawable/ic_shuffle</item>
         <item name="ic_shuffle_on">@drawable/ic_shuffle_on</item>
         <item name="ic_audio_player_more">@drawable/ic_more</item>
-        <item name="ic_play">@drawable/ic_play</item>
-        <item name="ic_pause">@drawable/ic_pause</item>
         <item name="ic_previous">@drawable/ic_previous</item>
         <item name="ic_next">@drawable/ic_next</item>
         <item name="ic_close">@drawable/ic_close</item>
@@ -94,6 +93,8 @@
         <item name="ic_abrepeat_reset">@drawable/ic_abrepeat_reset</item>
         <item name="ic_dial">@drawable/ic_dial</item>
         <item name="progress_background">@color/grey300</item>
+        <item name="ariane_text_color">@color/grey50</item>
+        <item name="player_icon_color">@color/black</item>
     </style>
 
     <style name="Theme.VLC.PickerDialog" parent="Theme.MaterialComponents.Dialog">
@@ -103,12 +104,13 @@
         <item name="font_default">@color/grey50</item>
         <item name="font_light">@color/grey600</item>
         <item name="list_subtitle">@color/grey400</item>
-        <item name="list_title">@color/bt_list_title</item>
+        <item name="list_title">@color/white</item>
         <item name="android:windowBackground">@color/grey900</item>
         <item name="android:textViewStyle">@style/VLC.TextView</item>
     </style>
 
-    <style name="Theme.VLC.Black" parent="Theme.VLC.Black.7" />
+    <style name="Theme.VLC.Black" parent="Theme.VLC.Black.7"/>
+
     <style name="Theme.VLC.Black.7" parent="Theme.VLC.Apearance.Black">
         <item name="actionBarStyle">@style/ActionBar</item>
         <item name="windowActionBarOverlay">true</item>
@@ -155,7 +157,7 @@
         <item name="list_menu">@color/grey50</item>
         <item name="list_subtitle">@color/grey400</item>
         <item name="list_title_last">@color/list_title_last</item>
-        <item name="list_title">@color/bt_list_title</item>
+        <item name="list_title">@color/white</item>
         <item name="android:windowBackground">@color/grey900</item>
 
         <item name="ic_playlist">@drawable/ic_playlist_w</item>
@@ -167,8 +169,6 @@
         <item name="ic_shuffle">@drawable/ic_shuffle_w</item>
         <item name="ic_shuffle_on">@drawable/ic_shuffle_on</item>
         <item name="ic_audio_player_more">@drawable/ic_more_w</item>
-        <item name="ic_play">@drawable/ic_play_w</item>
-        <item name="ic_pause">@drawable/ic_pause_w</item>
         <item name="ic_previous">@drawable/ic_previous_w</item>
         <item name="ic_next">@drawable/ic_next_w</item>
         <item name="ic_close">@drawable/ic_close_w</item>
@@ -200,6 +200,8 @@
         <item name="ic_dial">@drawable/ic_dial_w</item>
         <item name="progress_indeterminate_tint">@color/orange500</item>
         <item name="progress_background">@color/grey700</item>
+        <item name="ariane_text_color">@color/grey50</item>
+        <item name="player_icon_color">@color/white</item>
     </style>
 
     <style name="Theme.VLC.Onboarding" parent="Theme.VLC.Black">
@@ -218,6 +220,18 @@
         <item name="audio_player_background_tint">@color/grey900transparent</item>
         <item name="background_default_gradient">@drawable/gradient_background_tv</item>
         <item name="audio_browser_separator">@color/orange500</item>
+        <item name="player_icon_color">@color/white</item>
+
+    </style>
+
+    <style name="Theme.VLC.Info" parent="Theme.VLC">
+        <item name="ariane_text_color">@color/grey900</item>
+
+    </style>
+
+    <style name="Theme.VLC.Info.Black" parent="Theme.VLC.Black">
+        <item name="ariane_text_color">@color/grey50</item>
+
 
     </style>
 
@@ -226,11 +240,13 @@
         <item name="infoVisibility">always</item>
 
     </style>
+
     <style name="VLCardViewTitleStyle" parent="Widget.Leanback.ImageCardView.TitleStyle">
         <item name="android:scrollHorizontally">true</item>
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">marquee</item>
     </style>
+
     <style name="VLCardViewInfoStyle" parent="Widget.Leanback.ImageCardView.InfoAreaStyle">
         <item name="android:background">@color/tv_card_content</item>
     </style>
@@ -286,7 +302,7 @@
         <item name="android:windowIsTranslucent">true</item>
     </style>
 
-    <style name="Theme.VLC.Player" parent="Theme.VLC.Player.7" />
+    <style name="Theme.VLC.Player" parent="Theme.VLC.Player.7"/>
 
     <style name="Theme.VLC.Player.7" parent="Theme.MaterialComponents.NoActionBar">
         <item name="android:windowNoTitle">true</item>
@@ -328,7 +344,7 @@
 
         <item name="list_subtitle">@color/grey400</item>
         <item name="list_title_last">@color/list_title_last</item>
-        <item name="list_title">@color/bt_list_title</item>
+        <item name="list_title">@color/white</item>
         <item name="progress_background">@color/grey200</item>
         <item name="ic_abrepeat">@drawable/ic_abrepeat_w</item>
         <item name="ic_abrepeat_seta">@drawable/ic_abrepeat_seta_w</item>

vlc-android/res/xml/preferences_audio.xml

@@ -4,11 +4,16 @@
     android:key="audio_category"
     android:title="@string/audio_prefs_category">
 
-    <SwitchPreference
+    <CheckBoxPreference
         android:defaultValue="true"
-        android:key="audio_resume_card"
-        android:title="@string/audio_resume_card_title"
-        android:summary="@string/audio_resume_card_summary"/>
+        android:key="resume_playback"
+        android:summary="@string/resume_playback_summary"
+        android:title="@string/resume_playback_title" />
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="playback_speed"
+        android:summary="@string/playback_speed_summary"
+        android:title="@string/playback_speed_title" />
 
     <CheckBoxPreference
         android:defaultValue="false"
@@ -20,28 +25,11 @@
         android:defaultValue="false"
         android:key="audio_digital_output"
         android:title="@string/audio_digital_title" />
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="artists_show_all"
-        android:summary="@string/artists_show_all_summary"
-        android:title="@string/artists_show_all_title" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="lockscreen_cover"
-        android:summary="@string/lockscreen_cover_summary"
-        android:title="@string/lockscreen_cover_title" />
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="audio_save_repeat"
         android:summary="@string/audio_save_repeat_summary"
         android:title="@string/audio_save_repeat_title" />
-    <ListPreference
-        android:defaultValue="0"
-        android:entries="@array/audio_title_alignment_list"
-        android:entryValues="@array/audio_title_alignment_values"
-        android:key="audio_title_alignment"
-        android:persistent="true"
-        android:title="@string/audio_title_alignment" />
 
     <PreferenceCategory
         android:title="@string/headset_prefs_category"