summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.UAP
diff options
context:
space:
mode:
authorkingces95 <kingces95@users.noreply.github.com>2017-04-11 14:02:06 -0400
committerRui Marinho <me@ruimarinho.net>2017-04-11 19:02:06 +0100
commit093a4efa2da9cb681890158ca8ee9bb6f30b0a8c (patch)
treeccc17255876e40d2c845d7b2c62dfc930156729d /Xamarin.Forms.Platform.UAP
parent7458ca37330f424bf7fb1447580b0fa9c34c6db4 (diff)
downloadxamarin-forms-093a4efa2da9cb681890158ca8ee9bb6f30b0a8c.tar.gz
xamarin-forms-093a4efa2da9cb681890158ca8ee9bb6f30b0a8c.tar.bz2
xamarin-forms-093a4efa2da9cb681890158ca8ee9bb6f30b0a8c.zip
Implicit impl of controller ifaces (#807)
* Simplify ICtrl callsites * Rebase fix
Diffstat (limited to 'Xamarin.Forms.Platform.UAP')
-rw-r--r--Xamarin.Forms.Platform.UAP/FormsPresenter.cs6
-rw-r--r--Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.UAP/NavigationPageRendererUWP.cs2
-rw-r--r--Xamarin.Forms.Platform.UAP/SearchBarRenderer.cs2
-rw-r--r--Xamarin.Forms.Platform.UAP/TabbedPageRenderer.cs12
5 files changed, 15 insertions, 21 deletions
diff --git a/Xamarin.Forms.Platform.UAP/FormsPresenter.cs b/Xamarin.Forms.Platform.UAP/FormsPresenter.cs
index 50400cbd..b7bad1f6 100644
--- a/Xamarin.Forms.Platform.UAP/FormsPresenter.cs
+++ b/Xamarin.Forms.Platform.UAP/FormsPresenter.cs
@@ -15,20 +15,20 @@ namespace Xamarin.Forms.Platform.UWP
if (ActualWidth > 0 && ActualHeight > 0)
{
var page = (Page)DataContext;
- ((IPageController)page.RealParent).ContainerArea = new Rectangle(0, 0, ActualWidth, ActualHeight);
+ ((Page)page.RealParent).ContainerArea = new Rectangle(0, 0, ActualWidth, ActualHeight);
}
};
}
void FormsPresenter_Loaded(object sender, RoutedEventArgs e)
{
- var page = (IPageController)DataContext;
+ var page = (Page)DataContext;
page.SendAppearing();
}
void FormsPresenter_Unloaded(object sender, RoutedEventArgs e)
{
- var page = (IPageController)DataContext;
+ var page = (Page)DataContext;
page.SendDisappearing();
}
}
diff --git a/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs b/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs
index d6518d2e..39435ae4 100644
--- a/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs
@@ -57,10 +57,6 @@ namespace Xamarin.Forms.Platform.UWP
{
set { Control.ToolbarForeground = value; }
}
-
- IPageController PageController => Element as IPageController;
-
- IMasterDetailPageController MasterDetailPageController => Element as IMasterDetailPageController;
bool ITitleProvider.ShowTitle
{
@@ -210,13 +206,13 @@ namespace Xamarin.Forms.Platform.UWP
if (Element == null)
return;
- PageController.SendAppearing();
+ Element.SendAppearing();
UpdateBounds();
}
void OnControlUnloaded(object sender, RoutedEventArgs routedEventArgs)
{
- PageController?.SendDisappearing();
+ Element?.SendDisappearing();
}
void OnDetailPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -247,8 +243,8 @@ namespace Xamarin.Forms.Platform.UWP
Windows.Foundation.Size masterSize = Control.MasterSize;
Windows.Foundation.Size detailSize = Control.DetailSize;
- MasterDetailPageController.MasterBounds = new Rectangle(0, 0, masterSize.Width, masterSize.Height);
- MasterDetailPageController.DetailBounds = new Rectangle(0, 0, detailSize.Width, detailSize.Height);
+ Element.MasterBounds = new Rectangle(0, 0, masterSize.Width, masterSize.Height);
+ Element.DetailBounds = new Rectangle(0, 0, detailSize.Width, detailSize.Height);
}
void UpdateDetail()
@@ -316,7 +312,7 @@ namespace Xamarin.Forms.Platform.UWP
UpdateDetailTitle();
Control.CollapseStyle = Element.OnThisPlatform().GetCollapseStyle();
Control.CollapsedPaneWidth = Element.OnThisPlatform().CollapsedPaneWidth();
- Control.ShouldShowSplitMode = MasterDetailPageController.ShouldShowSplitMode;
+ Control.ShouldShowSplitMode = Element.ShouldShowSplitMode;
}
void UpdateToolbarPlacement()
diff --git a/Xamarin.Forms.Platform.UAP/NavigationPageRendererUWP.cs b/Xamarin.Forms.Platform.UAP/NavigationPageRendererUWP.cs
index a56ce903..978695cf 100644
--- a/Xamarin.Forms.Platform.UAP/NavigationPageRendererUWP.cs
+++ b/Xamarin.Forms.Platform.UAP/NavigationPageRendererUWP.cs
@@ -48,7 +48,7 @@ namespace Xamarin.Forms.Platform.UWP
void UpdateBackButton()
{
- bool showBackButton = PageController.InternalChildren.Count > 1 && NavigationPage.GetHasBackButton(_currentPage);
+ bool showBackButton = Element.InternalChildren.Count > 1 && NavigationPage.GetHasBackButton(_currentPage);
_container.ShowBackButton = showBackButton;
if (_navManager != null)
diff --git a/Xamarin.Forms.Platform.UAP/SearchBarRenderer.cs b/Xamarin.Forms.Platform.UAP/SearchBarRenderer.cs
index 7508726c..6a3ee730 100644
--- a/Xamarin.Forms.Platform.UAP/SearchBarRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/SearchBarRenderer.cs
@@ -76,7 +76,7 @@ namespace Xamarin.Forms.Platform.UWP
void OnQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs e)
{
- ((ISearchBarController)Element).OnSearchButtonPressed();
+ Element.OnSearchButtonPressed();
}
void OnTextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs e)
diff --git a/Xamarin.Forms.Platform.UAP/TabbedPageRenderer.cs b/Xamarin.Forms.Platform.UAP/TabbedPageRenderer.cs
index c278e394..cc6f172e 100644
--- a/Xamarin.Forms.Platform.UAP/TabbedPageRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/TabbedPageRenderer.cs
@@ -59,8 +59,6 @@ namespace Xamarin.Forms.Platform.UWP
set { Control.ToolbarForeground = value; }
}
- IPageController PageController => Element as IPageController;
-
bool ITitleProvider.ShowTitle
{
get { return _showTitle; }
@@ -186,7 +184,7 @@ namespace Xamarin.Forms.Platform.UWP
return;
_disposed = true;
- PageController?.SendDisappearing();
+ Element?.SendDisappearing();
SetElement(null);
Tracker = null;
}
@@ -216,7 +214,7 @@ namespace Xamarin.Forms.Platform.UWP
void OnLoaded(object sender, RoutedEventArgs args)
{
- PageController?.SendAppearing();
+ Element?.SendAppearing();
UpdateBarTextColor();
UpdateBarBackgroundColor();
}
@@ -238,14 +236,14 @@ namespace Xamarin.Forms.Platform.UWP
Page currentPage = Element.CurrentPage;
if (currentPage == page)
return;
- ((IPageController)currentPage)?.SendDisappearing();
+ currentPage?.SendDisappearing();
Element.CurrentPage = page;
- ((IPageController)page)?.SendAppearing();
+ page?.SendAppearing();
}
void OnUnloaded(object sender, RoutedEventArgs args)
{
- PageController?.SendDisappearing();
+ Element?.SendDisappearing();
}
Brush GetBarBackgroundBrush()