diff options
author | kingces95 <kingces95@users.noreply.github.com> | 2017-03-07 14:56:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-07 14:56:24 -0500 |
commit | e6d5186c8acbf37b877c7ca3c77a378352a3743d (patch) | |
tree | d61ca8ea619f7844e9e0a973dbd7bac794e39147 /Xamarin.Forms.Platform.MacOS | |
parent | 2b92142ab2a501de71d3572efc0e5deb2b7bae9a (diff) | |
download | xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.tar.gz xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.tar.bz2 xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.zip |
Remove InternalsVisibleTo from Core to XF.Platforms.* (#782)
* Remove InternalsVisibleTo from Core to XF.Platforms.*
* Changes per Jason's code review
* Move LockableObservableListWrapper to internals namespace
* Changes per Stephane's code review
* update docs
* Touch code to get CI to run tests
* Rebase; Update documentation
Diffstat (limited to 'Xamarin.Forms.Platform.MacOS')
13 files changed, 24 insertions, 22 deletions
diff --git a/Xamarin.Forms.Platform.MacOS/Cells/CellNSView.cs b/Xamarin.Forms.Platform.MacOS/Cells/CellNSView.cs index 08043ce8..f0a9d0f3 100644 --- a/Xamarin.Forms.Platform.MacOS/Cells/CellNSView.cs +++ b/Xamarin.Forms.Platform.MacOS/Cells/CellNSView.cs @@ -124,7 +124,7 @@ namespace Xamarin.Forms.Platform.MacOS NSView nativeCell; if (reusable == null || !isRecycle) { - var renderer = (CellRenderer)Registrar.Registered.GetHandler(cell.GetType()); + var renderer = (CellRenderer)Internals.Registrar.Registered.GetHandler<IRegisterable>(cell.GetType()); nativeCell = renderer.GetCell(cell, null, tableView); } else diff --git a/Xamarin.Forms.Platform.MacOS/Cells/ImageCellRenderer.cs b/Xamarin.Forms.Platform.MacOS/Cells/ImageCellRenderer.cs index 8bd76772..1986ebb4 100644 --- a/Xamarin.Forms.Platform.MacOS/Cells/ImageCellRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Cells/ImageCellRenderer.cs @@ -43,7 +43,7 @@ namespace Xamarin.Forms.Platform.MacOS IImageSourceHandler handler; - if (source != null && (handler = Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null) + if (source != null && (handler = Internals.Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null) { NSImage uiimage; try diff --git a/Xamarin.Forms.Platform.MacOS/Cells/ViewCellNSView.cs b/Xamarin.Forms.Platform.MacOS/Cells/ViewCellNSView.cs index 6b342c22..f2498749 100644 --- a/Xamarin.Forms.Platform.MacOS/Cells/ViewCellNSView.cs +++ b/Xamarin.Forms.Platform.MacOS/Cells/ViewCellNSView.cs @@ -92,7 +92,7 @@ namespace Xamarin.Forms.Platform.MacOS if (renderer.Element != null && renderer == Platform.GetRenderer(renderer.Element)) renderer.Element.ClearValue(Platform.RendererProperty); - var type = Registrar.Registered.GetHandlerType(_viewCell.View.GetType()); + var type = Internals.Registrar.Registered.GetHandlerType(_viewCell.View.GetType()); if (renderer.GetType() == type || (renderer is DefaultRenderer && type == null)) renderer.SetElement(_viewCell.View); else diff --git a/Xamarin.Forms.Platform.MacOS/FormsApplicationDelegate.cs b/Xamarin.Forms.Platform.MacOS/FormsApplicationDelegate.cs index 4899698e..8411fde0 100644 --- a/Xamarin.Forms.Platform.MacOS/FormsApplicationDelegate.cs +++ b/Xamarin.Forms.Platform.MacOS/FormsApplicationDelegate.cs @@ -24,7 +24,7 @@ namespace Xamarin.Forms.Platform.MacOS if (application == null) throw new ArgumentNullException(nameof(application)); - Application.Current = application; + Application.SetCurrentApplication(application); _application = application; application.PropertyChanged += ApplicationOnPropertyChanged; diff --git a/Xamarin.Forms.Platform.MacOS/Platform.cs b/Xamarin.Forms.Platform.MacOS/Platform.cs index 8629684b..74c1e0e9 100644 --- a/Xamarin.Forms.Platform.MacOS/Platform.cs +++ b/Xamarin.Forms.Platform.MacOS/Platform.cs @@ -2,6 +2,7 @@ using AppKit; using RectangleF = CoreGraphics.CGRect; using System.Linq; +using Xamarin.Forms.Internals; namespace Xamarin.Forms.Platform.MacOS { @@ -95,7 +96,7 @@ namespace Xamarin.Forms.Platform.MacOS public static IVisualElementRenderer CreateRenderer(VisualElement element) { var t = element.GetType(); - var renderer = Registrar.Registered.GetHandler<IVisualElementRenderer>(t) ?? new DefaultRenderer(); + var renderer = Internals.Registrar.Registered.GetHandler<IVisualElementRenderer>(t) ?? new DefaultRenderer(); renderer.SetElement(element); return renderer; } diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/ButtonRenderer.cs index 05b87fa2..b23b4228 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/ButtonRenderer.cs @@ -92,7 +92,7 @@ namespace Xamarin.Forms.Platform.MacOS { IImageSourceHandler handler; FileImageSource source = Element.Image; - if (source != null && (handler = Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null) + if (source != null && (handler = Internals.Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null) { NSImage uiimage; try diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ImageRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/ImageRenderer.cs index 090df9a6..f936f4ac 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/ImageRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/ImageRenderer.cs @@ -83,7 +83,7 @@ namespace Xamarin.Forms.Platform.MacOS ((IImageController)Element).SetIsLoading(true); - if (source != null && (handler = Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null) + if (source != null && (handler = Internals.Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null) { NSImage uiimage; try diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ListViewDataSource.cs b/Xamarin.Forms.Platform.MacOS/Renderers/ListViewDataSource.cs index 6742053c..0a0a9db8 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/ListViewDataSource.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/ListViewDataSource.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using AppKit; using Foundation; +using Xamarin.Forms.Internals; namespace Xamarin.Forms.Platform.MacOS { diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs index 8d2fd551..34005c3b 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs @@ -19,7 +19,7 @@ namespace Xamarin.Forms.Platform.MacOS { var platformEffect = effect as PlatformEffect; if (platformEffect != null) - platformEffect.Container = View; + platformEffect.SetContainer(View); } protected MasterDetailPage MasterDetailPage => _masterDetailPage ?? (_masterDetailPage = (MasterDetailPage)Element); diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs index 23d7f856..218d787f 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs @@ -28,7 +28,7 @@ namespace Xamarin.Forms.Platform.MacOS { var platformEffect = effect as PlatformEffect; if (platformEffect != null) - platformEffect.Container = View; + platformEffect.SetContainer(View); } public NavigationPageRenderer() : this(IntPtr.Zero) diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/PageRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/PageRenderer.cs index e0845d5a..863b2a7e 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/PageRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/PageRenderer.cs @@ -24,7 +24,7 @@ namespace Xamarin.Forms.Platform.MacOS { var platformEffect = effect as PlatformEffect; if (platformEffect != null) - platformEffect.Container = View; + platformEffect.SetContainer(View); } public VisualElement Element { get; private set; } diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs index 3aee095d..e1591bee 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs @@ -80,7 +80,7 @@ namespace Xamarin.Forms.Platform.MacOS { var platformEffect = effect as PlatformEffect; if (platformEffect != null) - platformEffect.Container = View; + platformEffect.SetContainer(View); } public void SetElementSize(Size size) diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs index 8d93c2c7..509c38fb 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs @@ -13,7 +13,7 @@ namespace Xamarin.Forms.Platform.MacOS WebNavigationEvent _lastBackForwardEvent; WebNavigationEvent _lastEvent; - IElementController ElementController => Element; + IWebViewController ElementController => Element; void IWebViewDelegate.LoadHtml(string html, string baseUrl) { @@ -43,9 +43,9 @@ namespace Xamarin.Forms.Platform.MacOS Control.OnFinishedLoading += OnNSWebViewFinishedLoad; Control.OnFailedLoading += OnNSWebViewFailedLoadWithError; - Element.EvalRequested += OnEvalRequested; - Element.GoBackRequested += OnGoBackRequested; - Element.GoForwardRequested += OnGoForwardRequested; + ElementController.EvalRequested += OnEvalRequested; + ElementController.GoBackRequested += OnGoBackRequested; + ElementController.GoForwardRequested += OnGoForwardRequested; Layer.BackgroundColor = NSColor.Clear.CGColor; } @@ -69,9 +69,9 @@ namespace Xamarin.Forms.Platform.MacOS _disposed = true; Control.OnFinishedLoading -= OnNSWebViewFinishedLoad; Control.OnFailedLoading -= OnNSWebViewFailedLoadWithError; - Element.EvalRequested -= OnEvalRequested; - Element.GoBackRequested -= OnGoBackRequested; - Element.GoForwardRequested -= OnGoForwardRequested; + ElementController.EvalRequested -= OnEvalRequested; + ElementController.GoBackRequested -= OnGoBackRequested; + ElementController.GoForwardRequested -= OnGoForwardRequested; } base.Dispose(disposing); } @@ -90,8 +90,8 @@ namespace Xamarin.Forms.Platform.MacOS { if (Element == null) return; - Element.CanGoBack = Control.CanGoBack(); - Element.CanGoForward = Control.CanGoForward(); + ElementController.CanGoBack = Control.CanGoBack(); + ElementController.CanGoForward = Control.CanGoForward(); } void OnEvalRequested(object sender, EvalRequested eventArg) @@ -124,7 +124,7 @@ namespace Xamarin.Forms.Platform.MacOS void OnNSWebViewFailedLoadWithError(object sender, WebKit.WebResourceErrorEventArgs e) { _lastEvent = _lastBackForwardEvent; - Element?.SendNavigated(new WebNavigatedEventArgs(_lastEvent, new UrlWebViewSource { Url = Control.MainFrameUrl }, + ElementController?.SendNavigated(new WebNavigatedEventArgs(_lastEvent, new UrlWebViewSource { Url = Control.MainFrameUrl }, Control.MainFrameUrl, WebNavigationResult.Failure)); UpdateCanGoBackForward(); @@ -140,7 +140,7 @@ namespace Xamarin.Forms.Platform.MacOS _ignoreSourceChanges = false; _lastEvent = _lastBackForwardEvent; - Element?.SendNavigated(new WebNavigatedEventArgs(_lastEvent, Element?.Source, Control.MainFrameUrl, + ElementController?.SendNavigated(new WebNavigatedEventArgs(_lastEvent, Element?.Source, Control.MainFrameUrl, WebNavigationResult.Success)); UpdateCanGoBackForward(); |