Added indicator of what song is playing in all of the music-type views. Added Queue data structure to prepare for a music queue. #39 #45

This commit is contained in:
amazing-username
2019-06-15 10:49:04 -07:00
parent 277e20ef10
commit e15c2cf2ef
11 changed files with 336 additions and 40 deletions
+88 -1
View File
@@ -2,11 +2,14 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
using Mear.Constants;
using Mear.Playback;
using Mear.ViewModels;
namespace Mear.Views
@@ -15,6 +18,9 @@ namespace Mear.Views
public partial class ArtistView : ContentPage
{
#region Fields
private StackLayout _playerIndicatorLayout;
private Button _controlButton;
private Label _songTitleLabel;
private ArtistViewModel _viewModel;
#endregion
@@ -27,6 +33,8 @@ namespace Mear.Views
public ArtistView()
{
InitializeComponent();
AddPlayerIndicator();
BackgroundControl();
BindingContext = _viewModel = new ArtistViewModel();
}
@@ -34,7 +42,86 @@ namespace Mear.Views
#region Methods
#region Events
private async Task AddPlayerIndicator()
{
var mainLayout = ArtistViewMainLayout;
if (_playerIndicatorLayout == null)
{
_playerIndicatorLayout = await ConfigureSongIndicatorLayout();
}
mainLayout.Children.Add(_playerIndicatorLayout);
}
private async Task<StackLayout> ConfigureSongIndicatorLayout()
{
var indicatorLayout = new StackLayout();
indicatorLayout.Orientation = StackOrientation.Horizontal;
indicatorLayout.Padding = 5;
_controlButton = new Button();
_controlButton.Clicked += ControlButton_Clicked;
_songTitleLabel = new Label();
_songTitleLabel.HorizontalOptions = LayoutOptions.Center;
_songTitleLabel.VerticalOptions = LayoutOptions.Start;
var isSongPlayer = MearPlayer.IsPlaying();
if (isSongPlayer)
{
_controlButton.Text = "P";
_songTitleLabel.Text = await MearPlayer.SongTitle();
}
else
{
_controlButton.Text = "S";
_songTitleLabel.Text = string.Empty;
}
indicatorLayout.Children.Add(_controlButton);
indicatorLayout.Children.Add(_songTitleLabel);
return indicatorLayout;
}
#region Background
private async Task BackgroundControl()
{
try
{
new Thread(async () =>
{
while (true)
{
Device.BeginInvokeOnMainThread(async () =>
{
if (MearPlayer.SongHasBeenChanged(MearPlayer.MusicViews.Artist))
{
_songTitleLabel.Text = MearPlayer.SongTitle().Result;
MearPlayer.ResetSongChange(MearPlayer.MusicViews.Artist);
}
});
await Task.Delay(800);
}
}).Start();
}
catch (Exception ex)
{
var msg = ex.Message;
}
}
#endregion
#region Events
private async void ControlButton_Clicked(object sender, EventArgs e)
{
if (MearPlayer.IsPlaying())
{
MearPlayer.ControlMusic(null, PlayControls.PAUSE);
}
else
{
MearPlayer.ControlMusic(null, PlayControls.RESUME);
}
}
private void ArtistListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)
{
var artistItem = (sender as ListView).SelectedItem = null;