vlc-android/res/xml/preferences_ui.xml

@@ -16,46 +16,76 @@
         android:summary="@string/tv_ui_summary"
         android:title="@string/tv_ui_title" />
 
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="playback_speed"
-        android:summary="@string/playback_speed_summary"
-        android:title="@string/playback_speed_title" />
-
     <ListPreference
         android:defaultValue=""
         android:key="set_locale"
         android:title="@string/set_locale" />
 
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="resume_playback"
-        android:summary="@string/resume_playback_summary"
-        android:title="@string/resume_playback_title" />
-
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="browser_show_all_files"
         android:summary="@string/browser_show_all_summary"
         android:title="@string/browser_show_all_title" />
 
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="blurred_cover_background"
-        android:summary="@string/blurred_cover_background_summary"
-        android:title="@string/blurred_cover_background_title" />
-
     <PreferenceCategory
-        android:title="@string/interface_secondary_display_category_title"
-        android:key="secondary_display_category">
-        <Preference
-            android:summary="@string/interface_secondary_display_category_summary"
-            android:key="secondary_display_category_summary" />
+        android:title="@string/video"
+        android:key="ui_video_category">
 
+        <ListPreference
+            android:defaultValue="-1"
+            android:entries="@array/video_min_group_length_list"
+            android:entryValues="@array/video_min_group_length_values"
+            android:key="video_min_group_length"
+            android:persistent="true"
+            android:summary="@string/video_min_group_length_summary"
+            android:title="@string/video_min_group_length_title" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="media_seen"
+            android:summary="@string/media_seen_summary"
+            android:title="@string/media_seen" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="force_play_all"
+            android:summary="@string/force_play_all_summary"
+            android:title="@string/force_play_all_title" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="force_list_portrait"
+            android:summary="@string/force_list_portrait_summary"
+            android:title="@string/force_list_portrait" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/audio"
+        android:key="ui_audio_category">
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="blurred_cover_background"
+            android:summary="@string/blurred_cover_background_summary"
+            android:title="@string/blurred_cover_background_title" />
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="audio_resume_card"
+            android:title="@string/audio_resume_card_title"
+            android:summary="@string/audio_resume_card_summary"/>
+        <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="enable_clone_mode"
-            android:summary="@string/enable_clone_mode_summary"
-            android:title="@string/enable_clone_mode" />
+            android:key="artists_show_all"
+            android:summary="@string/artists_show_all_summary"
+            android:title="@string/artists_show_all_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>
 </PreferenceScreen>

vlc-android/res/xml/preferences_video.xml

@@ -3,31 +3,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:key="video_category"
     android:title="@string/video_prefs_category">
-
-    <ListPreference
-        android:defaultValue="6"
-        android:entries="@array/video_min_group_length_list"
-        android:entryValues="@array/video_min_group_length_values"
-        android:key="video_min_group_length"
-        android:persistent="true"
-        android:summary="@string/video_min_group_length_summary"
-        android:title="@string/video_min_group_length_title" />
-
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="media_seen"
-        android:summary="@string/media_seen_summary"
-        android:title="@string/media_seen" />
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="force_play_all"
-        android:summary="@string/force_play_all_summary"
-        android:title="@string/force_play_all_title" />
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="force_list_portrait"
-        android:summary="@string/force_list_portrait_summary"
-        android:title="@string/force_list_portrait" />
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="save_brightness"
@@ -38,6 +13,11 @@
         android:key="save_individual_audio_delay"
         android:summary="@string/save_audiodelay_summary"
         android:title="@string/save_audiodelay_title" />
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="playback_speed"
+        android:summary="@string/playback_speed_summary"
+        android:title="@string/playback_speed_title" />
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="media_fast_seek"
@@ -54,6 +34,11 @@
         android:key="popup_force_legacy"
         android:summary="@string/popup_force_legacy_summary"
         android:title="@string/popup_force_legacy_title" />
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="dialog_confirm_resume"
+        android:summary="@string/confirm_resume_summary"
+        android:title="@string/confirm_resume_title" />
 
     <PreferenceCategory android:title="@string/controls_prefs_category">
         <CheckBoxPreference
@@ -71,11 +56,6 @@
             android:key="enable_brightness_gesture"
             android:summary="@string/enable_brightness_gesture_summary"
             android:title="@string/enable_brightness_gesture_title" />
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="dialog_confirm_resume"
-            android:summary="@string/confirm_resume_summary"
-            android:title="@string/confirm_resume_title" />
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="enable_double_tap_seek"
@@ -93,4 +73,18 @@
             android:title="@string/popup_keepscreen_title" />
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:title="@string/interface_secondary_display_category_title"
+        android:key="secondary_display_category">
+        <Preference
+            android:summary="@string/interface_secondary_display_category_summary"
+            android:key="secondary_display_category_summary" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="enable_clone_mode"
+            android:summary="@string/enable_clone_mode_summary"
+            android:title="@string/enable_clone_mode" />
+    </PreferenceCategory>
+
 </PreferenceScreen>

vlc-android/src/org/videolan/vlc/VLCApplication.kt

