Skip to content
Snippets Groups Projects
Commit be11f61f authored by Nicolas Pomepuy's avatar Nicolas Pomepuy Committed by Geoffrey Métais
Browse files

Fix fast scroller provider in audio lists

(cherry picked from commit fa0bb067)
parent 39c373f4
No related branches found
No related tags found
No related merge requests found
......@@ -287,7 +287,7 @@ class AudioBrowserFragment : BaseAudioBrowser<AudioBrowserViewModel>(), SwipeRef
override fun onTabSelected(tab: TabLayout.Tab) {
super.onTabSelected(tab)
fastScroller.setRecyclerView(lists[tab.position]!!, viewModel.providers[currentTab])
fastScroller.setRecyclerView(lists[tab.position], viewModel.providers[tab.position])
settings.edit().putInt(KEY_AUDIO_CURRENT_TAB, tab.position).apply()
if (viewModel.providers[currentTab].isRefreshing)
handler.sendEmptyMessage(SET_REFRESHING)
......@@ -298,12 +298,12 @@ class AudioBrowserFragment : BaseAudioBrowser<AudioBrowserViewModel>(), SwipeRef
override fun onTabUnselected(tab: TabLayout.Tab) {
super.onTabUnselected(tab)
onDestroyActionMode(lists[tab.position]!!.adapter as AudioBrowserAdapter?)
onDestroyActionMode(lists[tab.position].adapter as AudioBrowserAdapter?)
viewModel.restore()
}
override fun onTabReselected(tab: TabLayout.Tab) {
lists[tab.position]?.smoothScrollToPosition(0)
lists[tab.position].smoothScrollToPosition(0)
}
override fun onCtxAction(position: Int, option: Int) {
......
......@@ -55,6 +55,8 @@ import org.videolan.vlc.providers.HeadersIndex
import org.videolan.vlc.providers.medialibrary.MedialibraryProvider
import org.videolan.vlc.util.WeakHandler
import java.util.concurrent.atomic.AtomicBoolean
import kotlin.math.max
import kotlin.math.min
private const val TAG = "FastScroller"
private const val HANDLE_ANIMATION_DURATION = 100
......@@ -313,7 +315,7 @@ class FastScroller : LinearLayout, CoroutineScope, Observer<HeadersIndex> {
}
private fun getValueInRange(min: Int, max: Int, value: Int): Int {
return Math.min(Math.max(min, value), max)
return min(max(min, value), max)
}
......
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