diff options
Diffstat (limited to 'Xamarin.Forms.Platform.iOS/Renderers')
10 files changed, 30 insertions, 18 deletions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs index 5eb9b777..dbdcb241 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs @@ -137,7 +137,7 @@ namespace Xamarin.Forms.Platform.iOS { 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) { UIImage uiimage; try diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs index ba8acbe5..2ddd11c8 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using Xamarin.Forms; +using Xamarin.Forms.Internals; #if __MOBILE__ using UIKit; namespace Xamarin.Forms.Platform.iOS diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs index 825a20bd..446cc95e 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs @@ -1,6 +1,8 @@ using Foundation; +using Xamarin.Forms.Internals; #if __MOBILE__ using UIKit; + namespace Xamarin.Forms.Platform.iOS #else using AppKit; diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs index 6f6392b1..760a714b 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs @@ -108,7 +108,7 @@ namespace Xamarin.Forms.Platform.iOS ((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) { UIImage uiimage; try diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs index be95731b..b4333c63 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs @@ -403,7 +403,7 @@ namespace Xamarin.Forms.Platform.iOS if (_footerRenderer != null) { _footerRenderer.Element.MeasureInvalidated -= OnFooterMeasureInvalidated; - if (footer != null && _footerRenderer.GetType() == Registrar.Registered.GetHandlerType(footer.GetType())) + if (footer != null && _footerRenderer.GetType() == Internals.Registrar.Registered.GetHandlerType(footer.GetType())) { _footerRenderer.SetElement(footerView); return; @@ -449,7 +449,7 @@ namespace Xamarin.Forms.Platform.iOS if (_headerRenderer != null) { _headerRenderer.Element.MeasureInvalidated -= OnHeaderMeasureInvalidated; - if (header != null && _headerRenderer.GetType() == Registrar.Registered.GetHandlerType(header.GetType())) + if (header != null && _headerRenderer.GetType() == Internals.Registrar.Registered.GetHandlerType(header.GetType())) { _headerRenderer.SetElement(headerView); return; @@ -839,7 +839,7 @@ namespace Xamarin.Forms.Platform.iOS if (cell.HasContextActions) throw new NotSupportedException("Header cells do not support context actions"); - var renderer = (CellRenderer)Registrar.Registered.GetHandler(cell.GetType()); + var renderer = (CellRenderer)Internals.Registrar.Registered.GetHandler<IRegisterable>(cell.GetType()); var view = new HeaderWrapperView(); view.AddSubview(renderer.GetCell(cell, null, tableView)); diff --git a/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs index 2ea8a008..11a8558f 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs @@ -4,6 +4,7 @@ using Foundation; using UIKit; using RectangleF = CoreGraphics.CGRect; using SizeF = CoreGraphics.CGSize; +using Xamarin.Forms.Internals; namespace Xamarin.Forms.Platform.iOS { @@ -109,6 +110,8 @@ namespace Xamarin.Forms.Platform.iOS _menu = menu; } + INavigationMenuController MenuController => _menu; + public override UICollectionViewCell GetCell(UICollectionView collectionView, NSIndexPath indexPath) { var cell = (NavigationCell)collectionView.DequeueReusableCell(new NSString("NavigationCell"), indexPath); @@ -118,7 +121,7 @@ namespace Xamarin.Forms.Platform.iOS { cell.Name = target.Title; cell.Icon = target.Icon; - cell.Selected = () => _menu.SendTargetSelected(target); + cell.Selected = () => MenuController.SendTargetSelected(target); } else { diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs index 1c7730e8..2b702fde 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using Xamarin.Forms.Internals; using UIKit; using PageUIStatusBarAnimation = Xamarin.Forms.PlatformConfiguration.iOSSpecific.UIStatusBarAnimation; using Xamarin.Forms.PlatformConfiguration.iOSSpecific; diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs index c9c24ad6..244edfaf 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using Xamarin.Forms.Internals; using UIKit; using PointF = CoreGraphics.CGPoint; using RectangleF = CoreGraphics.CGRect; diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs index b8a6fc95..060b9d20 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs @@ -58,7 +58,7 @@ namespace Xamarin.Forms.Platform.iOS { var reusable = tableView.DequeueReusableCell(result.GetType().FullName); - var cellRenderer = Registrar.Registered.GetHandler<CellRenderer>(result.GetType()); + var cellRenderer = Internals.Registrar.Registered.GetHandler<CellRenderer>(result.GetType()); return cellRenderer.GetCell(result, reusable, Table); } return null; diff --git a/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs index 390e16d2..c54c0c96 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs @@ -20,6 +20,8 @@ namespace Xamarin.Forms.Platform.iOS { } + IWebViewController ElementController => Element as IWebViewController; + public VisualElement Element { get; private set; } public event EventHandler<VisualElementChangedEventArgs> ElementChanged; @@ -34,9 +36,9 @@ namespace Xamarin.Forms.Platform.iOS var oldElement = Element; Element = element; Element.PropertyChanged += HandlePropertyChanged; - ((WebView)Element).EvalRequested += OnEvalRequested; - ((WebView)Element).GoBackRequested += OnGoBackRequested; - ((WebView)Element).GoForwardRequested += OnGoForwardRequested; + ElementController.EvalRequested += OnEvalRequested; + ElementController.GoBackRequested += OnGoBackRequested; + ElementController.GoForwardRequested += OnGoForwardRequested; Delegate = new CustomWebViewDelegate(this); BackgroundColor = UIColor.Clear; @@ -96,9 +98,9 @@ namespace Xamarin.Forms.Platform.iOS StopLoading(); Element.PropertyChanged -= HandlePropertyChanged; - ((WebView)Element).EvalRequested -= OnEvalRequested; - ((WebView)Element).GoBackRequested -= OnGoBackRequested; - ((WebView)Element).GoForwardRequested -= OnGoForwardRequested; + ElementController.EvalRequested -= OnEvalRequested; + ElementController.GoBackRequested -= OnGoBackRequested; + ElementController.GoForwardRequested -= OnGoForwardRequested; _tracker?.Dispose(); _packager?.Dispose(); @@ -160,8 +162,8 @@ namespace Xamarin.Forms.Platform.iOS void UpdateCanGoBackForward() { - ((WebView)Element).CanGoBack = CanGoBack; - ((WebView)Element).CanGoForward = CanGoForward; + ElementController.CanGoBack = CanGoBack; + ElementController.CanGoForward = CanGoForward; } class CustomWebViewDelegate : UIWebViewDelegate @@ -176,6 +178,8 @@ namespace Xamarin.Forms.Platform.iOS _renderer = renderer; } + IWebViewController WebViewController => WebView; + WebView WebView { get { return (WebView)_renderer.Element; } @@ -184,7 +188,7 @@ namespace Xamarin.Forms.Platform.iOS public override void LoadFailed(UIWebView webView, NSError error) { var url = GetCurrentUrl(); - WebView.SendNavigated(new WebNavigatedEventArgs(_lastEvent, new UrlWebViewSource { Url = url }, url, WebNavigationResult.Failure)); + WebViewController.SendNavigated(new WebNavigatedEventArgs(_lastEvent, new UrlWebViewSource { Url = url }, url, WebNavigationResult.Failure)); _renderer.UpdateCanGoBackForward(); } @@ -200,7 +204,7 @@ namespace Xamarin.Forms.Platform.iOS _renderer._ignoreSourceChanges = false; var args = new WebNavigatedEventArgs(_lastEvent, WebView.Source, url, WebNavigationResult.Success); - WebView.SendNavigated(args); + WebViewController.SendNavigated(args); _renderer.UpdateCanGoBackForward(); } @@ -238,7 +242,7 @@ namespace Xamarin.Forms.Platform.iOS var lastUrl = request.Url.ToString(); var args = new WebNavigatingEventArgs(navEvent, new UrlWebViewSource { Url = lastUrl }, lastUrl); - WebView.SendNavigating(args); + WebViewController.SendNavigating(args); _renderer.UpdateCanGoBackForward(); return !args.Cancel; } |