From 217a59e5873b1a4850719c26b11b853270df70ce Mon Sep 17 00:00:00 2001 From: Chris King Date: Fri, 17 Feb 2017 12:04:50 -0800 Subject: [PATCH] update IEditorController callsites --- Xamarin.Forms.Core/Editor.cs | 3 +-- Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs | 6 ++++-- Xamarin.Forms.Platform.MacOS/Renderers/EditorRenderer.cs | 4 ++-- Xamarin.Forms.Platform.WP8/EditorRenderer.cs | 6 ++++-- Xamarin.Forms.Platform.WinRT/EditorRenderer.cs | 6 ++++-- Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs | 8 ++++---- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Xamarin.Forms.Core/Editor.cs b/Xamarin.Forms.Core/Editor.cs index 019f6e8..92a6b9d 100644 --- a/Xamarin.Forms.Core/Editor.cs +++ b/Xamarin.Forms.Core/Editor.cs @@ -68,8 +68,7 @@ namespace Xamarin.Forms return _platformConfigurationRegistry.Value.On(); } - void IEditorController.SendCompleted() => SendCompleted(); - internal void SendCompleted() + void IEditorController.SendCompleted() { EventHandler handler = Completed; if (handler != null) diff --git a/Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs index 77c7145..1f2c51b 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs @@ -17,6 +17,8 @@ namespace Xamarin.Forms.Platform.Android AutoPackage = false; } + IEditorController ElementController => Element; + void ITextWatcher.AfterTextChanged(IEditable s) { } @@ -54,7 +56,7 @@ namespace Xamarin.Forms.Platform.Android edit.AddTextChangedListener(this); edit.OnBackKeyboardPressed += (sender, args) => { - Element.SendCompleted(); + ElementController.SendCompleted(); edit.ClearFocus(); }; } @@ -98,7 +100,7 @@ namespace Xamarin.Forms.Platform.Android internal override void OnNativeFocusChanged(bool hasFocus) { if (Element.IsFocused && !hasFocus) // Editor has requested an unfocus, fire completed event - Element.SendCompleted(); + ElementController.SendCompleted(); } void UpdateFont() diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/EditorRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/EditorRenderer.cs index 75a6020..3fad390 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/EditorRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/EditorRenderer.cs @@ -10,7 +10,7 @@ namespace Xamarin.Forms.Platform.MacOS const string NewLineSelector = "insertNewline"; bool _disposed; - IElementController ElementController => Element; + IEditorController ElementController => Element; protected override void OnElementChanged(ElementChangedEventArgs e) { @@ -94,7 +94,7 @@ namespace Xamarin.Forms.Platform.MacOS void OnEditingEnded(object sender, EventArgs eventArgs) { Element.SetValue(VisualElement.IsFocusedPropertyKey, false); - Element.SendCompleted(); + ElementController.SendCompleted(); } void OnEditingBegan(object sender, EventArgs eventArgs) diff --git a/Xamarin.Forms.Platform.WP8/EditorRenderer.cs b/Xamarin.Forms.Platform.WP8/EditorRenderer.cs index 500bcfa..0acdec7 100644 --- a/Xamarin.Forms.Platform.WP8/EditorRenderer.cs +++ b/Xamarin.Forms.Platform.WP8/EditorRenderer.cs @@ -9,7 +9,9 @@ namespace Xamarin.Forms.Platform.WinPhone { bool _fontApplied; - protected override void OnElementChanged(ElementChangedEventArgs e) + IEditorController ElementController => Element; + + protected override void OnElementChanged(ElementChangedEventArgs e) { base.OnElementChanged(e); @@ -21,7 +23,7 @@ namespace Xamarin.Forms.Platform.WinPhone UpdateInputScope(); UpdateTextColor(); - Control.LostFocus += (sender, args) => Element.SendCompleted(); + Control.LostFocus += (sender, args) => ElementController.SendCompleted(); textBox.TextChanged += TextBoxOnTextChanged; } diff --git a/Xamarin.Forms.Platform.WinRT/EditorRenderer.cs b/Xamarin.Forms.Platform.WinRT/EditorRenderer.cs index 2fc0133..c69debd 100644 --- a/Xamarin.Forms.Platform.WinRT/EditorRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/EditorRenderer.cs @@ -16,7 +16,9 @@ namespace Xamarin.Forms.Platform.WinRT bool _fontApplied; Brush _backgroundColorFocusedDefaultBrush; - protected override void OnElementChanged(ElementChangedEventArgs e) + IEditorController ElementController => Element; + + protected override void OnElementChanged(ElementChangedEventArgs e) { if (e.NewElement != null) { @@ -83,7 +85,7 @@ namespace Xamarin.Forms.Platform.WinRT void OnLostFocus(object sender, RoutedEventArgs e) { - Element.SendCompleted(); + ElementController.SendCompleted(); } protected override void UpdateBackgroundColor() diff --git a/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs index b11c327..b87c0d3 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs @@ -8,9 +8,9 @@ namespace Xamarin.Forms.Platform.iOS public class EditorRenderer : ViewRenderer { bool _disposed; - IElementController ElementController => Element as IElementController; + IEditorController ElementController => Element; - protected override void Dispose(bool disposing) + protected override void Dispose(bool disposing) { if (_disposed) return; @@ -51,7 +51,7 @@ namespace Xamarin.Forms.Platform.iOS var doneButton = new UIBarButtonItem(UIBarButtonSystemItem.Done, (o, a) => { Control.ResignFirstResponder(); - Element.SendCompleted(); + ElementController.SendCompleted(); }); accessoryView.SetItems(new[] { spacer, doneButton }, false); Control.InputAccessoryView = accessoryView; @@ -100,7 +100,7 @@ namespace Xamarin.Forms.Platform.iOS ElementController.SetValueFromRenderer(Editor.TextProperty, Control.Text); Element.SetValue(VisualElement.IsFocusedPropertyKey, false); - Element.SendCompleted(); + ElementController.SendCompleted(); } void OnStarted(object sender, EventArgs eventArgs) -- 2.7.4