Solving some display bugs.

This commit is contained in:
Tristan Roux
2019-04-29 19:11:55 +02:00
parent fb15046855
commit 6db5ac6b25
2 changed files with 19 additions and 7 deletions

View File

@@ -488,7 +488,7 @@ namespace Opus.Fragments
{
for (int i = 1; i < YoutubePlaylists.Count; i++)
{
if (YoutubePlaylists[i].SyncState != SyncState.False && Downloader.queue.Find(x => x.playlist == YoutubePlaylists[i].Name && (x.State == DownloadState.Downloading || x.State == DownloadState.Initialization || x.State == DownloadState.MetaData || x.State == DownloadState.None)) == null)
if (YoutubePlaylists[i].SyncState != SyncState.False && YoutubePlaylists[i].SyncState != SyncState.Error && Downloader.queue.Find(x => x.playlist == YoutubePlaylists[i].Name && (x.State == DownloadState.Downloading || x.State == DownloadState.Initialization || x.State == DownloadState.MetaData || x.State == DownloadState.None)) == null)
{
YoutubePlaylists[i].SyncState = SyncState.True;
PlaylistHolder holder = (PlaylistHolder)ListView.GetChildViewHolder(ListView.GetChildAt(LocalPlaylists.Count + i));

View File

@@ -406,7 +406,7 @@ namespace Opus.Fragments
bottomSheet.Show();
}
public void PlaylistMore(PlaylistItem item)
public async void PlaylistMore(PlaylistItem item)
{
BottomSheetDialog bottomSheet = new BottomSheetDialog(MainActivity.instance);
View bottomView = MainActivity.instance.LayoutInflater.Inflate(Resource.Layout.BottomSheet, null);
@@ -432,11 +432,6 @@ namespace Opus.Fragments
PlaylistManager.AddToQueue(item);
bottomSheet.Dismiss();
}),
new BottomSheetAction(Resource.Drawable.LibraryAdd, MainActivity.instance.Resources.GetString(Resource.String.add_to_library), (sender, eventArg) =>
{
PlaylistManager.ForkPlaylist(item);
bottomSheet.Dismiss();
}),
new BottomSheetAction(Resource.Drawable.Download, MainActivity.instance.Resources.GetString(Resource.String.download), (sender, eventArg) =>
{
YoutubeManager.DownloadPlaylist(item.Name, item.YoutubeID);
@@ -444,6 +439,23 @@ namespace Opus.Fragments
})
};
if(await PlaylistManager.IsForked(item))
{
actions.Add(new BottomSheetAction(Resource.Drawable.Delete, MainActivity.instance.Resources.GetString(Resource.String.unfork), (sender, eventArg) =>
{
PlaylistManager.Unfork(item);
bottomSheet.Dismiss();
}));
}
else
{
actions.Add(new BottomSheetAction(Resource.Drawable.LibraryAdd, MainActivity.instance.Resources.GetString(Resource.String.add_to_library), (sender, eventArg) =>
{
PlaylistManager.ForkPlaylist(item);
bottomSheet.Dismiss();
}));
}
bottomSheet.FindViewById<ListView>(Resource.Id.bsItems).Adapter = new BottomSheetAdapter(MainActivity.instance, Resource.Layout.BottomSheetText, actions);
bottomSheet.Show();
}