phoenix/mear
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Mear/Mear/Playback/MearPlayer.cs
+43 -15
View File
@@ -20,11 +20,18 @@ using Mear.Utilities;
namespace Mear.Playback
{
public class MearPlayer
{
public class MearPlayer
{
#region Fields
private Queue<Song> _mearQueue = null;
private static Song _song;
private static bool? _initialized = null;
private static SortedDictionary<MusicViews, bool?> _songChanged =
new SortedDictionary<MusicViews, bool?>{
{ MusicViews.Song, false },
{ MusicViews.Album, false },
{ MusicViews.Artist, false }
};
#endregion
@@ -77,7 +84,10 @@ namespace Mear.Playback
}
public static async Task<Song> ControlMusic(Song song, PlayControls control)
{
_song = song;
if (song != null)
{
_song = song;
}
switch (control)
{
case PlayControls.PLAYOFFLINE:
@@ -113,15 +123,16 @@ namespace Mear.Playback
return null;
}
public static async Task<string> SongTitle()
{
return _song.Title;
}
public static async Task<string> ConvertToTime()
{
try
{
var ttlSec = (int)CrossMediaManager.Current.Position.TotalSeconds;
var cnvrt = new TimeFormat();
var curPos = cnvrt.ConvertToSongTime(ttlSec);
return curPos;
return TimeFormat.ConvertToSongTime(ttlSec);
}
catch (Exception ex)
{
@@ -161,7 +172,7 @@ namespace Mear.Playback
{
var songPath = song.SongPath;
await CrossMediaManager.Current.Play(songPath);
PlaySong(songPath);
}
catch (Exception ex)
{
@@ -179,6 +190,10 @@ namespace Mear.Playback
_song.Downloaded = false;
}
public static async Task ResetSongChange(MusicViews type)
{
_songChanged[type] = false;
}
public static async Task SeekTo(double songProress)
{
double newPosition = (songProress / 100) * ((double)_song.Duration);
@@ -222,6 +237,10 @@ namespace Mear.Playback
{
return CrossMediaManager.Current.IsPlaying();
}
public static bool SongHasBeenChanged(MusicViews type)
{
return _songChanged[type].Value;
}
public static bool RepeatMatchedDatabase()
{
var playerRepeatMode = CrossMediaManager.Current.RepeatMode;
@@ -301,9 +320,11 @@ namespace Mear.Playback
if (_initialized == null)
{
CrossMediaManager.Current.MediaItemFinished += Current_MediaItemFinished;
//BackgroundWork();
_initialized = true;
}
_songChanged[MusicViews.Song] = true;
_songChanged[MusicViews.Album] = true;
_songChanged[MusicViews.Artist] = true;
}
private static async Task ResumeSong()
{
@@ -314,7 +335,7 @@ namespace Mear.Playback
{
var musicCtrl = new DBMusicControlsRepository();
musicCtrl.UpdateRepeat();
var repeatMode = (Repeat)musicCtrl.IsRepeatOn();
var repeatMode = musicCtrl.IsRepeatOn();
CrossMediaManager.Current.RepeatMode = RepeatUtility.RetrieveRepeatMode(repeatMode);
}
@@ -341,15 +362,12 @@ namespace Mear.Playback
{
var ctrlRepo = new DBMusicControlsRepository();
var repeatMode = ctrlRepo.IsRepeatOn();
if (CrossMediaManager.Current.IsPlaying())
{
//return;
}
switch(repeatMode)
{
case Repeat.ONE:
CrossMediaManager.Current.SeekToStart();
//PlaySong(_song.SongPath);
PlaySong(_song.SongPath);
break;
case Repeat.ALL:
// Will implment this fully later once Queues are a feature
@@ -359,5 +377,15 @@ namespace Mear.Playback
}
#endregion
#endregion
#region Enums
public enum MusicViews
{
Song = 0,
Album,
Artist
}
#endregion
}
}
Mear/Mear/Utilities/TimeFormat.cs
+3 -6
View File
@@ -19,23 +19,20 @@ namespace Mear.Utilities
#region Methods
public string ConvertToSongTime(int seconds)
public static string ConvertToSongTime(int seconds)
{
var curTime = string.Empty;
var dur = seconds;
var min = TimeSpan.FromSeconds((double) dur).Minutes;
var remainingSec = dur % 60;
if (remainingSec < 10)
{
curTime = $"{min}:0{remainingSec}";
return $"{min}:0{remainingSec}";
}
else
{
curTime = $"{min}:{remainingSec}";
return $"{min}:{remainingSec}";
}
return curTime;
}
#endregion
}
Mear/Mear/Views/AlbumView.xaml
+1 -1
View File
@@ -11,7 +11,7 @@
<ContentPage.BindingContext>
<vm:AlbumViewModel />
</ContentPage.BindingContext>
<StackLayout>
<StackLayout x:Name="AlbumViewMainLayout" >
<SearchBar x:Name="SearchAlbum"
Placeholder="Album"
SearchCommand="{Binding SearchAlbumCommand}"
Mear/Mear/Views/AlbumView.xaml.cs
+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 AlbumView : ContentPage
{
#region Fields
private StackLayout _playerIndicatorLayout;
private Button _controlButton;
private Label _songTitleLabel;
private AlbumViewModel _viewModel;
#endregion
@@ -27,6 +33,8 @@ namespace Mear.Views
public AlbumView()
{
InitializeComponent();
AddPlayerIndicator();
BackgroundControl();
BindingContext = _viewModel = new AlbumViewModel();
}
@@ -34,7 +42,86 @@ namespace Mear.Views
#region Methods
#region Events
private async Task AddPlayerIndicator()
{
var mainLayout = AlbumViewMainLayout;
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.Album))
{
_songTitleLabel.Text = MearPlayer.SongTitle().Result;
MearPlayer.ResetSongChange(MearPlayer.MusicViews.Album);
}
});
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 AlbumListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)
{
var albumItem = (sender as ListView).SelectedItem = null;
Mear/Mear/Views/ArtistView.xaml
+1 -1
View File
@@ -12,7 +12,7 @@
<vm:ArtistViewModel />
</ContentPage.BindingContext>
<StackLayout>
<StackLayout x:Name="ArtistViewMainLayout">
<SearchBar x:Name="SearchArtist"
Placeholder="Artist"
SearchCommand="{Binding SearchArtistCommand}"
Mear/Mear/Views/ArtistView.xaml.cs
+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;
Mear/Mear/Views/MearPlayerView.xaml.cs
+3 -7
View File
@@ -50,7 +50,7 @@ namespace Mear.Views
InitializeControls();
BackgroundSongElasping();
BackgroundSongCoverUpdate();
//BackgroundSongCoverUpdate();
//BackgroundControlInit();
InitializeOptions();
@@ -81,7 +81,7 @@ namespace Mear.Views
return rmvOpt;
}
private void InitializeOptions()
private async void InitializeOptions()
{
if (!_song.Downloaded)
{
@@ -96,14 +96,10 @@ namespace Mear.Views
}
private void InitializeControls()
{
var songCnvrt = new TimeFormat();
var dur = _song.Duration;
var endTime = songCnvrt.ConvertToSongTime(dur.Value);
Shuffle.Text = MearPlayer.RetrieveShuffleString();
Repeat.Text = MearPlayer.RetrieveRepeatString();
EndTime.Text = endTime;
EndTime.Text = TimeFormat.ConvertToSongTime(_song.Duration.Value);
}
private void RemoveSyncToolbar()
{
Mear/Mear/Views/MusicLibrary.xaml
-1
View File
@@ -46,5 +46,4 @@
</x:Arguments>
</NavigationPage>
</TabbedPage.Children>
</TabbedPage>
Mear/Mear/Views/MusicViewBase.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Text;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
namespace Mear.Views
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class MusicViewBase : ContentPage
{
protected void AddPlayerIn(StackLayout mainLayout)
{
}
}
}
Mear/Mear/Views/SongView.xaml
+1 -1
View File
@@ -12,7 +12,7 @@
<vm:SongViewModel />
</ContentPage.BindingContext>
<StackLayout>
<StackLayout x:Name="SongViewMainLayout" >
<SearchBar x:Name="SearchSong"
Placeholder="Title, Artist"
SearchCommand="{Binding SearchSongsCommand}"
Mear/Mear/Views/SongView.xaml.cs
+91 -6
View File
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using MediaManager;
@@ -20,7 +21,10 @@ namespace Mear.Views
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class SongView : ContentPage
{
#region Fields
#region Fields
private StackLayout _playerIndicatorLayout;
private Button _controlButton;
private Label _songTitleLabel;
private SongViewModel _viewModel;
#endregion
@@ -35,13 +39,66 @@ namespace Mear.Views
InitializeComponent();
BindingContext = _viewModel = new SongViewModel();
AddPlayerIndicator();
BackgroundControl();
}
#endregion
#region Methods
#region Events
private async void SongListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)
private async Task AddPlayerIndicator()
{
var mainLayout = SongViewMainLayout;
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 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 async void SongListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)
{
if (SongListView.SelectedItem == null)
{
@@ -88,10 +145,38 @@ namespace Mear.Views
var msg = ex.Message;
}
}
#endregion
#endregion
#region Test
public void TestRemoteSong()
#region Background
private async Task BackgroundControl()
{
try
{
new Thread(async () =>
{
while (true)
{
Device.BeginInvokeOnMainThread(async () =>
{
if (MearPlayer.SongHasBeenChanged(MearPlayer.MusicViews.Song))
{
_songTitleLabel.Text = MearPlayer.SongTitle().Result;
MearPlayer.ResetSongChange(MearPlayer.MusicViews.Song);
}
});
await Task.Delay(800);
}
}).Start();
}
catch (Exception ex)
{
var msg = ex.Message;
}
}
#endregion
#region Test
public void TestRemoteSong()
{
var songRepo = new RemoteSongRepository();
var songs = songRepo.RetrieveSongs();