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 navigation bug.

Browse Source
This commit is contained in:
Anonymus Raccoon
2019-07-04 16:35:18 +02:00
parent 382fd38cd2
commit 0f12b766fe
3 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Opus/Code/MainActivity.cs
View File

@@ -438,7 +438,6 @@ namespace Opus
public void Navigate(int layout) public void Navigate(int layout)
{ {
contentRefresh.Refreshing = false; contentRefresh.Refreshing = false;
if (YoutubeSearch.instances != null) if (YoutubeSearch.instances != null)
{ {
var searchView = menu.FindItem(Resource.Id.search).ActionView.JavaCast<SearchView>(); var searchView = menu.FindItem(Resource.Id.search).ActionView.JavaCast<SearchView>();
@@ -451,6 +450,8 @@ namespace Opus
SupportFragmentManager.PopBackStack(null, Android.Support.V4.App.FragmentManager.PopBackStackInclusive); SupportFragmentManager.PopBackStack(null, Android.Support.V4.App.FragmentManager.PopBackStackInclusive);
} }
FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
if (PlaylistTracks.instance != null) if (PlaylistTracks.instance != null)
{ {
SupportFragmentManager.BeginTransaction().Remove(PlaylistTracks.instance).Commit(); SupportFragmentManager.BeginTransaction().Remove(PlaylistTracks.instance).Commit();

23
Opus/Code/UI/Fragments/ChannelDetails.cs
View File

@@ -85,30 +85,13 @@ namespace Opus.Fragments
MainActivity.instance.SupportActionBar.SetHomeButtonEnabled(false); MainActivity.instance.SupportActionBar.SetHomeButtonEnabled(false);
MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(false); MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(false);
MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(false); MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(false);
MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible; if (MainActivity.instance.FindViewById(Resource.Id.toolbarLogo) != null)
MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
MainActivity.instance.contentRefresh.Refresh -= OnRefresh; MainActivity.instance.contentRefresh.Refresh -= OnRefresh;
Activity.FindViewById<AppBarLayout>(Resource.Id.appbar).RemoveOnOffsetChangedListener(this); Activity.FindViewById<AppBarLayout>(Resource.Id.appbar).RemoveOnOffsetChangedListener(this);
if (YoutubeSearch.instances != null)
{
MainActivity.instance.FindViewById<TabLayout>(Resource.Id.tabs).Visibility = ViewStates.Visible;
SearchView searchView = (SearchView)MainActivity.instance.menu.FindItem(Resource.Id.search).ActionView;
searchView.Focusable = false;
MainActivity.instance.menu.FindItem(Resource.Id.search).ExpandActionView();
searchView.SetQuery(YoutubeSearch.instances[0].Query, false);
searchView.ClearFocus();
int selectedTab = 0;
for (int i = 0; i < YoutubeSearch.instances.Length; i++)
{
if (YoutubeSearch.instances[i].IsFocused)
selectedTab = i;
}
}
instance = null;
} }
instance = null;
base.OnDestroyView(); base.OnDestroyView();
} }

5
Opus/Code/UI/Fragments/FolderTracks.cs
View File

@@ -43,7 +43,6 @@ namespace Opus.Fragments
public override void OnDestroy() public override void OnDestroy()
{ {
MainActivity.instance.RemoveFilterListener(Search);
MainActivity.instance.contentRefresh.Refresh -= OnRefresh; MainActivity.instance.contentRefresh.Refresh -= OnRefresh;
instance = null; instance = null;
base.OnDestroy(); base.OnDestroy();
@@ -153,7 +152,9 @@ namespace Opus.Fragments
MainActivity.instance.SupportActionBar.SetHomeButtonEnabled(false); MainActivity.instance.SupportActionBar.SetHomeButtonEnabled(false);
MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(false); MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(false);
MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(false); MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(false);
MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible; if (MainActivity.instance.FindViewById(Resource.Id.toolbarLogo) != null)
MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
MainActivity.instance.RemoveFilterListener(Search);
MainActivity.instance.HideFilter(); MainActivity.instance.HideFilter();
base.OnDestroyView(); base.OnDestroyView();
} }