diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj b/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj index c1b4ec3e..06f05736 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj @@ -11,13 +11,11 @@ 23.0 10.0.17763.0 10.0.17763.0 - Maui.FreakyControls 0.4.1 0.4.1 0.4.1 en - FreakyControls latest @@ -34,11 +32,11 @@ Copyright 2022 true false + 1701;1702;IL2121;CS1573;CS1591;CS1570;CS8632 4 latest - 1701;1702;IL2121;CS1573;CS1591;CS1570;CS8632 latest @@ -49,7 +47,7 @@ false - false + false @@ -133,18 +131,20 @@ - + + - + + - - true - + + true + - + \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/FreakyEntryHandler.android.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/FreakyEntryHandler.android.cs index daa214e1..0273e878 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/FreakyEntryHandler.android.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/FreakyEntryHandler.android.cs @@ -1,4 +1,4 @@ -using System; +using System; using Android.Content.Res; using Android.Graphics; using Android.Graphics.Drawables; @@ -13,7 +13,6 @@ using static Android.Views.View; using static Microsoft.Maui.ApplicationModel.Platform; - namespace Maui.FreakyControls; public partial class FreakyEntryHandler diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/iOS/FreakyPickerHandler.ios.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/iOS/FreakyPickerHandler.ios.cs index 827ee001..48bbcfef 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/iOS/FreakyPickerHandler.ios.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/iOS/FreakyPickerHandler.ios.cs @@ -48,5 +48,4 @@ private void OnViewTouchBegan() entry.ImageCommand?.ExecuteCommandIfAvailable(entry.ImageCommandParameter); } } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/iOS/FreakySignatureCanvasViewHandler.ios.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/iOS/FreakySignatureCanvasViewHandler.ios.cs index 6a739bb5..31dcccb4 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/iOS/FreakySignatureCanvasViewHandler.ios.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/iOS/FreakySignatureCanvasViewHandler.ios.cs @@ -2,42 +2,40 @@ using Microsoft.Maui.Platform; -namespace Maui.FreakyControls +namespace Maui.FreakyControls; + +public partial class FreakySignatureCanvasViewHandler { - public partial class FreakySignatureCanvasViewHandler - { - protected override Platforms.iOS.SignaturePadCanvasView - CreatePlatformView() => new(); + protected override Platforms.iOS.SignaturePadCanvasView + CreatePlatformView() => new(); - private void OnImageStreamRequested(object sender, ImageStreamRequestedEventArgs e) + private void OnImageStreamRequested(object sender, ImageStreamRequestedEventArgs e) + { + var ctrl = this.PlatformView; + if (ctrl != null) { - var ctrl = this.PlatformView; - if (ctrl != null) - { - var format = e.ImageFormat; - - var settings = new Platforms.iOS.ImageConstructionSettings(); - if (e.Settings.BackgroundColor != null) - { - settings.BackgroundColor = e.Settings.BackgroundColor.ToPlatform(); - } - if (e.Settings.DesiredSizeOrScale.HasValue) - { - var val = e.Settings.DesiredSizeOrScale.Value; - settings.DesiredSizeOrScale = new Platforms.iOS.SizeOrScale(val.X, val.Y, - (SizeOrScaleType)(int)val.Type, val.KeepAspectRatio); - } - settings.ShouldCrop = e.Settings.ShouldCrop; - if (e.Settings.StrokeColor != null) - { - settings.StrokeColor = e.Settings.StrokeColor.ToPlatform(); - } - settings.StrokeWidth = e.Settings.StrokeWidth; - settings.Padding = e.Settings.Padding; + var format = e.ImageFormat; - e.ImageStreamTask = ctrl.GetImageStreamAsync(format, settings); + var settings = new Platforms.iOS.ImageConstructionSettings(); + if (e.Settings.BackgroundColor != null) + { + settings.BackgroundColor = e.Settings.BackgroundColor.ToPlatform(); } + if (e.Settings.DesiredSizeOrScale.HasValue) + { + var val = e.Settings.DesiredSizeOrScale.Value; + settings.DesiredSizeOrScale = new Platforms.iOS.SizeOrScale(val.X, val.Y, + (SizeOrScaleType)(int)val.Type, val.KeepAspectRatio); + } + settings.ShouldCrop = e.Settings.ShouldCrop; + if (e.Settings.StrokeColor != null) + { + settings.StrokeColor = e.Settings.StrokeColor.ToPlatform(); + } + settings.StrokeWidth = e.Settings.StrokeWidth; + settings.Padding = e.Settings.Padding; + + e.ImageStreamTask = ctrl.GetImageStreamAsync(format, settings); } } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Controls/BaseSKCanvas.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Controls/BaseSKCanvas.cs index 48706f85..7f877f1f 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Controls/BaseSKCanvas.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Controls/BaseSKCanvas.cs @@ -1,4 +1,4 @@ -using System; +using System; using SkiaSharp; using SkiaSharp.Views.Maui; using SkiaSharp.Views.Maui.Controls; @@ -40,8 +40,6 @@ protected override void OnPropertyChanged(string propertyName = null) { return; } - InvalidateSurface(); } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Controls/IDrawableImageView.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Controls/IDrawableImageView.cs index 59cdda75..322226e6 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Controls/IDrawableImageView.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Controls/IDrawableImageView.cs @@ -40,5 +40,4 @@ public ImageAlignment ImageAlignment { get; } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/BaseOneWayValueConverter.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/BaseOneWayValueConverter.cs index 6de39549..2130c4be 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/BaseOneWayValueConverter.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/BaseOneWayValueConverter.cs @@ -1,16 +1,14 @@ using System; using System.Globalization; -namespace Maui.FreakyControls.Shared.Converters +namespace Maui.FreakyControls.Shared.Converters; + +public abstract class BaseOneWayValueConverter : IValueConverter { - public abstract class BaseOneWayValueConverter : IValueConverter - { - public abstract object Convert(object value, Type targetType, object parameter, CultureInfo culture); + public abstract object Convert(object value, Type targetType, object parameter, CultureInfo culture); - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotSupportedException($"{GetType().Name} is a one-way converter"); - } + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotSupportedException($"{GetType().Name} is a one-way converter"); } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/InverseBoolConverter.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/InverseBoolConverter.cs index 6ee4ddec..5c1d9f65 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/InverseBoolConverter.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/InverseBoolConverter.cs @@ -1,18 +1,16 @@ using System.Globalization; -namespace Maui.FreakyControls.Shared.Converters +namespace Maui.FreakyControls.Shared.Converters; + +public class InverseBoolConverter : BaseOneWayValueConverter { - public class InverseBoolConverter : BaseOneWayValueConverter + public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) + if (!(value is bool boolValue)) { - if (!(value is bool boolValue)) - { - throw new ArgumentException("Value must be a boolean", nameof(value)); - } - - return !boolValue; + throw new ArgumentException("Value must be a boolean", nameof(value)); } - } -} + return !boolValue; + } +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/IsNullConverter.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/IsNullConverter.cs index 24df0152..cd532d7d 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/IsNullConverter.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/IsNullConverter.cs @@ -1,13 +1,11 @@ using System.Globalization; -namespace Maui.FreakyControls.Shared.Converters +namespace Maui.FreakyControls.Shared.Converters; + +public class IsNullConverter : BaseOneWayValueConverter { - public class IsNullConverter : BaseOneWayValueConverter + public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - return value == null; - } + return value == null; } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StringFormatConverter.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StringFormatConverter.cs index a4c0f568..6b64021c 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StringFormatConverter.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StringFormatConverter.cs @@ -1,44 +1,42 @@ using System.Globalization; -namespace Maui.FreakyControls.Shared.Converters +namespace Maui.FreakyControls.Shared.Converters; + +/// +/// String format converter. +/// This converter is safer than using MAUI' built-in Binding.StringFormat +/// because it will not throw an exception if the format is not a valid input string. +/// Instead, this will return the formatted string (if it is valid), the format string (if it is not valid), +/// or the value (if the parameter is not a string). +/// +public class StringFormatConverter : BaseOneWayValueConverter { - /// - /// String format converter. - /// This converter is safer than using Xamarin.Forms' built-in Binding.StringFormat - /// because it will not throw an exception if the format is not a valid input string. - /// Instead, this will return the formatted string (if it is valid), the format string (if it is not valid), - /// or the value (if the parameter is not a string). - /// - public class StringFormatConverter : BaseOneWayValueConverter + public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) + // default the return value to the input value + object result = value; + try { - // default the return value to the input value - object result = value; - try - { - if (targetType != typeof(string)) - throw new ArgumentException($"Converter can only convert to string, {targetType} is not a supported target type", nameof(targetType)); - - if (parameter == null) - throw new ArgumentNullException(nameof(parameter), "Converter parameter must not be null"); + if (targetType != typeof(string)) + throw new ArgumentException($"Converter can only convert to string, {targetType} is not a supported target type", nameof(targetType)); - if (!(parameter is string format)) - throw new ArgumentException($"Converter parameter must be a string, {parameter.GetType()} is not supported", nameof(parameter)); + if (parameter == null) + throw new ArgumentNullException(nameof(parameter), "Converter parameter must not be null"); - // if the parameter is a string, update the return value to the string - result = parameter; + if (!(parameter is string format)) + throw new ArgumentException($"Converter parameter must be a string, {parameter.GetType()} is not supported", nameof(parameter)); - // attempt to format the value using the input string and update the return value - result = string.Format(culture, format, value); - } - catch - { - // suppress any exceptions as this will be used in XAML definitions - } + // if the parameter is a string, update the return value to the string + result = parameter; - return result; + // attempt to format the value using the input string and update the return value + result = string.Format(culture, format, value); + } + catch + { + // suppress any exceptions as this will be used in XAML definitions } - } -} + return result; + } +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StringIsNullOrWhitespaceConverter.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StringIsNullOrWhitespaceConverter.cs index aeb74f88..34b8ca7e 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StringIsNullOrWhitespaceConverter.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StringIsNullOrWhitespaceConverter.cs @@ -1,13 +1,11 @@ using System.Globalization; -namespace Maui.FreakyControls.Shared.Converters +namespace Maui.FreakyControls.Shared.Converters; + +public class StringIsNullOrWhitespaceConverter : BaseOneWayValueConverter { - public class StringIsNullOrWhitespaceConverter : BaseOneWayValueConverter + public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - return string.IsNullOrWhiteSpace(value?.ToString()); - } + return string.IsNullOrWhiteSpace(value?.ToString()); } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StrokeThicknessConverter.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StrokeThicknessConverter.cs index 83f8af58..3ac415a8 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StrokeThicknessConverter.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/StrokeThicknessConverter.cs @@ -1,14 +1,12 @@ using System; using System.Globalization; -namespace Maui.FreakyControls.Shared.Converters +namespace Maui.FreakyControls.Shared.Converters; + +public class StrokeThicknessConverter : BaseOneWayValueConverter { - public class StrokeThicknessConverter : BaseOneWayValueConverter + public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - return (bool)(value) ? 0 : (int)parameter; - } + return (bool)(value) ? 0 : (int)parameter; } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ToLowerConverter.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ToLowerConverter.cs index c64f7515..dc36f176 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ToLowerConverter.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ToLowerConverter.cs @@ -1,13 +1,11 @@ using System.Globalization; -namespace Maui.FreakyControls.Shared.Converters +namespace Maui.FreakyControls.Shared.Converters; + +public class ToLowerConverter : BaseOneWayValueConverter { - public class ToLowerConverter : BaseOneWayValueConverter + public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - return value?.ToString()?.ToLower(culture); - } + return value?.ToString()?.ToLower(culture); } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ToUpperConverter.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ToUpperConverter.cs index 92af7a84..84856a63 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ToUpperConverter.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ToUpperConverter.cs @@ -1,13 +1,11 @@ using System.Globalization; -namespace Maui.FreakyControls.Shared.Converters +namespace Maui.FreakyControls.Shared.Converters; + +public class ToUpperConverter : BaseOneWayValueConverter { - public class ToUpperConverter : BaseOneWayValueConverter + public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - return value?.ToString()?.ToUpper(culture); - } + return value?.ToString()?.ToUpper(culture); } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ValueConverterGroup.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ValueConverterGroup.cs index 89968b4f..c51ffffe 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ValueConverterGroup.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Converters/ValueConverterGroup.cs @@ -1,21 +1,19 @@ using System.Globalization; -namespace Maui.FreakyControls.Shared.Converters +namespace Maui.FreakyControls.Shared.Converters; + +/// +/// Value converter group that will chain converters together. +/// +public class ValueConverterGroup : List, IValueConverter { - /// - /// Value converter group that will chain converters together. - /// - public class ValueConverterGroup : List, IValueConverter + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - return this.Aggregate(value, (current, converter) => converter.Convert(current, targetType, parameter, culture)); - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotSupportedException($"{GetType().Name} is a one-way converter"); - } + return this.Aggregate(value, (current, converter) => converter.Convert(current, targetType, parameter, culture)); } -} + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotSupportedException($"{GetType().Name} is a one-way converter"); + } +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/ImageAlignment.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/ImageAlignment.cs index ba28780d..a6daddd0 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/ImageAlignment.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/ImageAlignment.cs @@ -1,16 +1,15 @@ using System; -namespace Maui.FreakyControls.Shared.Enums +namespace Maui.FreakyControls.Shared.Enums; + +public enum ImageAlignment { - public enum ImageAlignment - { - /// - /// Aligns your control to the left view port of the view. - /// - Left, + /// + /// Aligns your control to the left view port of the view. + /// + Left, - /// - /// Aligns your control to the right view port of the view. - /// - Right - } + /// + /// Aligns your control to the right view port of the view. + /// + Right } \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/Shape.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/Shape.cs index 82ca080e..0c34af87 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/Shape.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/Shape.cs @@ -11,6 +11,4 @@ public enum Shape /// Rectangular shape to your control /// Rectangle -} - - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/Type.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/Type.cs index 5bf1a2e2..de8c69ae 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/Type.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Enums/Type.cs @@ -1,12 +1,22 @@ -using System; -namespace Maui.FreakyControls.Shared.Enums -{ - public enum CheckType - { - Check, - Box, - Line, - Cross, - } -} +using System; +namespace Maui.FreakyControls.Shared.Enums; +public enum CheckType +{ + /// + /// Check is the default checkbox style + /// + Check, + /// + /// Box type of check for your checkbox + /// + Box, + /// + /// Line type of check for your checkbox + /// + Line, + /// + /// Cross type of check for your checkbox + /// + Cross, +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/FreakyEventArgs.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/FreakyEventArgs.cs index bb1ce9ac..8d99be6e 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/FreakyEventArgs.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/FreakyEventArgs.cs @@ -9,5 +9,4 @@ namespace Maui.FreakyControls; public class FreakyEventArgs : EventArgs { -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/ImageStreamRequestedEventArgs.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/ImageStreamRequestedEventArgs.cs index 53f18ced..d33b5197 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/ImageStreamRequestedEventArgs.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/ImageStreamRequestedEventArgs.cs @@ -14,5 +14,4 @@ public ImageStreamRequestedEventArgs(SignatureImageFormat imageFormat, ImageCons public ImageConstructionSettings Settings { get; private set; } public Task ImageStreamTask { get; set; } = Task.FromResult(null); -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/IsBlankRequestedEventArgs.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/IsBlankRequestedEventArgs.cs index 18b10497..5bc804a2 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/IsBlankRequestedEventArgs.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/IsBlankRequestedEventArgs.cs @@ -4,5 +4,4 @@ namespace Maui.FreakyControls; public class IsBlankRequestedEventArgs : FreakyEventArgs { public bool IsBlank { get; set; } = true; -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/PointsEventArgs.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/PointsEventArgs.cs index 07229df7..09b46201 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/PointsEventArgs.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/PointsEventArgs.cs @@ -4,5 +4,4 @@ namespace Maui.FreakyControls; public class PointsEventArgs : FreakyEventArgs { public IEnumerable Points { get; set; } = new Point[0]; -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/StrokesEventArgs.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/StrokesEventArgs.cs index 9dd356e9..287d58e1 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/StrokesEventArgs.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/EventArgs/StrokesEventArgs.cs @@ -4,5 +4,4 @@ namespace Maui.FreakyControls; public class StrokesEventArgs : FreakyEventArgs { public IEnumerable> Strokes { get; set; } = new Point[0][]; -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Extensions/AssemblyNotFoundException.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Extensions/AssemblyNotFoundException.cs index f076c130..4268b97e 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Extensions/AssemblyNotFoundException.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Extensions/AssemblyNotFoundException.cs @@ -15,5 +15,4 @@ public AssemblyNotFoundException(string message) : base(message) { } } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Extensions/StreamExtensions.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Extensions/StreamExtensions.cs index c798f393..96bda8c8 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Extensions/StreamExtensions.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Extensions/StreamExtensions.cs @@ -1,15 +1,13 @@ using System; -namespace Maui.FreakyControls.Extensions +namespace Maui.FreakyControls.Extensions; + +public static class StreamExtensions { - public static class StreamExtensions + public static MemoryStream GetMemoryStream(this Stream stream) { - public static MemoryStream GetMemoryStream(this Stream stream) - { - MemoryStream memoryStream = new MemoryStream(); - stream.CopyTo(memoryStream); - memoryStream.Position = 0; - return memoryStream; - } + MemoryStream memoryStream = new MemoryStream(); + stream.CopyTo(memoryStream); + memoryStream.Position = 0; + return memoryStream; } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyAutoCompleteView/AutoCompleteView.xaml b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyAutoCompleteView/AutoCompleteView.xaml index ae29d4a0..4293d6a4 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyAutoCompleteView/AutoCompleteView.xaml +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyAutoCompleteView/AutoCompleteView.xaml @@ -2,10 +2,7 @@ - - - - + diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyButton/FreakyButton.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyButton/FreakyButton.cs index 198943c4..79f40ef6 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyButton/FreakyButton.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyButton/FreakyButton.cs @@ -5,5 +5,4 @@ namespace Maui.FreakyControls; public class FreakyButton : Button { -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyButton/FreakyButtonHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyButton/FreakyButtonHandler.cs index 63ef91b1..ad01dde6 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyButton/FreakyButtonHandler.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyButton/FreakyButtonHandler.cs @@ -7,5 +7,4 @@ namespace Maui.FreakyControls; public partial class FreakyButtonHandler : ButtonHandler { -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyCheckbox/FreakyCheckbox.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyCheckbox/FreakyCheckbox.cs index 294c9895..1d498d3f 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyCheckbox/FreakyCheckbox.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyCheckbox/FreakyCheckbox.cs @@ -366,7 +366,6 @@ public CheckType CheckType set { SetValue(CheckTypeProperty, value); } } - public static readonly BindableProperty DesignProperty = BindableProperty.Create( nameof(Design), diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEditor/FreakyEditor.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEditor/FreakyEditor.cs index ad51728a..7619276e 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEditor/FreakyEditor.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEditor/FreakyEditor.cs @@ -25,4 +25,4 @@ public bool AllowCopyPaste set => SetValue(AllowCopyPasteProperty, value); } } -} +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEntry/FreakyEntryHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEntry/FreakyEntryHandler.cs index 5a673636..a695f9fc 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEntry/FreakyEntryHandler.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEntry/FreakyEntryHandler.cs @@ -6,7 +6,6 @@ namespace Maui.FreakyControls; #if ANDROID || IOS - public sealed partial class FreakyEntryHandler : EntryHandler { diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyImage/FreakyImageHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyImage/FreakyImageHandler.cs index 63e91914..8a6d4b63 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyImage/FreakyImageHandler.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyImage/FreakyImageHandler.cs @@ -6,5 +6,4 @@ namespace Maui.FreakyControls; public partial class FreakyImageHandler: ImageHandler { -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignatureCanvasView.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignatureCanvasView.cs index a17b70f7..039ef920 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignatureCanvasView.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignatureCanvasView.cs @@ -290,4 +290,4 @@ private void UpdateBindableProperties() { SetValue(IsBlankPropertyKey, IsBlank); } -} +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml index 835f5678..e05842ce 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml @@ -66,4 +66,4 @@ VerticalOptions = "End"/> - + \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml.cs index d07c577e..cdf21a2e 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml.cs @@ -423,4 +423,4 @@ private void UpdateBindableProperties() { SetValue(IsBlankPropertyKey, SignaturePadCanvas.IsBlank); } -} +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySvgImageView/FreakySvgImageView.xaml b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySvgImageView/FreakySvgImageView.xaml index c9b13f9b..3fd72f1f 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySvgImageView/FreakySvgImageView.xaml +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySvgImageView/FreakySvgImageView.xaml @@ -11,6 +11,4 @@ CommandParameter="{Binding Source={x:Reference this}, Path=CommandParameter}" Tapped="TapGestureRecognizer_OnTapped" /> - - - + \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySvgImageView/FreakySvgImageView.xaml.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySvgImageView/FreakySvgImageView.xaml.cs index 1784bf24..8dc70053 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySvgImageView/FreakySvgImageView.xaml.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySvgImageView/FreakySvgImageView.xaml.cs @@ -337,4 +337,4 @@ protected override void OnPropertyChanged(string propertyName = null) } InvalidateSurface(); } -} +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTextInputLayout/FreakyTextInputLayout.xaml b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTextInputLayout/FreakyTextInputLayout.xaml index 5ab0de7d..8a34926c 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTextInputLayout/FreakyTextInputLayout.xaml +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTextInputLayout/FreakyTextInputLayout.xaml @@ -72,5 +72,4 @@ - - + \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTextInputLayout/FreakyTextInputLayout.xaml.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTextInputLayout/FreakyTextInputLayout.xaml.cs index c43eb31e..3f547d85 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTextInputLayout/FreakyTextInputLayout.xaml.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTextInputLayout/FreakyTextInputLayout.xaml.cs @@ -780,4 +780,4 @@ void EntryField_TextChanged(System.Object sender, Microsoft.Maui.Controls.TextCh { TextChanged?.Invoke(this, e); } -} +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTimePicker/FreakyTimePickerHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTimePicker/FreakyTimePickerHandler.cs index 45092451..6dd80fd2 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTimePicker/FreakyTimePickerHandler.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTimePicker/FreakyTimePickerHandler.cs @@ -29,4 +29,4 @@ private void MapTimePicker(ITimePickerHandler timePickerHandler, ITimePicker tim public partial class FreakyTimePickerHandler : TimePickerHandler { } -#endif +#endif \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/DownloadHelper.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/DownloadHelper.cs index 2b86029f..53b65195 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/DownloadHelper.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/DownloadHelper.cs @@ -2,36 +2,34 @@ using System.Diagnostics; using Maui.FreakyControls.Shared.Wrappers; -namespace Maui.FreakyControls.Shared.Helpers +namespace Maui.FreakyControls.Shared.Helpers; + +public static class DownloadHelper { - public static class DownloadHelper + internal static async Task GetStreamAsync(Uri uri, CancellationToken cancellationToken = default(CancellationToken)) { - internal static async Task GetStreamAsync(Uri uri, CancellationToken cancellationToken = default(CancellationToken)) - { - cancellationToken.ThrowIfCancellationRequested(); - Stream stream = await DownloadStreamAsync(uri, cancellationToken).ConfigureAwait(false); - return stream; - } + cancellationToken.ThrowIfCancellationRequested(); + Stream stream = await DownloadStreamAsync(uri, cancellationToken).ConfigureAwait(false); + return stream; + } - static async Task DownloadStreamAsync(Uri uri, CancellationToken cancellationToken) + static async Task DownloadStreamAsync(Uri uri, CancellationToken cancellationToken) + { + try { - try - { - using var client = new HttpClient(); + using var client = new HttpClient(); - // Do not remove this await otherwise the client will dispose before - // the stream even starts - return await StreamWrapper.GetStreamAsync(uri, cancellationToken, client).ConfigureAwait(false); - } - catch (Exception ex) - { - Trace.TraceError(ex.Message); - Trace.TraceError(ex.StackTrace); - Trace.TraceError(ex.Source); - Trace.WriteLine(ex.InnerException); - return null; - } + // Do not remove this await otherwise the client will dispose before + // the stream even starts + return await StreamWrapper.GetStreamAsync(uri, cancellationToken, client).ConfigureAwait(false); + } + catch (Exception ex) + { + Trace.TraceError(ex.Message); + Trace.TraceError(ex.StackTrace); + Trace.TraceError(ex.Source); + Trace.WriteLine(ex.InnerException); + return null; } } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SignatureImageFormat.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SignatureImageFormat.cs index 8714f375..35f87f5a 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SignatureImageFormat.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SignatureImageFormat.cs @@ -4,4 +4,4 @@ public enum SignatureImageFormat { Png, Jpeg -} +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SizeOrScale.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SizeOrScale.cs index d38a317e..29d9d44a 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SizeOrScale.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SizeOrScale.cs @@ -93,4 +93,4 @@ public static implicit operator SizeOrScale(Size size) { return new SizeOrScale((float)size.Width, (float)size.Height, SizeOrScaleType.Size); } -} +} \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SizeOrScaleType.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SizeOrScaleType.cs index cfd96d15..64a23379 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SizeOrScaleType.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/Helpers/SizeOrScaleType.cs @@ -4,4 +4,4 @@ public enum SizeOrScaleType { Size, Scale -} +} \ No newline at end of file diff --git a/MAUI.FreakyControls/Samples/AppShell.xaml.cs b/MAUI.FreakyControls/Samples/AppShell.xaml.cs index 9b72a4f8..e1ef3b98 100644 --- a/MAUI.FreakyControls/Samples/AppShell.xaml.cs +++ b/MAUI.FreakyControls/Samples/AppShell.xaml.cs @@ -23,5 +23,4 @@ public AppShell() Routing.RegisterRoute(signaturePreview, typeof(SignatureView.ImageDisplay)); Routing.RegisterRoute(checkboxes, typeof(Checkboxes.CheckboxesView)); } -} - +} \ No newline at end of file diff --git a/MAUI.FreakyControls/Samples/Checkboxes/CheckboxesView.xaml b/MAUI.FreakyControls/Samples/Checkboxes/CheckboxesView.xaml index f66251a3..d291038a 100644 --- a/MAUI.FreakyControls/Samples/Checkboxes/CheckboxesView.xaml +++ b/MAUI.FreakyControls/Samples/Checkboxes/CheckboxesView.xaml @@ -10,7 +10,7 @@ Padding="30" Spacing="20" > - + @@ -39,7 +39,7 @@ @@ -55,7 +55,7 @@