diff options
author | E.Z. Hart <hartez@users.noreply.github.com> | 2017-08-10 14:08:18 -0400 |
---|---|---|
committer | Rui Marinho <me@ruimarinho.net> | 2017-08-10 19:08:18 +0100 |
commit | 0ff50e2418c1620a86c01004f35dd2855bfe4c0f (patch) | |
tree | d7bb35796300b51daea67ad3a37080104aa38dae /Xamarin.Forms.Platform.Android/FastRenderers | |
parent | 1aab6ff4893935fb3bb91187d2d3fa796576198a (diff) | |
download | xamarin-forms-0ff50e2418c1620a86c01004f35dd2855bfe4c0f.tar.gz xamarin-forms-0ff50e2418c1620a86c01004f35dd2855bfe4c0f.tar.bz2 xamarin-forms-0ff50e2418c1620a86c01004f35dd2855bfe4c0f.zip |
Add support for backcompat hint flags (#1074)
* Add support for backcompat hint flags
* Making fast renderers internal and sealed while experimental
Diffstat (limited to 'Xamarin.Forms.Platform.Android/FastRenderers')
5 files changed, 22 insertions, 22 deletions
diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs index 92800982..61fb62c2 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs @@ -13,7 +13,7 @@ using static System.String; namespace Xamarin.Forms.Platform.Android.FastRenderers { - public class ButtonRenderer : AppCompatButton, IVisualElementRenderer, AView.IOnAttachStateChangeListener, + internal sealed class ButtonRenderer : AppCompatButton, IVisualElementRenderer, AView.IOnAttachStateChangeListener, AView.IOnFocusChangeListener, IEffectControlProvider, AView.IOnClickListener, AView.IOnTouchListener { float _defaultFontSize; @@ -206,12 +206,12 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers return base.OnTouchEvent(e); } - protected virtual Size MinimumSize() + Size MinimumSize() { return new Size(); } - protected virtual void OnElementChanged(ElementChangedEventArgs<Button> e) + void OnElementChanged(ElementChangedEventArgs<Button> e) { if (e.OldElement != null) { @@ -234,7 +234,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers ElementChanged?.Invoke(this, new VisualElementChangedEventArgs(e.OldElement, e.NewElement)); } - protected virtual void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e) + void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e) { if (e.PropertyName == Button.TextProperty.PropertyName) { @@ -287,21 +287,21 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers base.OnLayout(changed, l, t, r, b); } - protected void SetTracker(VisualElementTracker tracker) + void SetTracker(VisualElementTracker tracker) { _tracker = tracker; } - protected void UpdateBackgroundColor() + void UpdateBackgroundColor() { _backgroundTracker.UpdateBackgroundColor(); } - internal virtual void OnNativeFocusChanged(bool hasFocus) + internal void OnNativeFocusChanged(bool hasFocus) { } - internal virtual void SendVisualElementInitialized(VisualElement element, AView nativeView) + internal void SendVisualElementInitialized(VisualElement element, AView nativeView) { element.SendViewInitialized(nativeView); } diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/GestureManager.cs b/Xamarin.Forms.Platform.Android/FastRenderers/GestureManager.cs index 5830899f..ec101383 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/GestureManager.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/GestureManager.cs @@ -8,7 +8,7 @@ using Object = Java.Lang.Object; namespace Xamarin.Forms.Platform.Android.FastRenderers { - public class GestureManager : Object, global::Android.Views.View.IOnClickListener, global::Android.Views.View.IOnTouchListener + internal class GestureManager : Object, global::Android.Views.View.IOnClickListener, global::Android.Views.View.IOnTouchListener { IVisualElementRenderer _renderer; readonly Lazy<GestureDetector> _gestureDetector; diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs index a230cf58..24623b27 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs @@ -8,7 +8,7 @@ using Xamarin.Forms.Internals; namespace Xamarin.Forms.Platform.Android.FastRenderers { - public class ImageRenderer : AImageView, IVisualElementRenderer, IImageRendererController + internal sealed class ImageRenderer : AImageView, IVisualElementRenderer, IImageRendererController { bool _disposed; Image _element; @@ -61,7 +61,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers base.Invalidate(); } - protected virtual async void OnElementChanged(ElementChangedEventArgs<Image> e) + async void OnElementChanged(ElementChangedEventArgs<Image> e) { await TryUpdateBitmap(e.OldElement); UpdateAspect(); @@ -78,7 +78,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers return handled ? result : base.OnTouchEvent(e); } - protected virtual Size MinimumSize() + Size MinimumSize() { return new Size(); } @@ -148,7 +148,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers void IImageRendererController.SkipInvalidate() => _skipInvalidate = true; - protected AImageView Control => this; + AImageView Control => this; public event EventHandler<VisualElementChangedEventArgs> ElementChanged; public event EventHandler<PropertyChangedEventArgs> ElementPropertyChanged; @@ -157,7 +157,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers { } - protected virtual async void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e) + async void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e) { if (e.PropertyName == Image.SourceProperty.PropertyName) await TryUpdateBitmap(); @@ -167,7 +167,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers ElementPropertyChanged?.Invoke(this, e); } - protected virtual async Task TryUpdateBitmap(Image previous = null) + async Task TryUpdateBitmap(Image previous = null) { // By default we'll just catch and log any exceptions thrown by UpdateBitmap so they don't bring down // the application; a custom renderer can override this method and handle exceptions from @@ -187,7 +187,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers } } - protected async Task UpdateBitmap(Image previous = null) + async Task UpdateBitmap(Image previous = null) { if (_element == null || _disposed) { diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs index 8c88f0df..f92873b4 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs @@ -9,7 +9,7 @@ using AView = Android.Views.View; namespace Xamarin.Forms.Platform.Android.FastRenderers { - public class LabelRenderer : FormsTextView, IVisualElementRenderer + internal sealed class LabelRenderer : FormsTextView, IVisualElementRenderer { int? _defaultLabelFor; bool _disposed; @@ -43,7 +43,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers ViewGroup IVisualElementRenderer.ViewGroup => null; - protected Label Element + Label Element { get { return _element; } set @@ -169,7 +169,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers return handled ? result : base.OnTouchEvent(e); } - protected virtual void OnElementChanged(ElementChangedEventArgs<Label> e) + void OnElementChanged(ElementChangedEventArgs<Label> e) { ElementChanged?.Invoke(this, new VisualElementChangedEventArgs(e.OldElement, e.NewElement)); @@ -199,7 +199,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers } } - protected virtual void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e) + void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e) { ElementPropertyChanged?.Invoke(this, e); diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/VisualElementRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/VisualElementRenderer.cs index 51ad714a..91943fb0 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/VisualElementRenderer.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/VisualElementRenderer.cs @@ -8,7 +8,7 @@ using Object = Java.Lang.Object; namespace Xamarin.Forms.Platform.Android.FastRenderers { // TODO hartez 2017/03/03 14:11:17 It's weird that this class is called VisualElementRenderer but it doesn't implement that interface. The name should probably be different. - public class VisualElementRenderer : IDisposable, IEffectControlProvider + internal sealed class VisualElementRenderer : IDisposable, IEffectControlProvider { bool _disposed; @@ -56,7 +56,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers GC.SuppressFinalize(this); } - protected void Dispose(bool disposing) + void Dispose(bool disposing) { if (_disposed) return; |