zoriya/Opus
1
0
Fork 0
mirror of https://github.com/zoriya/Opus.git synced 2025-12-06 06:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Solving a bug with youtube navigation.

Browse Source
This commit is contained in:
Tristan Roux
2019-01-30 22:18:29 +01:00
parent b6e8b6891b
commit a513b4efec
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MusicApp/MainActivity.cs
View File

@@ -531,8 +531,7 @@ namespace MusicApp
{
contentRefresh.Refreshing = false;
bool specialSwitch = false;
if(YoutubeEngine.instances != null)
if (YoutubeEngine.instances != null)
{
YoutubeEngine.error = false;
@@ -542,23 +541,19 @@ namespace MusicApp
searchView.Iconified = true;
searchView.SetQuery("", false);
SupportActionBar.SetDisplayHomeAsUpEnabled(false);
FindViewById(Resource.Id.tabs).Visibility = ViewStates.Gone;
YoutubeEngine.instances = null;
specialSwitch = true;
}
if(PlaylistTracks.instance != null)
if (PlaylistTracks.instance != null)
{
PlaylistTracks.instance.navigating = true;
SupportFragmentManager.BeginTransaction().Remove(PlaylistTracks.instance).Commit();
specialSwitch = true;
}
Android.Support.V4.App.Fragment fragment = null;
switch (layout)
{
case Resource.Id.musicLayout:
if (Home.instance != null && !specialSwitch)
if (Home.instance != null)
{
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
Home.instance.Refresh();
@@ -571,8 +566,7 @@ namespace MusicApp
break;
case Resource.Id.browseLayout:
Console.WriteLine("&Navigating to browse with browse instance value " + Browse.instance + ", pager instance: " + Pager.instance + " and with youtubeSwitch set to " + specialSwitch);
if (Browse.instance != null && !specialSwitch)
if (Browse.instance != null)
{
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
Browse.instance.Refresh();
@@ -585,7 +579,7 @@ namespace MusicApp
break;
case Resource.Id.playlistLayout:
if (Playlist.instance != null && !specialSwitch)
if (Playlist.instance != null)
{
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
Playlist.instance.Refresh();

5
MusicApp/Resources/Portable Class/PagerFragment.cs
View File

@@ -21,8 +21,7 @@ namespace MusicApp.Resources.Portable_Class
public static Fragment NewInstance(int type, int pos)
{
if(instance == null)
instance = new Pager { Arguments = new Bundle() };
instance = new Pager { Arguments = new Bundle() };
instance.type = type;
instance.pos = pos;
return instance;
@@ -162,7 +161,7 @@ namespace MusicApp.Resources.Portable_Class
base.OnDestroyView();
Browse.instance = null;
FolderBrowse.instance = null;
adapter.Dispose();
adapter?.Dispose();
TabLayout tabs = Activity.FindViewById<TabLayout>(Resource.Id.tabs);
tabs.RemoveAllTabs();

2
MusicApp/Resources/Portable Class/PlaylistTracks.cs
View File

@@ -290,7 +290,7 @@ namespace MusicApp.Resources.Portable_Class
}
}
else if (!navigating && Queue.instance == null)
MainActivity.instance?.SupportFragmentManager.PopBackStack();
MainActivity.instance.SupportFragmentManager.PopBackStack();
instance = null;
}