zoriya/Opus
1
0
Fork 0
mirror of https://github.com/zoriya/Opus.git synced 2025-12-06 06:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reworking playlist play in order.

Browse Source
This commit is contained in:
Tristan Roux
2019-02-20 21:32:03 +01:00
parent 9f8286a2e0
commit b1ae015215
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MusicApp/Resources/Portable Class/PlaylistTrackAdapter.cs
View File

@@ -79,7 +79,7 @@ namespace MusicApp.Resources.Portable_Class
header.FindViewById<TextView>(Resource.Id.headerNumber).Text = songList.Count + " " + (songList.Count < 2 ? MainActivity.instance.GetString(Resource.String.element) : MainActivity.instance.GetString(Resource.String.elements));
if (!header.FindViewById<ImageButton>(Resource.Id.headerPlay).HasOnClickListeners)
{
header.FindViewById<ImageButton>(Resource.Id.headerPlay).Click += (sender, e0) => { PlaylistTracks.instance.PlayInOrder(0, false); };
header.FindViewById<ImageButton>(Resource.Id.headerPlay).Click += (sender, e0) => { PlaylistTracks.instance.PlayInOrder(0); };
header.FindViewById<ImageButton>(Resource.Id.headerShuffle).Click += (sender, e0) =>
{
if (PlaylistTracks.instance.tracks[0].IsYt)

21
MusicApp/Resources/Portable Class/PlaylistTracks.cs
View File

@@ -357,7 +357,7 @@ namespace MusicApp.Resources.Portable_Class
Activity.FindViewById<TextView>(Resource.Id.headerTitle).Text = playlistName;
if(!Activity.FindViewById<ImageButton>(Resource.Id.headerPlay).HasOnClickListeners)
Activity.FindViewById<ImageButton>(Resource.Id.headerPlay).Click += (sender, e0) => { PlayInOrder(0, false); };
Activity.FindViewById<ImageButton>(Resource.Id.headerPlay).Click += (sender, e0) => { PlayInOrder(0); };
if(!Activity.FindViewById<ImageButton>(Resource.Id.headerShuffle).HasOnClickListeners)
Activity.FindViewById<ImageButton>(Resource.Id.headerShuffle).Click += (sender, e0) => { RandomPlay(); };
if (!Activity.FindViewById<ImageButton>(Resource.Id.headerMore).HasOnClickListeners)
@@ -664,7 +664,7 @@ namespace MusicApp.Resources.Portable_Class
if (!useHeader)
Position--;
PlayInOrder(Position, true);
PlayInOrder(Position);
}
private void ListView_ItemLongClick(object sender, int Position)
@@ -700,7 +700,7 @@ namespace MusicApp.Resources.Portable_Class
List<BottomSheetAction> actions = new List<BottomSheetAction>
{
new BottomSheetAction(Resource.Drawable.Play, Resources.GetString(Resource.String.play), (sender, eventArg) => { PlayInOrder(position, true); bottomSheet.Dismiss(); }),
new BottomSheetAction(Resource.Drawable.Play, Resources.GetString(Resource.String.play), (sender, eventArg) => { PlayInOrder(position); bottomSheet.Dismiss(); }),
new BottomSheetAction(Resource.Drawable.PlaylistPlay, Resources.GetString(Resource.String.play_next), (sender, eventArg) =>
{
if (!item.IsYt)
@@ -764,7 +764,7 @@ namespace MusicApp.Resources.Portable_Class
bottomSheet.Show();
}
public async void PlayInOrder(int fromPosition, bool useTransition)
public async void PlayInOrder(int fromPosition)
{
if (instance.tracks.Count <= fromPosition)
return;
@@ -780,9 +780,9 @@ namespace MusicApp.Resources.Portable_Class
await instance.LoadMore();
}
List<Song> songs = instance.tracks.GetRange(fromPosition, tracks.Count - fromPosition);
List<Song> songs = instance.tracks.GetRange(fromPosition, instance.tracks.Count - fromPosition);
if (result != null && result.Count > fromPosition)
songs = instance.result.GetRange(fromPosition, result.Count - fromPosition);
songs = instance.result.GetRange(fromPosition, instance.result.Count - fromPosition);
if (!songs[0].IsYt)
{
@@ -792,6 +792,13 @@ namespace MusicApp.Resources.Portable_Class
songs.RemoveAt(0);
MusicPlayer.queue.AddRange(songs);
List<Song> preSongs = instance.tracks.GetRange(0, fromPosition);
if (result != null && result.Count > fromPosition)
preSongs = instance.result.GetRange(0, fromPosition);
MusicPlayer.queue.InsertRange(0, preSongs);
MusicPlayer.currentID = preSongs.Count;
Queue.instance?.Refresh();
while (MusicPlayer.instance == null)
@@ -824,7 +831,7 @@ namespace MusicApp.Resources.Portable_Class
instance = this;
if (!Activity.FindViewById<ImageButton>(Resource.Id.headerPlay).HasOnClickListeners)
Activity.FindViewById<ImageButton>(Resource.Id.headerPlay).Click += (sender, e0) => { PlayInOrder(0, false); };
Activity.FindViewById<ImageButton>(Resource.Id.headerPlay).Click += (sender, e0) => { instance.PlayInOrder(0); };
if (!Activity.FindViewById<ImageButton>(Resource.Id.headerShuffle).HasOnClickListeners)
Activity.FindViewById<ImageButton>(Resource.Id.headerShuffle).Click += (sender, e0) => { RandomPlay(); };
if (!Activity.FindViewById<ImageButton>(Resource.Id.headerMore).HasOnClickListeners)