From e3d299329c3436d0b31e519d4da401ef27db9028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?= Date: Wed, 28 Oct 2020 14:48:28 +0100 Subject: [PATCH] Removed unnecessary ApiLevel variable in BrushExtensions --- .../MaterialFrameRenderer.cs | 5 +---- .../Extensions/BrushExtensions.cs | 16 ++-------------- .../FastRenderers/FrameRenderer.cs | 3 --- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs b/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs index 72e2c2ba523..c013d317324 100644 --- a/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs +++ b/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs @@ -1,5 +1,4 @@ - -using System; +using System; using System.ComponentModel; using Android.Content; using Android.Graphics.Drawables; @@ -7,8 +6,6 @@ using AndroidX.Core.View; using Xamarin.Forms.Platform.Android; using Xamarin.Forms.Platform.Android.FastRenderers; -using Xamarin.Forms.Platform.Android; -using Android.Graphics.Drawables; using Android.Graphics.Drawables.Shapes; using AView = Android.Views.View; using MaterialCardView = Google.Android.Material.Card.MaterialCardView; diff --git a/Xamarin.Forms.Platform.Android/Extensions/BrushExtensions.cs b/Xamarin.Forms.Platform.Android/Extensions/BrushExtensions.cs index cbf7118c6f2..525113f6555 100644 --- a/Xamarin.Forms.Platform.Android/Extensions/BrushExtensions.cs +++ b/Xamarin.Forms.Platform.Android/Extensions/BrushExtensions.cs @@ -9,13 +9,6 @@ namespace Xamarin.Forms.Platform.Android { public static class BrushExtensions { - static readonly int ApiLevel; - - static BrushExtensions() - { - ApiLevel = (int)Forms.SdkInt; - } - public static void UpdateBackground(this AView view, Brush brush) { if (view == null) @@ -191,13 +184,8 @@ public static bool UseGradients(this GradientDrawable gradientDrawable) if (!Forms.IsNougatOrNewer) return false; - if (ApiLevel >= 24) - { - var colors = gradientDrawable.GetColors(); - return colors != null && colors.Length > 1; - } - - return false; + var colors = gradientDrawable.GetColors(); + return colors != null && colors.Length > 1; } public static bool UseGradients(this GradientStrokeDrawable gradientDrawable) diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs index 37f0894786a..ea1ee3fe866 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs @@ -2,13 +2,10 @@ using System.ComponentModel; using Android.Content; using Android.Graphics; -using Android.Graphics.Drawables; using Android.Graphics.Drawables.Shapes; using Android.Views; using AndroidX.Core.View; using AndroidX.CardView.Widget; -using AndroidX.CardView.Widget; -using AndroidX.Core.View; using AColor = Android.Graphics.Color; using AView = Android.Views.View;