[Android] Fix media number sort visibility

[Merlyn Shelley]

Hi Team,

I have applied to Google Season of Docs 2020 as a Technical Writer. I wish
to work on VLC Android documentation.
 Please guide me in approaching this issue.
Thank you.
Merlyn.
www.amazon.com/author/merlynshelley

On Tue, Jun 2, 2020, 17:32 Nicolas Pomepuy <git at videolan.org> wrote:

> vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> |
> Tue Jun  2 10:16:28 2020 +0200| [c5db0c8ff58983d14f50eaab663779a32aed1b75]
> | committer: Nicolas Pomepuy
>
> Fix media number sort visibility
>
> Fixes #1371
>
> >
> https://code.videolan.org/videolan/vlc-android/commit/c5db0c8ff58983d14f50eaab663779a32aed1b75
> ---
>
>  .../java/org/videolan/television/ui/browser/BaseBrowserTvFragment.kt
>  | 1 +
>  application/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.kt
>  | 1 +
>  .../src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.kt
>  | 1 +
>  .../vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.kt
>  | 1 +
>  .../vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
> | 1 +
>  5 files changed, 5 insertions(+)
>
> diff --git
> a/application/television/src/main/java/org/videolan/television/ui/browser/BaseBrowserTvFragment.kt
> b/application/television/src/main/java/org/videolan/television/ui/browser/BaseBrowserTvFragment.kt
> index 753b8e874..dd1fee457 100644
> ---
> a/application/television/src/main/java/org/videolan/television/ui/browser/BaseBrowserTvFragment.kt
> +++
> b/application/television/src/main/java/org/videolan/television/ui/browser/BaseBrowserTvFragment.kt
> @@ -314,6 +314,7 @@ abstract class BaseBrowserTvFragment<T> : Fragment(),
> BrowserFragmentInterface,
>          menu.menu.findItem(R.id.ml_menu_sortby_date).isVisible =
> (viewModel as SortableModel).canSortByInsertionDate() || (viewModel as
> SortableModel).canSortByReleaseDate() || (viewModel as
> SortableModel).canSortByLastModified()
>          menu.menu.findItem(R.id.ml_menu_sortby_date).isVisible =
> (viewModel as SortableModel).canSortByReleaseDate()
>          menu.menu.findItem(R.id.ml_menu_sortby_last_modified).isVisible =
> (viewModel as SortableModel).canSortByLastModified()
> +
> menu.menu.findItem(org.videolan.vlc.R.id.ml_menu_sortby_media_number).isVisible
> = false
>          menu.menu.findItem(R.id.ml_menu_sortby_number).isVisible = false
>          menu.setOnMenuItemClickListener(this)
>          menu.show()
> diff --git
> a/application/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.kt
> b/application/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.kt
> index 55770fad0..e9610e207 100644
> --- a/application/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.kt
> +++ b/application/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.kt
> @@ -183,6 +183,7 @@ open class PlaylistActivity :
> AudioPlayerContainerActivity(), IEventsHandler<Med
>          menu.findItem(R.id.ml_menu_sortby_length).isVisible =
> viewModel.canSortByDuration()
>          menu.findItem(R.id.ml_menu_sortby_date).isVisible =
> viewModel.canSortByReleaseDate()
>          menu.findItem(R.id.ml_menu_sortby_last_modified).isVisible =
> viewModel.canSortByLastModified()
> +        menu.findItem(R.id.ml_menu_sortby_media_number).isVisible = false
>          return true
>      }
>
> diff --git
> a/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.kt
> b/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.kt
> index 81519013a..1fca32141 100644
> ---
> a/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.kt
> +++
> b/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.kt
> @@ -183,6 +183,7 @@ class AudioAlbumsSongsFragment :
> BaseAudioBrowser<AlbumSongsViewModel>(), SwipeR
>              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]
> +            menu.findItem(R.id.ml_menu_sortby_media_number).isVisible =
> canSortByMediaNumber()
>          }
>          sortMenuTitles()
>      }
> diff --git
> a/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.kt
> b/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.kt
> index 31dd0b3aa..4e96ead3a 100644
> ---
> a/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.kt
> +++
> b/application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.kt
> @@ -235,6 +235,7 @@ class AudioBrowserFragment :
> BaseAudioBrowser<AudioBrowserViewModel>() {
>              menu.findItem(R.id.ml_menu_sortby_number).isVisible = false
>              menu.findItem(R.id.ml_menu_display_grid).isVisible =
> currentTab in 0..2 && !viewModel.providersInCard[currentTab]
>              menu.findItem(R.id.ml_menu_display_list).isVisible =
> currentTab in 0..2 && viewModel.providersInCard[currentTab]
> +            menu.findItem(R.id.ml_menu_sortby_media_number).isVisible =
> canSortByMediaNumber()
>              val showAllArtistsItem =
> menu.findItem(R.id.artists_show_all_title)
>              showAllArtistsItem.isVisible = currentTab == 0
>              showAllArtistsItem.isChecked =
> Settings.getInstance(context).getBoolean(KEY_ARTISTS_SHOW_ALL, false)
> diff --git
> a/application/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
> b/application/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
> index 34acaa048..341a6d639 100644
> ---
> a/application/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
> +++
> b/application/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
> @@ -124,6 +124,7 @@ abstract class BaseBrowserFragment :
> MediaBrowserFragment<BrowserModel>(), IRefr
>          super.onPrepareOptionsMenu(menu)
>          menu.findItem(R.id.ml_menu_filter)?.isVisible =
> enableSearchOption()
>          menu.findItem(R.id.ml_menu_sortby)?.isVisible = !isRootDirectory
> +        menu.findItem(R.id.ml_menu_sortby_media_number)?.isVisible = false
>          menu.findItem(R.id.ml_menu_add_playlist)?.isVisible =
> !isRootDirectory
>          addPlaylistFolderOnly = menu.findItem(R.id.folder_add_playlist)
>          addPlaylistFolderOnly.isVisible = adapter.mediaCount > 0
>
> _______________________________________________
> Android mailing list
> Android at videolan.org
> https://mailman.videolan.org/listinfo/android
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/android/attachments/20200602/1de02fa7/attachment-0001.html>