@@ -28,6 +28,7 @@ import android.content.res.Configuration
 import android.content.res.Resources
 import android.os.Build
 import android.util.Log
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.SimpleArrayMap
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.Lifecycle
@@ -86,6 +87,8 @@ class VLCApplication : Application() {
 
     init {
         instance = this
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+
     }
 
     @TargetApi(Build.VERSION_CODES.O)

vlc-android/src/org/videolan/vlc/gui/BaseActivity.kt

@@ -4,18 +4,14 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.KeyEvent
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
-import org.videolan.vlc.gui.helpers.KeyHelper
+import org.videolan.tools.KeyHelper
 import org.videolan.vlc.gui.helpers.applyTheme
 import org.videolan.vlc.util.Settings
 
 open class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope() {
 
-    init {
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-    }
 
     lateinit var settings: SharedPreferences
 

vlc-android/src/org/videolan/vlc/gui/HistoryAdapter.kt

@@ -26,27 +26,20 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
 import org.videolan.medialibrary.media.MediaLibraryItem
 import org.videolan.medialibrary.media.MediaWrapper
+import org.videolan.tools.MultiSelectAdapter
+import org.videolan.tools.MultiSelectHelper
 import org.videolan.vlc.databinding.HistoryItemBinding
 import org.videolan.vlc.gui.helpers.SelectorViewHolder
 import org.videolan.vlc.gui.helpers.getMediaIconDrawable
 import org.videolan.vlc.interfaces.IEventsHandler
+import org.videolan.vlc.util.UPDATE_SELECTION
 import org.videolan.vlc.util.Util
-import java.util.*
 
 @ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
-class HistoryAdapter(private val mEventsHandler: IEventsHandler) : DiffUtilAdapter<MediaWrapper, HistoryAdapter.ViewHolder>() {
+class HistoryAdapter(private val mEventsHandler: IEventsHandler) : DiffUtilAdapter<MediaWrapper, HistoryAdapter.ViewHolder>(), MultiSelectAdapter<MediaWrapper> {
     private var mLayoutInflater: LayoutInflater? = null
-
-    val selection: List<MediaWrapper>
-        get() {
-            val selection = LinkedList<MediaWrapper>()
-            for (media in dataset) {
-                if (media.hasStateFlags(MediaLibraryItem.FLAG_SELECTED))
-                    selection.add(media)
-            }
-            return selection
-        }
+    var multiSelectHelper: MultiSelectHelper<MediaWrapper> = MultiSelectHelper(this, UPDATE_SELECTION)
 
     inner class ViewHolder(binding: HistoryItemBinding) : SelectorViewHolder<HistoryItemBinding>(binding) {
 
@@ -83,17 +76,16 @@ class HistoryAdapter(private val mEventsHandler: IEventsHandler) : DiffUtilAdapt
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val media = getItem(position)
-        val isSelected = media.hasStateFlags(MediaLibraryItem.FLAG_SELECTED)
         holder.binding.media = media
         holder.binding.cover = getMediaIconDrawable(holder.itemView.context, media.type)
-        holder.selectView(isSelected)
+        holder.selectView(multiSelectHelper.isSelected(position))
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int, payloads: List<Any>) {
         if (Util.isListEmpty(payloads))
             super.onBindViewHolder(holder, position, payloads)
         else
-            holder.selectView((payloads[0] as MediaLibraryItem).hasStateFlags(MediaLibraryItem.FLAG_SELECTED))
+            holder.selectView(multiSelectHelper.isSelected(position))
     }
 
     override fun getItemId(arg0: Int): Long {

vlc-android/src/org/videolan/vlc/gui/HistoryFragment.kt

@@ -34,6 +34,8 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
 import org.videolan.medialibrary.media.MediaLibraryItem
 import org.videolan.medialibrary.media.MediaWrapper
+import org.videolan.tools.KeyHelper
+import org.videolan.tools.MultiSelectHelper
 import org.videolan.vlc.R
 import org.videolan.vlc.gui.browser.MediaBrowserFragment
 import org.videolan.vlc.gui.helpers.UiTools
@@ -50,6 +52,7 @@ private const val TAG = "VLC/HistoryFragment"
 @ExperimentalCoroutinesApi
 class HistoryFragment : MediaBrowserFragment<HistoryModel>(), IRefreshable, IHistory, SwipeRefreshLayout.OnRefreshListener, IEventsHandler {
 
+    private lateinit var multiSelectHelper: MultiSelectHelper<MediaWrapper>
     private val historyAdapter: HistoryAdapter = HistoryAdapter(this)
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
@@ -60,10 +63,12 @@ class HistoryFragment : MediaBrowserFragment<HistoryModel>(), IRefreshable, IHis
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         viewModel = ViewModelProviders.of(requireActivity(), HistoryModel.Factory(requireContext())).get(HistoryModel::class.java)
-        viewModel.dataset.observe(this, Observer<List<MediaWrapper>> { list ->  list?.let {
-            historyAdapter.update(it)
-            updateEmptyView()
-        } })
+        viewModel.dataset.observe(this, Observer<List<MediaWrapper>> { list ->
+            list?.let {
+                historyAdapter.update(it)
+                updateEmptyView()
+            }
+        })
     }
 
     override fun onStart() {
@@ -79,6 +84,8 @@ class HistoryFragment : MediaBrowserFragment<HistoryModel>(), IRefreshable, IHis
         list.nextFocusLeftId = android.R.id.list
         list.nextFocusRightId = android.R.id.list
         list.nextFocusForwardId = android.R.id.list
+
+        multiSelectHelper = historyAdapter.multiSelectHelper
         list.requestFocus()
         registerForContextMenu(list)
         swipeRefreshLayout!!.setOnRefreshListener(this)
@@ -145,7 +152,7 @@ class HistoryFragment : MediaBrowserFragment<HistoryModel>(), IRefreshable, IHis
     }
 
     override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-        val selectionCount = historyAdapter.selection.size
+        val selectionCount = multiSelectHelper.getSelectionCount()
         if (selectionCount == 0) {
             stopActionMode()
             return false
@@ -156,7 +163,7 @@ class HistoryFragment : MediaBrowserFragment<HistoryModel>(), IRefreshable, IHis
     }
 
     override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
-        val selection = historyAdapter.selection
+        val selection = multiSelectHelper.getSelection()
         if (selection.isNotEmpty()) {
             when (item.itemId) {
                 R.id.action_history_play -> MediaUtils.openList(activity, selection, 0)
@@ -174,19 +181,16 @@ class HistoryFragment : MediaBrowserFragment<HistoryModel>(), IRefreshable, IHis
 
     override fun onDestroyActionMode(mode: ActionMode) {
         actionMode = null
-        var index = -1
-        for (media in viewModel.dataset.value) {
-            ++index
-            if (media.hasStateFlags(MediaLibraryItem.FLAG_SELECTED)) {
-                media.removeStateFlags(MediaLibraryItem.FLAG_SELECTED)
-                historyAdapter.notifyItemChanged(index, media)
-            }
-        }
+        multiSelectHelper.clearSelection()
     }
 
     override fun onClick(v: View, position: Int, item: MediaLibraryItem) {
+        if (KeyHelper.isShiftPressed && actionMode == null) {
+            onLongClick(v, position, item)
+            return
+        }
         if (actionMode != null) {
-            item.toggleStateFlag(MediaLibraryItem.FLAG_SELECTED)
+            multiSelectHelper.toggleSelection(position)
             historyAdapter.notifyItemChanged(position, item)
             invalidateActionMode()
             return
@@ -196,17 +200,13 @@ class HistoryFragment : MediaBrowserFragment<HistoryModel>(), IRefreshable, IHis
     }
 
     override fun onLongClick(v: View, position: Int, item: MediaLibraryItem): Boolean {
-        if (actionMode != null) return false
-        item.toggleStateFlag(MediaLibraryItem.FLAG_SELECTED)
+        multiSelectHelper.toggleSelection(position, true)
         historyAdapter.notifyItemChanged(position, item)
-        startActionMode()
+        if (actionMode == null) startActionMode()
+        invalidateActionMode()
         return true
     }
 
-    override fun onShiftClick(v: View, layoutPosition: Int, item: MediaLibraryItem) {
-        if (actionMode != null) onClick(v, layoutPosition, item) else onLongClick(v, layoutPosition, item)
-    }
-
     override fun onImageClick(v: View, position: Int, item: MediaLibraryItem) {
         if (actionMode != null) {
             onClick(v, position, item)

vlc-android/src/org/videolan/vlc/gui/InfoActivity.kt

@@ -9,11 +9,13 @@ import android.os.Parcelable
 import android.view.Gravity
 import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModel
+import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import kotlinx.coroutines.*
@@ -26,13 +28,14 @@ import org.videolan.medialibrary.media.MediaWrapper
 import org.videolan.vlc.R
 import org.videolan.vlc.VLCApplication
 import org.videolan.vlc.databinding.InfoActivityBinding
+import org.videolan.vlc.gui.browser.PathAdapter
+import org.videolan.vlc.gui.browser.PathAdapterListener
 import org.videolan.vlc.gui.helpers.AudioUtil
 import org.videolan.vlc.gui.helpers.FloatingActionButtonBehavior
 import org.videolan.vlc.gui.video.MediaInfoAdapter
 import org.videolan.vlc.media.MediaUtils
 import org.videolan.vlc.util.*
 import java.io.File
-import java.lang.Runnable
 import java.util.*
 
 private const val TAG = "VLC/InfoActivity"
@@ -40,11 +43,11 @@ private const val TAG_FAB_VISIBILITY = "FAB"
 
 @ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
-class InfoActivity : AudioPlayerContainerActivity(), View.OnClickListener {
+class InfoActivity : AudioPlayerContainerActivity(), View.OnClickListener, PathAdapterListener {
 
     private lateinit var item: MediaLibraryItem
     private lateinit var adapter: MediaInfoAdapter
-    private lateinit var model : InfoModel
+    private lateinit var model: InfoModel
 
     internal lateinit var binding: InfoActivityBinding
 
@@ -108,28 +111,57 @@ class InfoActivity : AudioPlayerContainerActivity(), View.OnClickListener {
         if (length > 0)
             binding.length = Tools.millisToText(length)
 
+        if (item is MediaWrapper) {
+            val media = item as MediaWrapper
+            val resolution = generateResolutionClass(media.width, media.height)
+            binding.resolution = resolution
+        }
+
         when {
             item.itemType == MediaLibraryItem.TYPE_MEDIA -> {
-                val media = item as MediaWrapper?
-                binding.path = Uri.decode(media!!.uri.path)
+                val media = item as MediaWrapper
+//                binding.path = Uri.decode(media!!.uri.path).replace("/", " > ")
                 binding.progress = if (media.length == 0L) 0 else (100.toLong() * media.time / length).toInt()
                 binding.sizeTitleText = getString(R.string.file_size)
+
+
+
+                if (isSchemeSupported(media.uri?.scheme)) {
+                    binding.ariane.visibility = View.VISIBLE
+                    binding.ariane.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
+                    binding.ariane.adapter = PathAdapter(this, media)
+                    if (binding.ariane.itemDecorationCount == 0) {
+                        val did = DividerItemDecoration(this, DividerItemDecoration.HORIZONTAL)
+                        did.setDrawable(ContextCompat.getDrawable(this, R.drawable.ic_divider)!!)
+                        binding.ariane.addItemDecoration(did)
+                    }
+                } else binding.ariane.visibility = View.GONE
             }
             item.itemType == MediaLibraryItem.TYPE_ARTIST -> {
                 val albums = (item as Artist).albums
                 val nbAlbums = albums?.size ?: 0
                 binding.sizeTitleText = getString(R.string.albums)
                 binding.sizeValueText = nbAlbums.toString()
+                binding.sizeIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_album))
                 binding.extraTitleText = getString(R.string.tracks)
                 binding.extraValueText = nbTracks.toString()
+                binding.extraIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_song))
             }
             else -> {
                 binding.sizeTitleText = getString(R.string.tracks)
                 binding.sizeValueText = nbTracks.toString()
+                binding.sizeIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_song))
             }
         }
     }
 
+    override fun backTo(tag: String) {
+    }
+
+    override fun currentContext() = this
+
+    override fun showRoot() = false
+
     override fun onPostCreate(savedInstanceState: Bundle?) {
         fragmentContainer = binding.container
         super.onPostCreate(savedInstanceState)

vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.kt

@@ -176,15 +176,11 @@ open class PlaylistActivity : AudioPlayerContainerActivity(), IEventsHandler, IL
     }
 
     override fun onLongClick(v: View, position: Int, item: MediaLibraryItem): Boolean {
-        if (actionMode != null) return false
-        audioBrowserAdapter.multiSelectHelper.toggleSelection(position)
-        startActionMode()
+        audioBrowserAdapter.multiSelectHelper.toggleSelection(position, true)
+        if (actionMode == null) startActionMode()
         return true
     }
 
-    override fun onShiftClick(v: View, layoutPosition: Int, item: MediaLibraryItem) {
-        if (actionMode != null) onClick(v, layoutPosition, item) else onLongClick(v, layoutPosition, item)
-    }
 
     override fun onImageClick(v: View, position: Int, item: MediaLibraryItem) {
         if (actionMode != null) {

vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserAdapter.kt

@@ -48,7 +48,6 @@ import org.videolan.tools.MultiSelectHelper
 import org.videolan.vlc.R
 import org.videolan.vlc.databinding.AudioBrowserCardItemBinding
 import org.videolan.vlc.databinding.AudioBrowserItemBinding
-import org.videolan.vlc.gui.helpers.KeyHelper
 import org.videolan.vlc.gui.helpers.SelectorViewHolder
 import org.videolan.vlc.gui.helpers.getAudioIconDrawable
 import org.videolan.vlc.gui.tv.FocusableRecyclerView
@@ -292,10 +291,7 @@ class AudioBrowserAdapter @JvmOverloads constructor(private val type: Int, priva
         fun onClick(v: View) {
             val item = getItem(layoutPosition)
             if (item != null)
-                if (KeyHelper.isShiftPressed)
-                    mIEventsHandler.onShiftClick(v, layoutPosition, item)
-                else
-                    mIEventsHandler.onClick(v, layoutPosition, item)
+                mIEventsHandler.onClick(v, layoutPosition, item)
         }
 
         fun onMoreClick(v: View) {

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

@@ -49,6 +49,7 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.transition.AutoTransition
 import androidx.transition.TransitionManager
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.*
@@ -99,6 +100,10 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
     private var headerTimeVisible = false
     private var playerState = 0
     private var currentCoverArt: String? = null
+    private lateinit var pauseToPlay: AnimatedVectorDrawableCompat
+    private lateinit var playToPause: AnimatedVectorDrawableCompat
+    private lateinit var pauseToPlaySmall: AnimatedVectorDrawableCompat
+    private lateinit var playToPauseSmall: AnimatedVectorDrawableCompat
 
     companion object {
         private var DEFAULT_BACKGROUND_DARKER_ID = 0
@@ -107,11 +112,14 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        savedInstanceState?.let { playerState = it.getInt("player_state")}
+        savedInstanceState?.let {
+            playerState = it.getInt("player_state")
+            wasPlaying = it.getBoolean("was_playing")
+        }
         playlistAdapter = PlaylistAdapter(this)
         settings = Settings.getInstance(requireContext())
         playlistModel = PlaylistModel.get(this)
-        playlistModel.progress.observe(this@AudioPlayer,  Observer { it?.let { updateProgress(it) } })
+        playlistModel.progress.observe(this@AudioPlayer, Observer { it?.let { updateProgress(it) } })
         playlistModel.dataset.observe(this@AudioPlayer, playlistObserver)
         playlistAdapter.setModel(playlistModel)
     }
@@ -150,6 +158,12 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
         binding.showCover = settings.getBoolean("audio_player_show_cover", false)
         binding.playlistSwitch.setImageResource(UiTools.getResourceFromAttribute(view.context, if (binding.showCover) R.attr.ic_playlist else R.attr.ic_playlist_on))
         binding.timeline.setOnSeekBarChangeListener(timelineListener)
+
+        //For resizing purpose, we have to cache this twice even if it's from the same resource
+        playToPause = AnimatedVectorDrawableCompat.create(requireActivity(), R.drawable.anim_play_pause)!!
+        pauseToPlay = AnimatedVectorDrawableCompat.create(requireActivity(), R.drawable.anim_pause_play)!!
+        playToPauseSmall = AnimatedVectorDrawableCompat.create(requireActivity(), R.drawable.anim_play_pause)!!
+        pauseToPlaySmall = AnimatedVectorDrawableCompat.create(requireActivity(), R.drawable.anim_pause_play)!!
     }
 
     override fun onResume() {
@@ -160,11 +174,12 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putInt("player_state", playerState)
+        outState.putBoolean("was_playing", wasPlaying)
     }
 
-    private val ctxReceiver : CtxActionReceiver = object : CtxActionReceiver {
+    private val ctxReceiver: CtxActionReceiver = object : CtxActionReceiver {
         override fun onCtxAction(position: Int, option: Int) {
-            when(option) {
+            when (option) {
                 CTX_SET_RINGTONE -> AudioUtil.setRingtone(playlistAdapter.getItem(position), requireActivity())
                 CTX_ADD_TO_PLAYLIST -> {
                     val mw = playlistAdapter.getItem(position)
@@ -201,15 +216,21 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
         updateBackground()
     }
 
-    private var wasPlaying = false
+    private var wasPlaying = true
     private fun updatePlayPause() {
         val playing = playlistModel.playing
-        if (playing == wasPlaying) return
-        val imageResId = UiTools.getResourceFromAttribute(requireActivity(), if (playing) R.attr.ic_pause else R.attr.ic_play)
         val text = getString(if (playing) R.string.pause else R.string.play)
-        binding.playPause.setImageResource(imageResId)
+
+        val drawable = if (playing) playToPause else pauseToPlay
+        val drawableSmall = if (playing) playToPauseSmall else pauseToPlaySmall
+        binding.playPause.setImageDrawable(drawable)
+        binding.headerPlayPause.setImageDrawable(drawableSmall)
+        if (playing != wasPlaying) {
+            drawable.start()
+            drawableSmall.start()
+        }
+
         binding.playPause.contentDescription = text
-        binding.headerPlayPause.setImageResource(imageResId)
         binding.headerPlayPause.contentDescription = text
         wasPlaying = playing
     }
@@ -269,7 +290,8 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
                 if (TextUtils.isEmpty(mw.artworkMrl)) {
                     setDefaultBackground()
                 } else {
-                    val width = if (binding.contentLayout.width > 0) binding.contentLayout.width else activity?.getScreenWidth() ?: return@launch
+                    val width = if (binding.contentLayout.width > 0) binding.contentLayout.width else activity?.getScreenWidth()
+                            ?: return@launch
                     val blurredCover = withContext(Dispatchers.IO) { UiTools.blurBitmap(AudioUtil.readCoverBitmap(Uri.decode(mw.artworkMrl), width)) }
                     if (!isStarted()) return@launch
                     if (blurredCover !== null) {
@@ -293,7 +315,7 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
     }
 
     override fun onSelectionSet(position: Int) {
-        if (playerState != com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED && playerState != com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN) {
+        if (playerState != BottomSheetBehavior.STATE_COLLAPSED && playerState != com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN) {
             binding.songsList.scrollToPosition(position)
         }
     }
@@ -356,7 +378,6 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
         }
     }
 
-
     fun showAdvancedOptions(v: View) {
         if (!isVisible) return
         if (!this::optionsDelegate.isInitialized) {
@@ -413,7 +434,7 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
 
     override fun beforeTextChanged(charSequence: CharSequence, start: Int, before: Int, count: Int) {}
 
-    fun backPressed() : Boolean {
+    fun backPressed(): Boolean {
         if (this::optionsDelegate.isInitialized && optionsDelegate.isShowing()) {
             optionsDelegate.hide()
             return true
@@ -434,17 +455,17 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
             addTextChangedListener(this@AudioPlayer)
         }
         UiTools.setKeyboardVisibility(binding.playlistSearchText, false)
-        if (playerState == com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED) setHeaderVisibilities(false, false, true, true, true, false)
+        if (playerState == BottomSheetBehavior.STATE_COLLAPSED) setHeaderVisibilities(false, false, true, true, true, false)
         else setHeaderVisibilities(true, true, false, false, false, true)
         return true
     }
 
     override fun onTextChanged(charSequence: CharSequence, start: Int, before: Int, count: Int) {
         val length = charSequence.length
-        if (length > 1) {
+        if (length > 0) {
             playlistModel.filter(charSequence)
             handler.removeCallbacks(hideSearchRunnable)
-        } else if (length == 0) {
+        } else {
             playlistModel.filter(null)
             hideSearchField()
         }
@@ -560,7 +581,7 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
         override fun onStartTrackingTouch(seekBar: SeekBar) {}
 
         override fun onProgressChanged(sb: SeekBar, progress: Int, fromUser: Boolean) {
-            if (fromUser)  {
+            if (fromUser) {
                 playlistModel.time = progress.toLong()
                 binding.time.text = Tools.millisToString(if (showRemainingTime) progress - playlistModel.length else progress.toLong())
                 binding.headerTime.text = Tools.millisToString(progress.toLong())
@@ -573,10 +594,10 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
         override fun onMediaSwitching() {}
 
         override fun onMediaSwitched(position: Int) {
-                when (position) {
-                    AudioMediaSwitcherListener.PREVIOUS_MEDIA -> playlistModel.previous(true)
-                    AudioMediaSwitcherListener.NEXT_MEDIA ->  playlistModel.next()
-                }
+            when (position) {
+                AudioMediaSwitcherListener.PREVIOUS_MEDIA -> playlistModel.previous(true)
+                AudioMediaSwitcherListener.NEXT_MEDIA -> playlistModel.next()
+            }
         }
 
         override fun onTouchClick() {

vlc-android/src/org/videolan/vlc/gui/audio/BaseAudioBrowser.kt

@@ -217,15 +217,11 @@ abstract class BaseAudioBrowser<T : SortableModel> : MediaBrowserFragment<T>(),
     }
 
     override fun onLongClick(v: View, position: Int, item: MediaLibraryItem): Boolean {
-        if (actionMode != null) return false
-        getCurrentAdapter()?.multiSelectHelper?.toggleSelection(position)
-        startActionMode()
+        getCurrentAdapter()?.multiSelectHelper?.toggleSelection(position, true)
+        if (actionMode == null) startActionMode()
         return true
     }
 
-    override fun onShiftClick(v: View, layoutPosition: Int, item: MediaLibraryItem) {
-        if (actionMode != null) onClick(v, layoutPosition, item) else onLongClick(v, layoutPosition, item)
-    }
 
     override fun onImageClick(v: View, position: Int, item: MediaLibraryItem) {
         if (actionMode != null) {

vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt

@@ -69,7 +69,7 @@ private const val MSG_REFRESH = 3
 
 @ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
-abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefreshable, SwipeRefreshLayout.OnRefreshListener, View.OnClickListener, IEventsHandler, CtxActionReceiver {
+abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefreshable, SwipeRefreshLayout.OnRefreshListener, View.OnClickListener, IEventsHandler, CtxActionReceiver, PathAdapterListener {
 
     protected val handler = BrowserFragmentHandler(this)
     private lateinit var layoutManager: LinearLayoutManager
@@ -85,7 +85,6 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
     protected lateinit var binding: DirectoryBrowserBinding
     protected lateinit var browserFavRepository: BrowserFavRepository
 
-
     protected abstract fun createFragment(): Fragment
     protected abstract fun browseRoot()
 
@@ -146,17 +145,20 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
             ariane.adapter = PathAdapter(this, media)
             if (ariane.itemDecorationCount == 0) {
                 val did = DividerItemDecoration(requireContext(), DividerItemDecoration.HORIZONTAL)
-                did.setDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.divider_grey_50_18dp)!!)
+                did.setDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_divider)!!)
                 ariane.addItemDecoration(did)
             }
             ariane.scrollToPosition(ariane.adapter!!.itemCount - 1)
         } else ariane.visibility = View.GONE
     }
 
-    fun backTo(tag: String) {
+    override fun backTo(tag: String) {
         requireActivity().supportFragmentManager.popBackStack(tag, FragmentManager.POP_BACK_STACK_INCLUSIVE)
     }
 
+    override fun currentContext() = requireContext()
+
+    override fun showRoot() = true
 
     override fun onStart() {
         super.onStart()
@@ -184,14 +186,12 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
         super.onSaveInstanceState(outState)
     }
 
-
     override fun getTitle(): String = when {
         isRootDirectory -> categoryTitle
         currentMedia != null -> currentMedia!!.title
         else -> mrl ?: ""
     }
 
-
     override val subTitle: String? =
             if (isRootDirectory) null else {
                 var mrl = mrl?.removeFileProtocole() ?: ""
@@ -203,7 +203,6 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
                 if (currentMedia != null) mrl else null
             }
 
-
     fun goBack(): Boolean {
         val activity = activity ?: return false
         if (!isRootDirectory) activity.supportFragmentManager.popBackStack()
@@ -281,7 +280,6 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
 
     override fun clear() = adapter.clear()
 
-
     override fun removeItem(item: MediaLibraryItem): Boolean {
 
         val view = view ?: return false
@@ -389,6 +387,8 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
     }
 
     override fun onClick(v: View, position: Int, item: MediaLibraryItem) {
+
+
         val mediaWrapper = item as MediaWrapper
         if (actionMode != null) {
             if (mediaWrapper.type == MediaWrapper.TYPE_AUDIO ||
@@ -405,22 +405,17 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
     }
 
     override fun onLongClick(v: View, position: Int, item: MediaLibraryItem): Boolean {
-        if (actionMode != null || item.itemType != MediaLibraryItem.TYPE_MEDIA) return false
+        if (item.itemType != MediaLibraryItem.TYPE_MEDIA) return false
         val mediaWrapper = item as MediaWrapper
         if (mediaWrapper.type == MediaWrapper.TYPE_AUDIO ||
                 mediaWrapper.type == MediaWrapper.TYPE_VIDEO ||
                 mediaWrapper.type == MediaWrapper.TYPE_DIR) {
-            if (actionMode != null) return false
-            adapter.multiSelectHelper.toggleSelection(position)
-            startActionMode()
+            adapter.multiSelectHelper.toggleSelection(position, true)
+            if (actionMode == null) startActionMode()
         } else onCtxClick(v, position, item)
         return true
     }
 
-    override fun onShiftClick(v: View, layoutPosition: Int, item: MediaLibraryItem) {
-        if (actionMode != null) onClick(v, layoutPosition, item) else onLongClick(v, layoutPosition, item)
-    }
-
     override fun onCtxClick(v: View, position: Int, item: MediaLibraryItem) {
         if (actionMode == null && item.itemType == MediaLibraryItem.TYPE_MEDIA) launch {
             val mw = item as MediaWrapper
@@ -451,7 +446,6 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
         }
     }
 
-
     override fun onCtxAction(position: Int, option: Int) {
         val mw = adapter.getItem(position) as? MediaWrapper ?: return
         when (option) {
@@ -500,7 +494,6 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
     }
 
     override fun onItemFocused(v: View, item: MediaLibraryItem) {
-
     }
 
     private fun updateFab() {

vlc-android/src/org/videolan/vlc/gui/browser/PathAdapter.kt

 package org.videolan.vlc.gui.browser
 
+import android.content.Context
 import android.net.Uri
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -13,15 +14,15 @@ import org.videolan.vlc.util.AndroidDevices
 
 private val storages = SimpleArrayMap<String, String>()
 
-class PathAdapter(val browser: BaseBrowserFragment, media: MediaWrapper) : RecyclerView.Adapter<PathAdapter.ViewHolder>() {
+class PathAdapter(val browser: PathAdapterListener, media: MediaWrapper) : RecyclerView.Adapter<PathAdapter.ViewHolder>() {
 
     init {
         if (media.hasStateFlags(MediaLibraryItem.FLAG_STORAGE)) storages.put(Uri.decode(media.uri.path), media.title)
     }
 
-    private val memoryTitle = browser.getString(R.string.internal_memory)
-    private val browserTitle = browser.getString(R.string.browser)
-    private val otgDevice = browser.getString(R.string.otg_device_title)
+    private val memoryTitle = browser.currentContext().getString(R.string.internal_memory)
+    private val browserTitle = browser.currentContext().getString(R.string.browser)
+    private val otgDevice = browser.currentContext().getString(R.string.otg_device_title)
     private val segments = prepareSegments(Uri.decode(media.uri.path))
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -52,7 +53,7 @@ class PathAdapter(val browser: BaseBrowserFragment, media: MediaWrapper) : Recyc
             path.startsWith(AndroidDevices.EXTERNAL_PUBLIC_DIRECTORY) -> path.replace(AndroidDevices.EXTERNAL_PUBLIC_DIRECTORY, memoryTitle)
             else -> replaceStoragePath(path)
         }
-        val list = mutableListOf(browserTitle)
+        val list = if (browser.showRoot()) mutableListOf(browserTitle) else mutableListOf()
         if (isOtg) list.add(otgDevice)
         list.addAll(string.split('/').filter { !it.isEmpty() })
         return list
@@ -65,4 +66,10 @@ class PathAdapter(val browser: BaseBrowserFragment, media: MediaWrapper) : Recyc
         }
         return path
     }
+}
+
+interface PathAdapterListener {
+    fun backTo(tag: String)
+    fun currentContext(): Context
+    fun showRoot(): Boolean
 }
\ No newline at end of file

vlc-android/src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.kt

@@ -56,7 +56,7 @@ class SavePlaylistDialog : VLCBottomSheetDialogFragment(), View.OnClickListener,
     private lateinit var mListView: RecyclerView
     private lateinit var mEmptyView: TextView
     private lateinit var mSaveButton: Button
-    private lateinit var mAdapter: SimpleAdapter
+    private lateinit var adapter: SimpleAdapter
     private lateinit var mTracks: Array<MediaWrapper>
     private lateinit var mNewTrack: Array<MediaWrapper>
     private lateinit var mMedialibrary: Medialibrary
@@ -67,7 +67,7 @@ class SavePlaylistDialog : VLCBottomSheetDialogFragment(), View.OnClickListener,
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         mMedialibrary = VLCApplication.mlInstance
-        mAdapter = SimpleAdapter(this)
+        adapter = SimpleAdapter(this)
         mTracks = try {
             @Suppress("UNCHECKED_CAST")
             arguments!!.getParcelableArray(KEY_TRACKS) as Array<MediaWrapper>
@@ -99,14 +99,14 @@ class SavePlaylistDialog : VLCBottomSheetDialogFragment(), View.OnClickListener,
 
         mEditText!!.setOnEditorActionListener(this)
         mListView.layoutManager = LinearLayoutManager(view.context)
-        mListView.adapter = mAdapter
-        mAdapter.submitList(Arrays.asList<MediaLibraryItem>(*mMedialibrary.playlists))
+        mListView.adapter = adapter
+        adapter.submitList(Arrays.asList<MediaLibraryItem>(*mMedialibrary.playlists))
         updateEmptyView()
 
     }
 
     private fun updateEmptyView() {
-        mEmptyView.visibility = if (mAdapter.isEmpty()) View.VISIBLE else View.GONE
+        mEmptyView.visibility = if (adapter.isEmpty()) View.VISIBLE else View.GONE
     }
 
     override fun onClick(v: View) {

vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleDownloadFragment.kt

 package org.videolan.vlc.gui.dialogs
 
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -20,12 +21,12 @@ import org.videolan.vlc.viewmodels.SubtitlesModel
 class SubtitleDownloadFragment : Fragment() {
     private lateinit var viewModel: SubtitlesModel
     private lateinit var adapter: SubtitlesAdapter
-    lateinit var mediaPath: String
+    lateinit var mediaUri: Uri
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        mediaPath = arguments?.getString(MEDIA_PATH, "") ?: ""
-        viewModel = ViewModelProviders.of(requireActivity(), SubtitlesModel.Factory(requireContext(), mediaPath)).get(mediaPath, SubtitlesModel::class.java)
+        mediaUri = arguments?.getParcelable(MEDIA_PATH) ?: Uri.EMPTY
+        viewModel = ViewModelProviders.of(requireActivity(), SubtitlesModel.Factory(requireContext(), mediaUri)).get(mediaUri.path, SubtitlesModel::class.java)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -75,9 +76,9 @@ class SubtitleDownloadFragment : Fragment() {
     }
 
     companion object {
-        fun newInstance(mediaPath: String): SubtitleDownloadFragment {
+        fun newInstance(mediaUri: Uri): SubtitleDownloadFragment {
             val subtitleDownloadFragment = SubtitleDownloadFragment()
-            subtitleDownloadFragment.arguments = Bundle(1).apply { putString(MEDIA_PATH, mediaPath) }
+            subtitleDownloadFragment.arguments = Bundle(1).apply { putParcelable(MEDIA_PATH, mediaUri) }
             return subtitleDownloadFragment
         }
     }

vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleDownloaderDialogFragment.kt

@@ -34,26 +34,22 @@ const val MEDIA_PATH = "MEDIA_PATH"
 @ObsoleteCoroutinesApi
 class SubtitleDownloaderDialogFragment : DialogFragment() {
     private lateinit var adapter: ViewPagerAdapter
-    private lateinit var paths: List<String>
+    private lateinit var uris: List<Uri>
     private lateinit var viewModel: SubtitlesModel
     private lateinit var toast: Toast
 
     val listEventActor = coroutineScope.actor<SubtitleEvent> {
         for (subtitleEvent in channel) if (isActive) when (subtitleEvent) {
             is Click -> when (subtitleEvent.item.state) {
-                State.NotDownloaded -> VLCDownloadManager.download(context!!, subtitleEvent.item)
-                State.Downloaded -> deleteSubtitleDialog(requireActivity(), DialogInterface.OnClickListener { _, _ -> viewModel.deleteSubtitle(subtitleEvent.item.mediaPath, subtitleEvent.item.idSubtitle) }
+                State.NotDownloaded -> VLCDownloadManager.download(requireActivity(), subtitleEvent.item)
+                State.Downloaded -> deleteSubtitleDialog(requireActivity(), DialogInterface.OnClickListener { _, _ -> viewModel.deleteSubtitle(subtitleEvent.item.mediaUri.path, subtitleEvent.item.idSubtitle) }
                         , DialogInterface.OnClickListener { _, _ -> })
                 else -> return@actor
             }
             is LongClick -> {
                 @StringRes val message = when (subtitleEvent.item.state) {
-                    State.NotDownloaded -> {
-                        R.string.download_the_selected
-                    }
-                    State.Downloaded -> {
-                        R.string.delete_the_selected
-                    }
+                    State.NotDownloaded -> R.string.download_the_selected
+                    State.Downloaded -> R.string.delete_the_selected
                     // Todo else -> {"Cancel download"}
                     else -> return@actor
                 }
@@ -68,29 +64,29 @@ class SubtitleDownloaderDialogFragment : DialogFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        paths = savedInstanceState?.getStringArrayList(MEDIA_PATHS)?.toList()
-                ?: arguments?.getStringArrayList(MEDIA_PATHS)?.toList() ?: listOf()
-        if (paths.isEmpty()) dismiss()
+        uris = savedInstanceState?.getParcelableArrayList<Uri>(MEDIA_PATHS)?.toList()
+                ?: arguments?.getParcelableArrayList<Uri>(MEDIA_PATHS)?.toList() ?: listOf()
+        if (uris.isEmpty()) dismiss()
 
-        viewModel = ViewModelProviders.of(requireActivity(), SubtitlesModel.Factory(requireContext(), paths[0])).get(paths[0], SubtitlesModel::class.java)
+        viewModel = ViewModelProviders.of(requireActivity(), SubtitlesModel.Factory(requireContext(), uris[0])).get(uris[0].path, SubtitlesModel::class.java)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         val binding = SubtitleDownloaderDialogBinding.inflate(inflater, container, false)
-        adapter = ViewPagerAdapter(requireContext(), childFragmentManager, paths)
+        adapter = ViewPagerAdapter(requireContext(), childFragmentManager, uris)
         binding.pager.adapter = adapter
         binding.tabLayout.setupWithViewPager(binding.pager)
 
-        if (paths.size < 2) binding.nextButton.visibility = View.GONE
+        if (uris.size < 2) binding.nextButton.visibility = View.GONE
 
         binding.nextButton.setOnClickListener {
-            if (paths.size > 1)
-                MediaUtils.showSubtitleDownloaderDialogFragment(requireActivity(), paths.takeLast(paths.size - 1))
+            if (uris.size > 1)
+                MediaUtils.showSubtitleDownloaderDialogFragment(requireActivity(), uris.takeLast(uris.size - 1))
             dismiss()
         }
 
-        binding.movieName.text = Uri.parse(paths[0]).lastPathSegment
+        binding.movieName.text = uris[0].lastPathSegment
 
         return binding.root
     }
@@ -101,14 +97,14 @@ class SubtitleDownloaderDialogFragment : DialogFragment() {
         // android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
         // so dialog size breaks on orientation
         if (requireActivity() is VideoPlayerActivity) {
-            MediaUtils.showSubtitleDownloaderDialogFragment(requireActivity(), paths)
+            MediaUtils.showSubtitleDownloaderDialogFragment(requireActivity(), uris)
             dismiss()
         }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putStringArrayList(MEDIA_PATHS, ArrayList(paths))
+        outState.putParcelableArrayList(MEDIA_PATHS, ArrayList(uris))
     }
 
     override fun onDestroy() {
@@ -117,23 +113,23 @@ class SubtitleDownloaderDialogFragment : DialogFragment() {
     }
 
     companion object {
-        fun newInstance(mediaPaths: List<String>): SubtitleDownloaderDialogFragment {
+        fun newInstance(mediaUris: List<Uri>): SubtitleDownloaderDialogFragment {
             val subtitleDownloaderDialogFragment = SubtitleDownloaderDialogFragment()
 
-            val args = Bundle().apply { putStringArrayList(MEDIA_PATHS, ArrayList(mediaPaths)) }
+            val args = Bundle().apply { putParcelableArrayList(MEDIA_PATHS, ArrayList(mediaUris)) }
             subtitleDownloaderDialogFragment.arguments = args
             return subtitleDownloaderDialogFragment
         }
     }
 
-    class ViewPagerAdapter(context: Context, fragmentManager: FragmentManager, private val paths: List<String>) : FragmentPagerAdapter(fragmentManager) {
+    class ViewPagerAdapter(context: Context, fragmentManager: FragmentManager, private val uris: List<Uri>) : FragmentPagerAdapter(fragmentManager) {
         private val tabTitles = arrayOf(context.getString(R.string.download), context.getString(R.string.history))
 
         override fun getPageTitle(position: Int): String? = tabTitles[position]
 
         override fun getItem(position: Int) = when (position) {
-            0 -> SubtitleDownloadFragment.newInstance(paths[0])
-            else -> SubtitleHistoryFragment.newInstance(paths[0])
+            0 -> SubtitleDownloadFragment.newInstance(uris[0])
+            else -> SubtitleHistoryFragment.newInstance(uris[0])
         }
 
         override fun getCount() = 2

vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleHistoryFragment.kt

 package org.videolan.vlc.gui.dialogs
 
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import org.videolan.vlc.databinding.SubtitleHistoryFragmentBinding
@@ -15,12 +16,12 @@ import org.videolan.vlc.viewmodels.SubtitlesModel
 class SubtitleHistoryFragment : Fragment() {
     private lateinit var viewModel: SubtitlesModel
     private lateinit var adapter: SubtitlesAdapter
-    lateinit var mediaPath: String
+    lateinit var mediaUri: Uri
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        mediaPath = arguments?.getString(MEDIA_PATH, "") ?: ""
-        viewModel = ViewModelProviders.of(requireActivity(), SubtitlesModel.Factory(requireContext(), mediaPath)).get(mediaPath, SubtitlesModel::class.java)
+        mediaUri = arguments?.getParcelable(MEDIA_PATH) ?: Uri.EMPTY
+        viewModel = ViewModelProviders.of(requireActivity(), SubtitlesModel.Factory(requireContext(), mediaUri)).get(mediaUri.path, SubtitlesModel::class.java)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -40,9 +41,9 @@ class SubtitleHistoryFragment : Fragment() {
     }
 
     companion object {
-        fun newInstance(mediaPath: String): SubtitleHistoryFragment {
+        fun newInstance(mediaUri: Uri): SubtitleHistoryFragment {
             val subtitleHistoryFragment = SubtitleHistoryFragment()
-            subtitleHistoryFragment.arguments = Bundle(1).apply { putString(MEDIA_PATH, mediaPath) }
+            subtitleHistoryFragment.arguments = Bundle(1).apply { putParcelable(MEDIA_PATH, mediaUri) }
             return subtitleHistoryFragment
         }
     }

vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleItem.kt

 package org.videolan.vlc.gui.dialogs
 
+import android.net.Uri
+
 data class SubtitleItem (
-    val idSubtitle: String,
-    val mediaPath: String,
-    val subLanguageID: String,
-    val movieReleaseName: String,
-    val state: State,
-    val zipDownloadLink: String
+        val idSubtitle: String,
+        val mediaUri: Uri,
+        val subLanguageID: String,
+        val movieReleaseName: String,
+        val state: State,
+        val zipDownloadLink: String
 )
 
 enum class State {

vlc-android/src/org/videolan/vlc/gui/dialogs/VLCBottomSheetDialogFragment.kt

@@ -3,7 +3,6 @@ package org.videolan.vlc.gui.dialogs
 import android.content.DialogInterface
 import android.content.res.Configuration
 import android.os.Bundle
-import android.view.ContextThemeWrapper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -20,14 +19,21 @@ import org.videolan.vlc.util.Settings
 
 abstract class VLCBottomSheetDialogFragment : BottomSheetDialogFragment() {
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        if (Settings.showTvUi) {
+            requireActivity().setTheme(R.style.Theme_VLC_Black)
+        }
+        super.onCreate(savedInstanceState)
+    }
+
     var onDismissListener: DialogInterface.OnDismissListener? = null
 
     fun inflate(inflater: LayoutInflater, container: ViewGroup?, @LayoutRes layout: Int): View? {
-        if (Settings.showTvUi) {
-
-            val contextThemeWrapper = ContextThemeWrapper(activity, R.style.Theme_VLC) // your app theme here
-            return inflater.cloneInContext(contextThemeWrapper).inflate(layout, container, true)
-        }
+//        if (Settings.showTvUi) {
+//
+//            val contextThemeWrapper = ContextThemeWrapper(activity, R.style.Theme_VLC_Black) // your app theme here
+//            return inflater.cloneInContext(contextThemeWrapper).inflate(layout, container, true)
+//        }
         return inflater.inflate(layout, container, false)
 
     }

vlc-android/src/org/videolan/vlc/gui/folders/FoldersFragment.kt

@@ -45,8 +45,8 @@ class FoldersFragment : MediaBrowserFragment<FoldersViewModel>(), CtxActionRecei
                 }
             }
             is FolderLongClick -> {
+                adapter.multiSelectHelper.toggleSelection(action.position, true)
                 if (actionMode == null) {
-                    adapter.multiSelectHelper.toggleSelection(action.position)
                     startActionMode()
                 }
             }