[Android] TV: Fix subs picker focus

[Geoffrey Métais]

vlc-android | branch: 3.2.x | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Jan 13 13:39:43 2020 +0000| [48245fb0069c949a6e0818847a9fee9a1715209d] | committer: Geoffrey Métais

TV: Fix subs picker focus


(cherry picked from commit 6625b1243a03cfc396e52c9ec7c319c8eb1ea461)

> https://code.videolan.org/videolan/vlc-android/commit/48245fb0069c949a6e0818847a9fee9a1715209d
---

 .../videolan/vlc/gui/browser/BaseBrowserAdapter.kt | 42 +++++++++++-----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.kt b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.kt
index d36d5ce53..f9b4da7fb 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.kt
@@ -60,32 +60,28 @@ import java.util.*
 
 @ExperimentalCoroutinesApi
 @ObsoleteCoroutinesApi
-open class BaseBrowserAdapter() : DiffUtilAdapter<MediaLibraryItem, BaseBrowserAdapter.ViewHolder<ViewDataBinding>>(), MultiSelectAdapter<MediaLibraryItem> {
-
+open class BaseBrowserAdapter(protected val fragment: BaseBrowserFragment) : DiffUtilAdapter<MediaLibraryItem, BaseBrowserAdapter.ViewHolder<ViewDataBinding>>(), MultiSelectAdapter<MediaLibraryItem> {
 
     protected val TAG = "VLC/BaseBrowserAdapter"
 
-    lateinit var multiSelectHelper: MultiSelectHelper<MediaLibraryItem>
+    val multiSelectHelper: MultiSelectHelper<MediaLibraryItem> = MultiSelectHelper(this, UPDATE_SELECTION)
 
-    private lateinit var folderDrawable: BitmapDrawable
-    private lateinit var audioDrawable: BitmapDrawable
-    private lateinit var videoDrawable: BitmapDrawable
-    private lateinit var subtitleDrawable: BitmapDrawable
-    private lateinit var unknownDrawable: BitmapDrawable
-    private lateinit var qaMoviesDrawable: BitmapDrawable
-    private lateinit var qaMusicDrawable: BitmapDrawable
-    private lateinit var qaPodcastsDrawable: BitmapDrawable
-    private lateinit var qaDownloadDrawable: BitmapDrawable
+    private val folderDrawable: BitmapDrawable
+    private val audioDrawable: BitmapDrawable
+    private val videoDrawable: BitmapDrawable
+    private val subtitleDrawable: BitmapDrawable
+    private val unknownDrawable: BitmapDrawable
+    private val qaMoviesDrawable: BitmapDrawable
+    private val qaMusicDrawable: BitmapDrawable
+    private val qaPodcastsDrawable: BitmapDrawable
+    private val qaDownloadDrawable: BitmapDrawable
 
-    protected lateinit var fragment: BaseBrowserFragment
-    var mediaCount = 0
+    internal var mediaCount = 0
     private var networkRoot = false
     private var specialIcons = false
     private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler() }
 
-    constructor(fragment: BaseBrowserFragment) : this() {
-        this.fragment = fragment
-        multiSelectHelper = MultiSelectHelper(this, UPDATE_SELECTION)
+    init {
         val root = fragment.isRootDirectory
         val fileBrowser = fragment is FileBrowserFragment
         val filesRoot = root && fileBrowser
@@ -191,11 +187,13 @@ open class BaseBrowserAdapter() : DiffUtilAdapter<MediaLibraryItem, BaseBrowserA
 
         init {
             binding.holder = this
-            if (AndroidUtil.isMarshMallowOrLater)
-                itemView.setOnContextClickListener { v ->
-                    onMoreClick(v)
-                    true
-                }
+            if (AndroidUtil.isMarshMallowOrLater) itemView.setOnContextClickListener { v ->
+                onMoreClick(v)
+                true
+            }
+            if (this at BaseBrowserAdapter is FilePickerAdapter) {
+                binding.itemIcon.isFocusable = false
+            }
         }