From 5c4716800c109871404b0da4e8e0b90b4c353a7d Mon Sep 17 00:00:00 2001 From: Pawel Andruszkiewicz Date: Mon, 12 Jun 2017 09:05:52 +0200 Subject: Make sure single Xamarin property influences only one EFL property Change-Id: Ib5b2fcab1f7c880cef3b199badc2710f8d05384b Signed-off-by: Pawel Andruszkiewicz --- .../Renderers/BoxViewRenderer.cs | 4 ---- .../Renderers/ButtonRenderer.cs | 18 +++++++++++++++--- .../Renderers/CarouselPageRenderer.cs | 7 ------- .../Renderers/ImageRenderer.cs | 6 +----- .../Renderers/LabelRenderer.cs | 17 +++++++++++++---- .../Renderers/LayoutRenderer.cs | 7 ------- .../Renderers/NavigationPageRenderer.cs | 6 +----- .../Renderers/PickerRenderer.cs | 4 ---- .../Renderers/ProgressBarRenderer.cs | 4 ---- .../Renderers/SliderRenderer.cs | 11 +++++++---- .../Renderers/StepperRenderer.cs | 11 +++++++---- 11 files changed, 44 insertions(+), 51 deletions(-) diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs index 6d3ed38e..f34bd322 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs @@ -6,10 +6,6 @@ namespace Xamarin.Forms.Platform.Tizen { public class BoxViewRenderer : ViewRenderer { - public BoxViewRenderer() - { - } - protected override void OnElementChanged(ElementChangedEventArgs e) { if (Control == null) diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs index f48ef742..c44c6294 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs @@ -8,9 +8,9 @@ namespace Xamarin.Forms.Platform.Tizen public ButtonRenderer() { RegisterPropertyHandler(Button.TextProperty, UpdateText); - RegisterPropertyHandler(Button.FontFamilyProperty, UpdateText); - RegisterPropertyHandler(Button.FontSizeProperty, UpdateText); - RegisterPropertyHandler(Button.FontAttributesProperty, UpdateText); + RegisterPropertyHandler(Button.FontFamilyProperty, UpdateFontFamily); + RegisterPropertyHandler(Button.FontSizeProperty, UpdateFontSize); + RegisterPropertyHandler(Button.FontAttributesProperty, UpdateFontAttributes); RegisterPropertyHandler(Button.TextColorProperty, UpdateTextColor); RegisterPropertyHandler(Button.ImageProperty, UpdateBitmap); RegisterPropertyHandler(Button.BorderColorProperty, UpdateBorder); @@ -58,8 +58,20 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateText() { Control.Text = Element.Text ?? ""; + } + + void UpdateFontSize() + { Control.FontSize = Element.FontSize; + } + + void UpdateFontAttributes() + { Control.FontAttributes = Element.FontAttributes; + } + + void UpdateFontFamily() + { Control.FontFamily = Element.FontFamily; } diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/CarouselPageRenderer.cs index 812b8abb..c89fae0c 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/CarouselPageRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/CarouselPageRenderer.cs @@ -42,13 +42,6 @@ namespace Xamarin.Forms.Platform.Tizen protected GestureLayer _gestureLayer; protected EvasObject _page; - /// - /// The default constructor. - /// - public CarouselPageRenderer() - { - } - /// /// Invoked whenever the CarouselPage element has been changed in Xamarin. /// diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs index 63fb327a..08f7902c 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs @@ -8,10 +8,6 @@ namespace Xamarin.Forms.Platform.Tizen { public class ImageRenderer : ViewRenderer { - public ImageRenderer() - { - } - protected override void OnElementChanged(ElementChangedEventArgs e) { if (Control == null) @@ -149,4 +145,4 @@ namespace Xamarin.Forms.Platform.Tizen return Task.FromResult(false); } } -} \ No newline at end of file +} diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs index 876e7f8c..b3701d39 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs @@ -9,13 +9,13 @@ namespace Xamarin.Forms.Platform.Tizen public LabelRenderer() { - RegisterPropertyHandler(Label.TextProperty, () => Control.Text = Element.Text); + RegisterPropertyHandler(Label.TextProperty, UpdateText); RegisterPropertyHandler(Label.TextColorProperty, UpdateTextColor); // FontProperty change is called also for FontSizeProperty, FontFamilyProperty and FontAttributesProperty change RegisterPropertyHandler(Label.FontProperty, UpdateFontProperties); RegisterPropertyHandler(Label.LineBreakModeProperty, UpdateLineBreakMode); - RegisterPropertyHandler(Label.HorizontalTextAlignmentProperty, UpdateTextAlignment); - RegisterPropertyHandler(Label.VerticalTextAlignmentProperty, UpdateTextAlignment); + RegisterPropertyHandler(Label.HorizontalTextAlignmentProperty, UpdateHorizontalTextAlignment); + RegisterPropertyHandler(Label.VerticalTextAlignmentProperty, UpdateVerticalTextAlignment); RegisterPropertyHandler(Label.FormattedTextProperty, UpdateFormattedText); if (TizenPlatformServices.AppDomain.IsTizenSpecificAvailable) { @@ -77,14 +77,23 @@ namespace Xamarin.Forms.Platform.Tizen Control.FormattedText = ConvertFormattedText(Element.FormattedText); } + void UpdateText() + { + Control.Text = Element.Text; + } + void UpdateTextColor() { Control.TextColor = Element.TextColor.ToNative(); } - void UpdateTextAlignment() + void UpdateHorizontalTextAlignment() { Control.HorizontalTextAlignment = Element.HorizontalTextAlignment.ToNative(); + } + + void UpdateVerticalTextAlignment() + { Control.VerticalTextAlignment = Element.VerticalTextAlignment.ToNative(); } diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/LayoutRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/LayoutRenderer.cs index 2f723f3e..c2df8061 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/LayoutRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/LayoutRenderer.cs @@ -9,13 +9,6 @@ namespace Xamarin.Forms.Platform.Tizen { bool _isLayoutUpdatedRegistered = false; - /// - /// Default constructor. - /// - public LayoutRenderer() - { - } - public void RegisterOnLayoutUpdated() { if (!_isLayoutUpdatedRegistered) diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs index edcba08f..49f45572 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs @@ -41,10 +41,6 @@ namespace Xamarin.Forms.Platform.Tizen NaviItem CurrentNaviItem => _naviFrame.NavigationStack.Count > 0 ? _naviFrame.NavigationStack.Last() : null; NaviItem PreviousNaviItem => _naviFrame.NavigationStack.Count > 1 ? _naviFrame.NavigationStack[_naviFrame.NavigationStack.Count - 2] : null; - public NavigationPageRenderer() - { - } - protected override void Dispose(bool disposing) { _naviFrame.AnimationFinished -= AnimationFinishedHandler; @@ -475,4 +471,4 @@ namespace Xamarin.Forms.Platform.Tizen } } } -} \ No newline at end of file +} diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs index 663e56b1..a8356baf 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs @@ -12,10 +12,6 @@ namespace Xamarin.Forms.Platform.Tizen internal Native.Dialog _dialog; Dictionary _itemToItemNumber = new Dictionary(); - public PickerRenderer() - { - } - protected override void OnElementChanged(ElementChangedEventArgs e) { if (Control == null) diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ProgressBarRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/ProgressBarRenderer.cs index 5c7a4231..8fe97a72 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/ProgressBarRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/ProgressBarRenderer.cs @@ -8,10 +8,6 @@ namespace Xamarin.Forms.Platform.Tizen { public class ProgressBarRenderer : ViewRenderer { - public ProgressBarRenderer() - { - } - protected override void OnElementChanged(ElementChangedEventArgs e) { if (base.Control == null) diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/SliderRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/SliderRenderer.cs index 93cc6e84..b275464c 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/SliderRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/SliderRenderer.cs @@ -10,8 +10,8 @@ namespace Xamarin.Forms.Platform.Tizen public SliderRenderer() { RegisterPropertyHandler(Slider.ValueProperty, UpdateValue); - RegisterPropertyHandler(Slider.MinimumProperty, UpdateMinMax); - RegisterPropertyHandler(Slider.MaximumProperty, UpdateMinMax); + RegisterPropertyHandler(Slider.MinimumProperty, UpdateMinimum); + RegisterPropertyHandler(Slider.MaximumProperty, UpdateMaximum); } protected override void OnElementChanged(ElementChangedEventArgs e) @@ -53,11 +53,14 @@ namespace Xamarin.Forms.Platform.Tizen Control.Value = Element.Value; } - protected void UpdateMinMax() + protected void UpdateMinimum() { Control.Minimum = Element.Minimum; + } + + protected void UpdateMaximum() + { Control.Maximum = Element.Maximum; - UpdateValue(); } } } diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/StepperRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/StepperRenderer.cs index 09d1bf6b..e5e4c58d 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/StepperRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/StepperRenderer.cs @@ -9,8 +9,8 @@ namespace Xamarin.Forms.Platform.Tizen public StepperRenderer() { RegisterPropertyHandler(Stepper.ValueProperty, UpdateValue); - RegisterPropertyHandler(Stepper.MinimumProperty, UpdateMinMax); - RegisterPropertyHandler(Stepper.MaximumProperty, UpdateMinMax); + RegisterPropertyHandler(Stepper.MinimumProperty, UpdateMinimum); + RegisterPropertyHandler(Stepper.MaximumProperty, UpdateMaximum); RegisterPropertyHandler(Stepper.IncrementProperty, UpdateStep); } @@ -70,11 +70,14 @@ namespace Xamarin.Forms.Platform.Tizen Control.Value = Element.Value; } - protected void UpdateMinMax() + protected void UpdateMinimum() { Control.Minimum = Element.Minimum; + } + + protected void UpdateMaximum() + { Control.Maximum = Element.Maximum; - UpdateValue(); } void UpdateStep() -- cgit v1.2.3