From 0614fa03a006166eaed31cd2df9bf76af0d66069 Mon Sep 17 00:00:00 2001 From: Anonymus Raccoon <32224410+AnonymusRaccoon@users.noreply.github.com> Date: Sun, 23 Jun 2019 19:12:06 +0200 Subject: [PATCH] Adding local song images on the more menu (were not here due). --- Opus/Code/UI/Adapter/LineAdapter.cs | 24 ++++++++++++------------ Opus/Code/UI/Fragments/Browse.cs | 10 +++++----- Opus/Code/UI/Fragments/FolderTracks.cs | 12 ++++++------ Opus/Code/UI/Fragments/PlaylistTracks.cs | 12 ++++++------ Opus/Code/UI/Fragments/Queue.cs | 12 ++++++------ Opus/Code/UI/Views/Player.cs | 10 +++++----- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Opus/Code/UI/Adapter/LineAdapter.cs b/Opus/Code/UI/Adapter/LineAdapter.cs index f112c14..c981cf1 100644 --- a/Opus/Code/UI/Adapter/LineAdapter.cs +++ b/Opus/Code/UI/Adapter/LineAdapter.cs @@ -175,16 +175,16 @@ namespace Opus.Adapter View bottomView = MainActivity.instance.LayoutInflater.Inflate(Resource.Layout.BottomSheet, null); bottomView.FindViewById(Resource.Id.bsTitle).Text = item.Title; bottomView.FindViewById(Resource.Id.bsArtist).Text = item.Artist; - if (item.Album == null) + if (item.AlbumArt == -1 || item.IsYt) { - var songCover = Uri.Parse("content://media/external/audio/albumart"); - var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt); - - Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); + Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); } else { - Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); + var songCover = Uri.Parse("content://media/external/audio/albumart"); + var songAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt); + + Picasso.With(MainActivity.instance).Load(songAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); } bottomSheet.SetContentView(bottomView); @@ -229,16 +229,16 @@ namespace Opus.Adapter View bottomView = MainActivity.instance.LayoutInflater.Inflate(Resource.Layout.BottomSheet, null); bottomView.FindViewById(Resource.Id.bsTitle).Text = item.Title; bottomView.FindViewById(Resource.Id.bsArtist).Text = item.Artist; - if (item.Album == null) + if (item.AlbumArt == -1 || item.IsYt) { - var songCover = Uri.Parse("content://media/external/audio/albumart"); - var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt); - - Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); + Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); } else { - Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); + var songCover = Uri.Parse("content://media/external/audio/albumart"); + var songAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt); + + Picasso.With(MainActivity.instance).Load(songAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); } bottomSheet.SetContentView(bottomView); diff --git a/Opus/Code/UI/Fragments/Browse.cs b/Opus/Code/UI/Fragments/Browse.cs index c6341c6..5ca1fea 100644 --- a/Opus/Code/UI/Fragments/Browse.cs +++ b/Opus/Code/UI/Fragments/Browse.cs @@ -159,17 +159,17 @@ namespace Opus.Fragments bottomView.FindViewById(Resource.Id.bsTitle).Text = item.Title; bottomView.FindViewById(Resource.Id.bsArtist).Text = item.Artist; bottomSheet.SetContentView(bottomView); - if (item.Album == null) + if(item.AlbumArt == -1 || item.IsYt) + { + Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); + } + else { var songCover = Uri.Parse("content://media/external/audio/albumart"); var songAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt); Picasso.With(MainActivity.instance).Load(songAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); } - else - { - Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); - } bottomSheet.FindViewById(Resource.Id.bsItems).Adapter = new BottomSheetAdapter(MainActivity.instance, Resource.Layout.BottomSheetText, new List { diff --git a/Opus/Code/UI/Fragments/FolderTracks.cs b/Opus/Code/UI/Fragments/FolderTracks.cs index a164bae..200d577 100644 --- a/Opus/Code/UI/Fragments/FolderTracks.cs +++ b/Opus/Code/UI/Fragments/FolderTracks.cs @@ -143,16 +143,16 @@ namespace Opus.Fragments View bottomView = LayoutInflater.Inflate(Resource.Layout.BottomSheet, null); bottomView.FindViewById(Resource.Id.bsTitle).Text = item.Title; bottomView.FindViewById(Resource.Id.bsArtist).Text = item.Artist; - if (item.Album == null) + if (item.AlbumArt == -1 || item.IsYt) { - var songCover = Uri.Parse("content://media/external/audio/albumart"); - var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt); - - Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); + Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); } else { - Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); + var songCover = Uri.Parse("content://media/external/audio/albumart"); + var songAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt); + + Picasso.With(MainActivity.instance).Load(songAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); } bottomSheet.SetContentView(bottomView); diff --git a/Opus/Code/UI/Fragments/PlaylistTracks.cs b/Opus/Code/UI/Fragments/PlaylistTracks.cs index 0304091..3817fd6 100644 --- a/Opus/Code/UI/Fragments/PlaylistTracks.cs +++ b/Opus/Code/UI/Fragments/PlaylistTracks.cs @@ -474,16 +474,16 @@ namespace Opus.Fragments View bottomView = LayoutInflater.Inflate(Resource.Layout.BottomSheet, null); bottomView.FindViewById(Resource.Id.bsTitle).Text = song.Title; bottomView.FindViewById(Resource.Id.bsArtist).Text = song.Artist; - if (song.Album == null) + if (song.AlbumArt == -1 || song.IsYt) { - var songCover = Uri.Parse("content://media/external/audio/albumart"); - var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, song.AlbumArt); - - Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); + Picasso.With(MainActivity.instance).Load(song.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); } else { - Picasso.With(MainActivity.instance).Load(song.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); + var songCover = Uri.Parse("content://media/external/audio/albumart"); + var songAlbumArtUri = ContentUris.WithAppendedId(songCover, song.AlbumArt); + + Picasso.With(MainActivity.instance).Load(songAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); } bottomSheet.SetContentView(bottomView); diff --git a/Opus/Code/UI/Fragments/Queue.cs b/Opus/Code/UI/Fragments/Queue.cs index 4fa7849..25c26ea 100644 --- a/Opus/Code/UI/Fragments/Queue.cs +++ b/Opus/Code/UI/Fragments/Queue.cs @@ -178,16 +178,16 @@ public class Queue : Fragment, RecyclerView.IOnItemTouchListener, PopupMenu.IOnM View bottomView = LayoutInflater.Inflate(Resource.Layout.BottomSheet, null); bottomView.FindViewById(Resource.Id.bsTitle).Text = item.Title; bottomView.FindViewById(Resource.Id.bsArtist).Text = item.Artist; - if (item.Album == null) + if (item.AlbumArt == -1 || item.IsYt) { - var songCover = Android.Net.Uri.Parse("content://media/external/audio/albumart"); - var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt); - - Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); + Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); } else { - Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); + var songCover = Android.Net.Uri.Parse("content://media/external/audio/albumart"); + var songAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt); + + Picasso.With(MainActivity.instance).Load(songAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); } bottomSheet.SetContentView(bottomView); diff --git a/Opus/Code/UI/Views/Player.cs b/Opus/Code/UI/Views/Player.cs index 00094d4..81bfd46 100644 --- a/Opus/Code/UI/Views/Player.cs +++ b/Opus/Code/UI/Views/Player.cs @@ -395,17 +395,17 @@ namespace Opus View bottomView = MainActivity.instance.LayoutInflater.Inflate(Resource.Layout.BottomSheet, null); bottomView.FindViewById(Resource.Id.bsTitle).Text = item.Title; bottomView.FindViewById(Resource.Id.bsArtist).Text = item.Artist; - if (item.Album == null) + if (item.AlbumArt == -1 || item.IsYt) + { + Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); + } + else { var songCover = Android.Net.Uri.Parse("content://media/external/audio/albumart"); var songAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt); Picasso.With(MainActivity.instance).Load(songAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById(Resource.Id.bsArt)); } - else - { - Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById(Resource.Id.bsArt)); - } bottomSheet.SetContentView(bottomView); List actions = new List