diff --git a/MusicApp/MainActivity.cs b/MusicApp/MainActivity.cs index 1b5fc76..8b469ed 100644 --- a/MusicApp/MainActivity.cs +++ b/MusicApp/MainActivity.cs @@ -404,6 +404,8 @@ namespace MusicApp SupportActionBar.SetHomeButtonEnabled(false); SupportActionBar.SetDisplayHomeAsUpEnabled(false); SupportActionBar.Title = "MusicApp"; + contentRefresh.Refresh -= PlaylistTracks.instance.OnRefresh; + OnPaddingChanged -= PlaylistTracks.instance.OnPaddingChanged; PlaylistTracks.instance = null; if (HomeDetails) { diff --git a/MusicApp/Resources/Portable Class/Playlist.cs b/MusicApp/Resources/Portable Class/Playlist.cs index c18d406..3f9e200 100644 --- a/MusicApp/Resources/Portable Class/Playlist.cs +++ b/MusicApp/Resources/Portable Class/Playlist.cs @@ -21,7 +21,6 @@ namespace MusicApp.Resources.Portable_Class { public static Playlist instance; public RecyclerView ListView; - private bool populated = false; //Local playlists private List playList = new List(); @@ -74,8 +73,6 @@ namespace MusicApp.Resources.Portable_Class public async Task PopulateView() { - populated = false; - //Local playlists playList.Clear(); playlistId.Clear(); @@ -201,8 +198,6 @@ namespace MusicApp.Resources.Portable_Class adapter.SetYtPlaylists(ytPlaylists, true); else adapter.SetYtPlaylists(ytPlaylists, true); - - populated = true; } public static Fragment NewInstance() @@ -219,8 +214,7 @@ namespace MusicApp.Resources.Portable_Class public async Task Refresh() { - if(populated) - await PopulateView(); + await PopulateView(); } private void ListView_ItemClick(object sender, int Position) @@ -285,6 +279,8 @@ namespace MusicApp.Resources.Portable_Class act.SupportActionBar.Title = playlist.GetName(); instance = null; MainActivity.instance.contentRefresh.Refresh -= OnRefresh; + MainActivity.instance.OnPaddingChanged -= OnPaddingChanged; + MainActivity.instance.contentRefresh.Refresh -= OnRefresh; if (local) MainActivity.instance.Transition(Resource.Id.contentView, PlaylistTracks.NewInstance(playlist.GetID(), playlist.GetName()), true); diff --git a/MusicApp/Resources/Portable Class/PlaylistTracks.cs b/MusicApp/Resources/Portable Class/PlaylistTracks.cs index 964f23b..b5a5fc8 100644 --- a/MusicApp/Resources/Portable Class/PlaylistTracks.cs +++ b/MusicApp/Resources/Portable Class/PlaylistTracks.cs @@ -45,7 +45,7 @@ namespace MusicApp.Resources.Portable_Class PopulateList(); } - private void OnPaddingChanged(object sender, PaddingChange e) + public void OnPaddingChanged(object sender, PaddingChange e) { if (MainActivity.paddingBot > e.oldPadding) adapter.listPadding = MainActivity.paddingBot - MainActivity.defaultPaddingBot; @@ -185,7 +185,7 @@ namespace MusicApp.Resources.Portable_Class } } - private async void OnRefresh(object sender, System.EventArgs e) + public async void OnRefresh(object sender, System.EventArgs e) { await PopulateList(); MainActivity.instance.contentRefresh.Refreshing = false;