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

Implement Album sort by insertion date

Fixes #1462
parent 3feabb9c
No related branches found
No related tags found
1 merge request!1288Implement Album sort by insertion date
Pipeline #199869 passed with stage
in 21 minutes and 40 seconds
......@@ -15,6 +15,7 @@
<string name="sortby_length">Length</string>
<string name="sortby_date">Date</string>
<string name="sortby_last_modified_date">Recently added</string>
<string name="sortby_insertion">Insertion date</string>
<string name="sortby_media_number">Media number</string>
<string name="sortby_number">Nb tracks</string>
<string name="searchable_hint">Search…</string>
......
......@@ -87,6 +87,12 @@
android:id="@+id/ml_menu_sortby_last_modified"
android:title="@string/sortby_last_modified_date"
android:visible="false"/>
<item
android:orderInCategory="2"
android:id="@+id/ml_menu_sortby_insertion_date"
android:title="@string/sortby_insertion"
android:visible="false"/>
<item
android:orderInCategory="2"
android:id="@+id/ml_menu_sortby_number"
......
......@@ -15,6 +15,9 @@
<item
android:id="@+id/ml_menu_sortby_last_modified"
android:title="@string/sortby_last_modified_date" />
<item
android:id="@+id/ml_menu_sortby_insertion_date"
android:title="@string/sortby_insertion" />
<item
android:id="@+id/ml_menu_sortby_number"
android:title="@string/sortby_number" />
......
......@@ -249,6 +249,7 @@ class AudioBrowserFragment : BaseAudioBrowser<AudioBrowserViewModel>() {
menu.findItem(R.id.ml_menu_sortby_length).isVisible = canSortByDuration()
menu.findItem(R.id.ml_menu_sortby_date).isVisible = canSortByReleaseDate()
menu.findItem(R.id.ml_menu_sortby_last_modified).isVisible = canSortByLastModified()
menu.findItem(R.id.ml_menu_sortby_insertion_date).isVisible = canSortByInsertionDate()
menu.findItem(R.id.ml_menu_sortby_number).isVisible = false
menu.findItem(R.id.ml_menu_display_grid).isVisible = !viewModel.providersInCard[currentTab]
menu.findItem(R.id.ml_menu_display_list).isVisible = viewModel.providersInCard[currentTab]
......
......@@ -175,6 +175,10 @@ abstract class MediaBrowserFragment<T : SortableModel> : BaseFragment(), Filtera
sortBy(Medialibrary.SORT_LASTMODIFICATIONDATE)
return true
}
R.id.ml_menu_sortby_insertion_date -> {
sortBy(Medialibrary.SORT_INSERTIONDATE)
return true
}
R.id.ml_menu_sortby_artist_name -> {
sortBy(Medialibrary.SORT_ARTIST)
return true
......
......@@ -40,6 +40,7 @@ class AlbumsProvider(val parent : MediaLibraryItem?, context: Context, model: So
override fun canSortByDuration() = true
override fun canSortByReleaseDate() = true
override fun canSortByArtist() = true
override fun canSortByInsertionDate()= true
init {
sort = Settings.getInstance(context).getInt(sortKey, if (parent is Artist) Medialibrary.SORT_RELEASEDATE else Medialibrary.SORT_DEFAULT)
......
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