Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
530
Issue boards
Milestones
Wiki
Code
Merge requests
11
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
6f68d746
Commit
6f68d746
authored
5 years ago
by
Nicolas Pomepuy
Browse files
Options
Downloads
Patches
Plain Diff
Properly restore selected position when coming back to TV network browser
(cherry picked from commit
3d9097ba
)
parent
1c5441a1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!226
Backport for 3.2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vlc-android/src/org/videolan/vlc/gui/tv/browser/FileBrowserTvFragment.kt
+11
-2
11 additions, 2 deletions
.../org/videolan/vlc/gui/tv/browser/FileBrowserTvFragment.kt
with
11 additions
and
2 deletions
vlc-android/src/org/videolan/vlc/gui/tv/browser/FileBrowserTvFragment.kt
+
11
−
2
View file @
6f68d746
...
...
@@ -6,6 +6,7 @@ import android.util.Log
import
android.view.View
import
androidx.lifecycle.Observer
import
androidx.recyclerview.widget.GridLayoutManager
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
kotlinx.android.synthetic.main.song_browser.*
import
kotlinx.coroutines.ExperimentalCoroutinesApi
...
...
@@ -26,7 +27,6 @@ import org.videolan.vlc.viewmodels.browser.BrowserModel
import
org.videolan.vlc.viewmodels.browser.TYPE_FILE
import
org.videolan.vlc.viewmodels.browser.TYPE_NETWORK
import
org.videolan.vlc.viewmodels.browser.getBrowserModel
import
java.util.*
@UseExperimental
(
ObsoleteCoroutinesApi
::
class
)
@ExperimentalCoroutinesApi
...
...
@@ -65,7 +65,17 @@ class FileBrowserTvFragment : BaseBrowserTvFragment() {
viewModel
.
currentItem
=
item
(
viewModel
.
provider
as
BrowserProvider
).
dataset
.
observe
(
this
,
Observer
{
items
->
val
lm
=
binding
.
list
.
layoutManager
as
LinearLayoutManager
val
selectedItem
=
lm
.
focusedChild
submitList
(
items
)
binding
.
list
.
post
{
for
(
i
in
0
until
lm
.
childCount
)
{
if
(
lm
.
getChildAt
(
i
)
==
selectedItem
)
{
lm
.
getChildAt
(
i
)
?.
requestFocus
()
lm
.
scrollToPosition
(
lm
.
getPosition
(
lm
.
getChildAt
(
i
)
!!
))
}
}
}
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
"FileBrowserTvFragment"
,
"Submit lis of ${items.size} items"
)
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
"FileBrowserTvFragment"
,
"header size: ${viewModel.provider.headers.size()}"
)
...
...
@@ -114,7 +124,6 @@ class FileBrowserTvFragment : BaseBrowserTvFragment() {
super
.
onSaveInstanceState
(
outState
)
}
override
fun
onStop
()
{
super
.
onStop
()
(
viewModel
as
BrowserModel
).
stop
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment