Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
Update Platform.cs (#15601)
Browse files Browse the repository at this point in the history
  • Loading branch information
jfversluis authored Nov 15, 2022
1 parent 40f4b47 commit bf55cba
Showing 1 changed file with 28 additions and 0 deletions.
28 changes: 28 additions & 0 deletions Xamarin.Forms.Platform.Android/Platform.cs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ TabbedPage CurrentTabbedPage
_currentTabbedPage.PropertyChanged -= CurrentTabbedPageOnPropertyChanged;

if (value == null)
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar.RemoveAllTabs();
#pragma warning restore CS0618 // Type or member is obsolete
}

_currentTabbedPage = value;
Expand Down Expand Up @@ -646,15 +648,21 @@ ActionBar.Tab AddTab(Page page, int index)

TabbedPage currentTabs = CurrentTabbedPage;

#pragma warning disable CS0618 // Type or member is obsolete
var atab = actionBar.NewTab();
#pragma warning restore CS0618 // Type or member is obsolete

#pragma warning disable CS0618 // Type or member is obsolete
atab.SetText(new Java.Lang.String(page.Title));
#pragma warning restore CS0618 // Type or member is obsolete
atab.TabSelected += (sender, e) =>
{
if (!_ignoreAndroidSelection)
currentTabs.CurrentPage = page;
};
#pragma warning disable CS0618 // Type or member is obsolete
actionBar.AddTab(atab, index);
#pragma warning restore CS0618 // Type or member is obsolete

page.PropertyChanged += PagePropertyChanged;
return atab;
Expand Down Expand Up @@ -737,7 +745,11 @@ void CurrentTabbedPageChildrenChanged(object sender, NotifyCollectionChangedEven
Page page = CurrentTabbedPage.CurrentPage;
int index = TabbedPage.GetIndex(page);
if (index >= 0 && index < CurrentTabbedPage.Children.Count)
#pragma warning disable CS0618 // Type or member is obsolete
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar.GetTabAt(index).Select();
#pragma warning restore CS0618 // Type or member is obsolete
#pragma warning restore CS0618 // Type or member is obsolete
}

_ignoreAndroidSelection = false;
Expand Down Expand Up @@ -766,7 +778,9 @@ void SelectTab()
Page page = _currentTabbedPage.CurrentPage;
if (page == null)
{
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar.SelectTab(null);
#pragma warning restore CS0618 // Type or member is obsolete
return;
}

Expand All @@ -776,7 +790,11 @@ void SelectTab()
return;
}

#pragma warning disable CS0618 // Type or member is obsolete
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar.SelectTab(ActionBar.GetTabAt(index));
#pragma warning restore CS0618 // Type or member is obsolete
#pragma warning restore CS0618 // Type or member is obsolete
}

Drawable GetActionBarBackgroundDrawable()
Expand Down Expand Up @@ -874,8 +892,12 @@ void PagePropertyChanged(object sender, PropertyChangedEventArgs args)
return;

var page = sender as Page;
#pragma warning disable CS0618 // Type or member is obsolete
var atab = actionBar.GetTabAt(currentTabs.Children.IndexOf(page));
#pragma warning restore CS0618 // Type or member is obsolete
#pragma warning disable CS0618 // Type or member is obsolete
atab.SetText(new Java.Lang.String(page.Title));
#pragma warning restore CS0618 // Type or member is obsolete
}
}

Expand Down Expand Up @@ -940,12 +962,16 @@ void ReloadToolbarItems()
void RemoveTab(Page page, int index)
{
page.PropertyChanged -= PagePropertyChanged;
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar?.RemoveTabAt(index);
#pragma warning restore CS0618 // Type or member is obsolete
}

void Reset()
{
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar.RemoveAllTabs();
#pragma warning restore CS0618 // Type or member is obsolete

if (CurrentTabbedPage == null)
return;
Expand All @@ -955,7 +981,9 @@ void Reset()
{
var realTab = AddTab(tab, i++);
if (tab == CurrentTabbedPage.CurrentPage)
#pragma warning disable CS0618 // Type or member is obsolete
realTab.Select();
#pragma warning restore CS0618 // Type or member is obsolete
}
}

Expand Down

0 comments on commit bf55cba

Please sign in to comment.