Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
531
Issue boards
Milestones
Wiki
Code
Merge requests
13
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
c02fe54e
Commit
c02fe54e
authored
4 years ago
by
Nicolas Pomepuy
Browse files
Options
Downloads
Patches
Plain Diff
Make favorite sort consistent even after a delete/re-insert
parent
e3b82dc2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!516
Redesign
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
application/vlc-android/src/org/videolan/vlc/viewmodels/browser/BrowserFavoritesModel.kt
+3
-6
3 additions, 6 deletions
.../videolan/vlc/viewmodels/browser/BrowserFavoritesModel.kt
with
3 additions
and
6 deletions
application/vlc-android/src/org/videolan/vlc/viewmodels/browser/BrowserFavoritesModel.kt
+
3
−
6
View file @
c02fe54e
...
...
@@ -27,24 +27,21 @@ package org.videolan.vlc.viewmodels.browser
import
android.app.Application
import
android.content.Context
import
android.net.Uri
import
androidx.lifecycle.*
import
androidx.lifecycle.AndroidViewModel
import
androidx.lifecycle.viewModelScope
import
kotlinx.coroutines.CoroutineScope
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.flow.collect
import
kotlinx.coroutines.flow.flowOn
import
kotlinx.coroutines.flow.launchIn
import
kotlinx.coroutines.flow.onEach
import
kotlinx.coroutines.withContext
import
org.videolan.libvlc.util.MediaBrowser
import
org.videolan.medialibrary.interfaces.media.MediaWrapper
import
org.videolan.medialibrary.media.MediaLibraryItem
import
org.videolan.tools.CoroutineContextProvider
import
org.videolan.tools.livedata.LiveDataset
import
org.videolan.vlc.mediadb.models.BrowserFav
import
org.videolan.vlc.providers.BrowserProvider
import
org.videolan.vlc.repository.BrowserFavRepository
import
org.videolan.vlc.util.convertFavorites
import
kotlin.coroutines.CoroutineContext
class
BrowserFavoritesModel
(
context
:
Context
)
:
AndroidViewModel
(
context
.
applicationContext
as
Application
)
{
val
favorites
=
LiveDataset
<
MediaLibraryItem
>()
...
...
@@ -62,7 +59,7 @@ class FavoritesProvider(
browserFavRepository
.
browserFavorites
.
flowOn
(
Dispatchers
.
IO
)
.
onEach
{
list
->
convertFavorites
(
list
.
sorted
By
{
it
.
type
}
).
let
{
convertFavorites
(
list
.
sorted
With
(
compareBy
(
BrowserFav
::
title
,
BrowserFav
::
type
))
).
let
{
dataset
.
value
=
it
as
MutableList
<
MediaLibraryItem
>
parseSubDirectories
()
}
...
...
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