diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Behaviors/CharactersValidationBehaviorViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Behaviors/CharactersValidationBehaviorViewModel.cs index cbfacf3f4..dfa37950e 100644 --- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Behaviors/CharactersValidationBehaviorViewModel.cs +++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Behaviors/CharactersValidationBehaviorViewModel.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using CommunityToolkit.Maui.Behaviors; +using CommunityToolkit.Maui.Behaviors; namespace CommunityToolkit.Maui.Sample.ViewModels.Behaviors; diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/EnumToIntConverterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/EnumToIntConverterViewModel.cs index 8b8746b6c..56917c535 100644 --- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/EnumToIntConverterViewModel.cs +++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/EnumToIntConverterViewModel.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; namespace CommunityToolkit.Maui.Sample.ViewModels.Converters; diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ItemTappedEventArgsConverterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ItemTappedEventArgsConverterViewModel.cs index a7a4d3ce2..3fa8b55bd 100644 --- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ItemTappedEventArgsConverterViewModel.cs +++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ItemTappedEventArgsConverterViewModel.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Application = Microsoft.Maui.Controls.Application; diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ListToStringConverterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ListToStringConverterViewModel.cs index 73b0b1468..d8b160335 100644 --- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ListToStringConverterViewModel.cs +++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ListToStringConverterViewModel.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; - + namespace CommunityToolkit.Maui.Sample.ViewModels.Converters; public class ListToStringConverterViewModel : BaseViewModel diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/SelectedItemEventArgsConverterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/SelectedItemEventArgsConverterViewModel.cs index c2a4660d1..994f544c4 100644 --- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/SelectedItemEventArgsConverterViewModel.cs +++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/SelectedItemEventArgsConverterViewModel.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; namespace CommunityToolkit.Maui.Sample.ViewModels.Converters; diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/ImageSources/GravatarImageSourceViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/ImageSources/GravatarImageSourceViewModel.cs index 4fdfe6c71..1fa00fe03 100644 --- a/samples/CommunityToolkit.Maui.Sample/ViewModels/ImageSources/GravatarImageSourceViewModel.cs +++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/ImageSources/GravatarImageSourceViewModel.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using CommunityToolkit.Maui.ImageSources; +using CommunityToolkit.Maui.ImageSources; using CommunityToolkit.Mvvm.ComponentModel; namespace CommunityToolkit.Maui.Sample.ViewModels.ImageSources; diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs index 380c50004..b2d7adde8 100644 --- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs +++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs @@ -1,4 +1,3 @@ -using System.Collections.Frozen; using System.Runtime.CompilerServices; using CommunityToolkit.Maui.Sample.Views.Popups; using CommunityToolkit.Maui.Views; diff --git a/src/CommunityToolkit.Maui.Core/Views/Alert/AlertView.macios.cs b/src/CommunityToolkit.Maui.Core/Views/Alert/AlertView.macios.cs index 03517b308..5bd099a46 100644 --- a/src/CommunityToolkit.Maui.Core/Views/Alert/AlertView.macios.cs +++ b/src/CommunityToolkit.Maui.Core/Views/Alert/AlertView.macios.cs @@ -1,4 +1,3 @@ -using System.Collections.Frozen; using System.Diagnostics.CodeAnalysis; using CommunityToolkit.Maui.Core.Extensions; @@ -19,7 +18,7 @@ public class AlertView : UIView /// /// PopupView Children /// - public FrozenSet Children => children.ToFrozenSet(); + public IReadOnlyList Children => children; /// /// on which Alert will appear. When null, will appear at bottom of screen. @@ -84,7 +83,7 @@ void ConstraintInParent() [MemberNotNull(nameof(Container))] void Initialize() { - Container = new UIStackView() + Container = new UIStackView { Alignment = UIStackViewAlignment.Fill, Distribution = UIStackViewDistribution.EqualSpacing, @@ -92,7 +91,7 @@ void Initialize() TranslatesAutoresizingMaskIntoConstraints = false }; - foreach (var view in children) + foreach (var view in Children) { Container.AddArrangedSubview(view); } diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs index aeb0288dc..aba821f57 100644 --- a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs +++ b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using CommunityToolkit.Maui.Core.Primitives; +using CommunityToolkit.Maui.Core.Primitives; using CommunityToolkit.Maui.Views; using Microsoft.Extensions.Logging; using Microsoft.UI.Xaml.Controls; @@ -14,12 +13,12 @@ namespace CommunityToolkit.Maui.Core.Views; partial class MediaManager : IDisposable { // States that allow changing position - readonly FrozenSet allowUpdatePositionStates = new[] - { + readonly IReadOnlyList allowUpdatePositionStates = + [ MediaElementState.Playing, MediaElementState.Paused, MediaElementState.Stopped, - }.ToFrozenSet(); + ]; // The requests to keep display active are cumulative, this bool makes sure it only gets requested once bool displayActiveRequested; diff --git a/src/CommunityToolkit.Maui.UnitTests/Behaviors/ProgressBarAnimationBehaviorTests.cs b/src/CommunityToolkit.Maui.UnitTests/Behaviors/ProgressBarAnimationBehaviorTests.cs index 166d9bc4a..6d52a552d 100644 --- a/src/CommunityToolkit.Maui.UnitTests/Behaviors/ProgressBarAnimationBehaviorTests.cs +++ b/src/CommunityToolkit.Maui.UnitTests/Behaviors/ProgressBarAnimationBehaviorTests.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using CommunityToolkit.Maui.Behaviors; +using CommunityToolkit.Maui.Behaviors; using CommunityToolkit.Maui.UnitTests.Mocks; using FluentAssertions; using Xunit; @@ -8,11 +7,11 @@ namespace CommunityToolkit.Maui.UnitTests.Behaviors; public class ProgressBarAnimationBehaviorTests() : BaseBehaviorTest(new ProgressBarAnimationBehavior(), new ProgressBar()) { - public static readonly FrozenSet ValidData = new[] - { + public static readonly IReadOnlyList ValidData = + [ [1, 500, Easing.Default], - new object[] { 0, 750, Easing.CubicOut } - }.ToFrozenSet(); + [0, 750, Easing.CubicOut] + ]; [Theory(Timeout = 5000)] [MemberData(nameof(ValidData))] @@ -74,15 +73,15 @@ public void InvalidProgressValuesTest(double inputProgressValue, double expected [Fact] public void AttachedToInvalidElementTest() { - FrozenSet invalidVisualElements = new[] - { + IReadOnlyList invalidVisualElements = + [ new Button(), new Frame(), new Label(), new VisualElement(), new View(), new Entry(), - }.ToFrozenSet(); + ]; foreach (var invalidVisualElement in invalidVisualElements) { diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/MultiConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/MultiConverterTests.cs index be5ae9e83..18e59d986 100644 --- a/src/CommunityToolkit.Maui.UnitTests/Converters/MultiConverterTests.cs +++ b/src/CommunityToolkit.Maui.UnitTests/Converters/MultiConverterTests.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using System.Globalization; +using System.Globalization; using CommunityToolkit.Maui.Converters; using Xunit; diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/SelectedItemEventArgsConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/SelectedItemEventArgsConverterTests.cs index 4dbfa24fb..a3f13c0d2 100644 --- a/src/CommunityToolkit.Maui.UnitTests/Converters/SelectedItemEventArgsConverterTests.cs +++ b/src/CommunityToolkit.Maui.UnitTests/Converters/SelectedItemEventArgsConverterTests.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using System.Globalization; +using System.Globalization; using CommunityToolkit.Maui.Converters; using Xunit; diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/StringToListConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/StringToListConverterTests.cs index 5f0c9cea6..6de8c1056 100644 --- a/src/CommunityToolkit.Maui.UnitTests/Converters/StringToListConverterTests.cs +++ b/src/CommunityToolkit.Maui.UnitTests/Converters/StringToListConverterTests.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using CommunityToolkit.Maui.Converters; +using CommunityToolkit.Maui.Converters; using Xunit; namespace CommunityToolkit.Maui.UnitTests.Converters; diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/TextCaseConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/TextCaseConverterTests.cs index 06e88c2cd..ffd49bb5d 100644 --- a/src/CommunityToolkit.Maui.UnitTests/Converters/TextCaseConverterTests.cs +++ b/src/CommunityToolkit.Maui.UnitTests/Converters/TextCaseConverterTests.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using System.ComponentModel; +using System.ComponentModel; using System.Globalization; using CommunityToolkit.Maui.Converters; using Xunit; diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/TimeSpanToSecondsConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/TimeSpanToSecondsConverterTests.cs index bc6c8c34e..dbe04639a 100644 --- a/src/CommunityToolkit.Maui.UnitTests/Converters/TimeSpanToSecondsConverterTests.cs +++ b/src/CommunityToolkit.Maui.UnitTests/Converters/TimeSpanToSecondsConverterTests.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using CommunityToolkit.Maui.Converters; +using CommunityToolkit.Maui.Converters; using Xunit; namespace CommunityToolkit.Maui.UnitTests.Converters; diff --git a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs index 88bd15672..2d1840407 100644 --- a/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs +++ b/src/CommunityToolkit.Maui/Converters/MathExpressionConverter/MathExpression.shared.cs @@ -1,5 +1,4 @@ -using System.Collections.Frozen; -using System.Globalization; +using System.Globalization; using System.Text.RegularExpressions; using CommunityToolkit.Maui.Core; @@ -11,8 +10,8 @@ sealed partial class MathExpression static readonly IFormatProvider formatProvider = new CultureInfo("en-US"); - readonly FrozenSet operators; - readonly FrozenSet arguments; + readonly IReadOnlyList operators; + readonly IReadOnlyList arguments; internal MathExpression(string expression, IEnumerable? arguments = null) { @@ -69,8 +68,8 @@ internal MathExpression(string expression, IEnumerable? arguments = null operators.Add(new MathOperator($"x{i}", 0, MathOperatorPrecedence.Constant, _ => argumentList[index])); } - this.operators = operators.ToFrozenSet(); - this.arguments = argumentList.ToFrozenSet(); + this.operators = operators; + this.arguments = argumentList; } internal string Expression { get; }