From c7c9940786a26795da13cb8da7c45df4f90628c5 Mon Sep 17 00:00:00 2001
From: Tristan Roux
Date: Thu, 31 Jan 2019 18:00:58 +0100
Subject: [PATCH] Solving a bug with playlist view.
---
MusicApp/MainActivity.cs | 20 ++++++-------------
.../Portable Class/PlaylistTracks.cs | 2 +-
MusicApp/Resources/layout/Main.xml | 1 -
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/MusicApp/MainActivity.cs b/MusicApp/MainActivity.cs
index 8bd0d62..5a0f208 100644
--- a/MusicApp/MainActivity.cs
+++ b/MusicApp/MainActivity.cs
@@ -64,8 +64,7 @@ namespace MusicApp
public SwipeRefreshLayout contentRefresh;
public bool usePager;
public bool HomeDetails = false;
- public bool paused = false;
- public bool StateSaved = false;
+ public bool Paused = false;
public bool prepared = false;
public BottomSheetBehavior SheetBehavior;
@@ -926,7 +925,7 @@ namespace MusicApp
{
if (displayToast)
{
- if (instance != null && !instance.StateSaved)
+ if (instance != null && !instance.Paused)
{
Snackbar snackBar = Snackbar.Make(instance.FindViewById(Resource.Id.snackBar), "You are not connected to internet, can't check for updates.", Snackbar.LengthLong);
snackBar.View.FindViewById(Resource.Id.snackbar_text).SetTextColor(Color.White);
@@ -983,7 +982,7 @@ namespace MusicApp
{
if (!beta)
{
- if ((instance != null && !instance.StateSaved) || Preferences.instance != null)
+ if ((instance != null && !instance.Paused) || Preferences.instance != null)
{
Snackbar snackBar;
if (Preferences.instance != null)
@@ -998,7 +997,7 @@ namespace MusicApp
}
else
{
- if ((instance != null && !instance.StateSaved) || Preferences.instance != null)
+ if ((instance != null && !instance.Paused) || Preferences.instance != null)
{
Snackbar snackBar;
if (Preferences.instance != null)
@@ -1054,9 +1053,8 @@ namespace MusicApp
protected override void OnResume()
{
base.OnResume();
- paused = false;
+ Paused = false;
instance = this;
- StateSaved = false;
if (CastContext.SessionManager.CurrentSession == null && MusicPlayer.CurrentID() == -1)
MusicPlayer.currentID = MusicPlayer.RetrieveQueueSlot();
@@ -1101,7 +1099,7 @@ namespace MusicApp
protected override void OnPause()
{
base.OnPause();
- paused = true;
+ Paused = true;
}
public override void OnBackPressed()
@@ -1114,12 +1112,6 @@ namespace MusicApp
base.OnBackPressed();
}
- protected override void OnSaveInstanceState(Bundle outState)
- {
- StateSaved = true;
- base.OnSaveInstanceState(outState);
- }
-
protected override void OnNewIntent(Intent intent)
{
base.OnNewIntent(intent);
diff --git a/MusicApp/Resources/Portable Class/PlaylistTracks.cs b/MusicApp/Resources/Portable Class/PlaylistTracks.cs
index 5351534..a4af7cc 100644
--- a/MusicApp/Resources/Portable Class/PlaylistTracks.cs
+++ b/MusicApp/Resources/Portable Class/PlaylistTracks.cs
@@ -245,7 +245,7 @@ namespace MusicApp.Resources.Portable_Class
{
Activity.FindViewById(Resource.Id.headerMore).Click -= PlaylistMore;
- if (!MainActivity.instance.StateSaved)
+ if (!MainActivity.instance.Paused)
{
int statusHeight = Resources.GetDimensionPixelSize(Resources.GetIdentifier("status_bar_height", "dimen", "android"));
MainActivity.instance.FindViewById(Resource.Id.toolbar).SetPadding(0, 0, 0, 0);
diff --git a/MusicApp/Resources/layout/Main.xml b/MusicApp/Resources/layout/Main.xml
index 94cf830..883bd90 100644
--- a/MusicApp/Resources/layout/Main.xml
+++ b/MusicApp/Resources/layout/Main.xml
@@ -19,7 +19,6 @@