Skip to content
Snippets Groups Projects
Commit 62029d12 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Fix focus issue on Amazon devices + improve chapter selection UI

(cherry picked from commit 266c90a1)
parent 67c4a992
No related branches found
No related tags found
1 merge request!782Backport to 3.3.x
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@color/orange500" />
<item android:state_activated="true" android:drawable="@color/orange500" />
<item android:state_focused="true" android:drawable="@color/orange300" />
<item android:state_pressed="true" android:drawable="@color/orange500" />
</selector>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<selector>
<item android:state_selected="true">
<color android:color="@color/orange500"/>
</item>
<item>
<color android:color="@android:color/transparent"/>
</item>
</selector>
</item>
<item android:drawable="?attr/selectableItemBackground"/>
</layer-list>
......@@ -22,6 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/background_chapter_item"
android:focusable="true"
android:onClick="@{holder::onClick}"
android:selected="@{selected}"
android:orientation="vertical">
......
......@@ -31,8 +31,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:choiceMode="singleChoice"
android:focusableInTouchMode="true"
android:focusable="true"
android:focusable="false"
android:descendantFocusability="afterDescendants"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
......@@ -69,6 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:focusable="true"
android:background="?attr/selectableItemBackgroundBorderless"
app:layout_constraintBottom_toBottomOf="@id/track_title"
app:layout_constraintEnd_toEndOf="parent"
......
......@@ -32,7 +32,6 @@ import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.ObsoleteCoroutinesApi
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import org.videolan.medialibrary.Tools
import org.videolan.vlc.PlaybackService
......@@ -52,7 +51,6 @@ class SelectChapterDialog : VLCBottomSheetDialogFragment(), IOnChapterSelectedLi
}
}
private lateinit var chapterList: RecyclerView
private var service: PlaybackService? = null
......
......@@ -55,7 +55,7 @@ class VideoTracksDialog : VLCBottomSheetDialogFragment() {
private val coroutineContextProvider: CoroutineContextProvider
override fun initialFocusedView(): View = binding.tracksSeparator2
override fun initialFocusedView(): View = binding.subtitleTracks.trackMore
lateinit var menuItemListener:(Int) -> Unit
lateinit var trackSelectionListener:(Int, TrackType) -> Unit
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment