Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Geoffrey Métais
VLC-Android
Commits
eeb3ebc3
Commit
eeb3ebc3
authored
May 06, 2020
by
Nicolas Pomepuy
Committed by
Geoffrey Métais
May 07, 2020
Browse files
Fix loading states for Video, playlist and Artist tab
Fixes #1328
parent
8044126f
Pipeline
#17062
passed with stage
in 3 minutes and 40 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
application/vlc-android/src/org/videolan/vlc/gui/PlaylistFragment.kt
View file @
eeb3ebc3
...
...
@@ -103,11 +103,10 @@ class PlaylistFragment : BaseAudioBrowser<PlaylistsViewModel>(), SwipeRefreshLay
super
.
onActivityCreated
(
savedInstanceState
)
viewModel
.
provider
.
pagedList
.
observe
(
requireActivity
(),
Observer
{
playlistAdapter
.
submitList
(
it
as
PagedList
<
MediaLibraryItem
>)
binding
.
empty
.
visibility
=
if
(
it
.
isEmpty
())
View
.
VISIBLE
else
View
.
GONE
})
viewModel
.
provider
.
loading
.
observe
(
requireActivity
(),
Observer
<
Boolean
>
{
loading
->
setRefreshing
(
loading
)
{
refresh
->
if
(!
refresh
)
binding
.
empty
.
visibility
=
if
(
empty
)
View
.
VISIBLE
else
View
.
GONE
}
viewModel
.
provider
.
loading
.
observe
(
requireActivity
(),
Observer
{
loading
->
setRefreshing
(
loading
)
{
}
})
fastScroller
.
setRecyclerView
(
getCurrentRV
(),
viewModel
.
provider
)
...
...
application/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.kt
View file @
eeb3ebc3
...
...
@@ -133,6 +133,7 @@ class AudioAlbumsSongsFragment : BaseAudioBrowser<AlbumSongsViewModel>(), SwipeR
viewModel
.
albumsProvider
.
pagedList
.
observe
(
requireActivity
(),
Observer
{
albums
->
@Suppress
(
"UNCHECKED_CAST"
)
(
albums
as
?
PagedList
<
MediaLibraryItem
>)
?.
let
{
albumsAdapter
.
submitList
(
it
)
}
if
(
viewModel
.
albumsProvider
.
loading
.
value
==
false
&&
empty
&&
!
viewModel
.
isFiltering
())
currentTab
=
1
})
viewModel
.
tracksProvider
.
pagedList
.
observe
(
requireActivity
(),
Observer
{
tracks
->
@Suppress
(
"UNCHECKED_CAST"
)
...
...
@@ -141,7 +142,6 @@ class AudioAlbumsSongsFragment : BaseAudioBrowser<AlbumSongsViewModel>(), SwipeR
for
(
i
in
0
..
1
)
setupLayoutManager
(
viewModel
.
providersInCard
[
i
],
lists
[
i
],
viewModel
.
providers
[
i
]
as
MedialibraryProvider
<
MediaLibraryItem
>,
adapters
[
i
],
spacing
)
viewModel
.
albumsProvider
.
loading
.
observe
(
requireActivity
(),
Observer
{
loading
->
if
(!
loading
)
{
if
(
empty
&&
!
viewModel
.
isFiltering
())
currentTab
=
1
fastScroller
.
setRecyclerView
(
getCurrentRV
(),
viewModel
.
providers
[
currentTab
])
}
setRefreshing
(
loading
)
...
...
application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt
View file @
eeb3ebc3
...
...
@@ -295,7 +295,7 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
private
fun
updateEmptyView
()
{
if
(!
::
binding
.
isInitialized
)
return
val
empty
=
viewModel
.
isEmpty
()
&&
videoListAdapter
.
currentList
.
isNullOrEmpty
()
val
working
=
mediaLibrary
.
isWorking
val
working
=
viewModel
.
provider
.
loading
.
value
!=
false
binding
.
emptyLoading
.
state
=
when
{
empty
&&
working
->
EmptyLoadingState
.
LOADING
empty
&&
!
working
->
EmptyLoadingState
.
EMPTY
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment