Merge Develop to Main

.github/workflows/dotnet-format-daily.yml

@@ -39,8 +39,8 @@ jobs:
           committer: GitHub <[email protected]>
           author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
           labels: housekeeping
-          assignees: jfversluis
-          reviewers: jfversluis
+          assignees: brminnick
+          reviewers: brminnick
           branch: housekeeping/fix-codeformatting
 
       # Pushing won't work to forked repos

MauiCompat.sh

@@ -426,6 +426,10 @@ sed -i '' 's/, v/, (float)v/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.M
 
 sed -i '' 's/public SnackBarLayout Microsoft.Maui.Controls.Layout/public SnackBarLayout Layout/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/NativeSnackBar.ios.macos.cs
 
+# NativeSnackBarButton.ios.macos.cs
+
+sed -i '' 's/LineBreakMode =/TitleLabel.LineBreakMode =/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/NativeSnackButton.ios.macos.cs
+
 # VisualFeedbackEffect.shared.cs
 
 sed -i '' 's/nativeColor.Alpha/nativeColor.A/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/VisualFeedbackEffect.shared.cs
@@ -500,6 +504,7 @@ sed -i '' 's/Xamarin.Forms.RelativeLayout/Microsoft.Maui.Controls.Compatibility.
 sed -i '' 's/Xamarin.Forms.View/Microsoft.Maui.Controls.View/g' ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/RelativeLayout.cs
 sed -i '' 's/Xamarin.Forms.Constraint/Microsoft.Maui.Controls.Compatibility.Constraint/g' ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/RelativeLayout.cs
 sed -i '' 's/using Microsoft.Maui.Controls.Compatibility;/using Microsoft.Maui.Controls.Compatibility;using Grid = Microsoft.Maui.Controls.Grid;/g' ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/ViewInGridExtensions.cs
+sed -i '' 's/using Xamarin.Forms.Shapes;/using Microsoft.Maui.Controls.Shapes;using Rect = Microsoft.Maui.Graphics.Rectangle;/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Effects/CornerRadius/CornerRadiusEffect.shared.cs
 
 # MauiColorExtensions
 printf > ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Extensions/MauiColorExtensions.android.cs "

azure-pipelines.yml

@@ -196,13 +196,14 @@ jobs:
     pool:
       vmImage: macos-11
     steps:
-      - task: UseDotNet@2
-        displayName: 'Install .NET SDK'
+      - task: CmdLine@2
+        displayName: Install .NET 6.0.200-preview.22055.15
         inputs:
-          version: $(NETCORE_VERSION)
-          includePreviewVersions: false
+          script: |
+            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 6.0.200-preview.22055.15 --quality preview
+            dotnet --version
       - task: CmdLine@2
-        displayName: 'Install .NET MAUI workload'
+        displayName: 'Install .NET MAUI Workload'
         inputs:
           script: 'dotnet workload install maui'
       - task: JavaToolInstaller@0

samples/XCT.Sample/Pages/Converters/MathExpressionConverterPage.xaml

@@ -8,7 +8,7 @@
     x:Class="Xamarin.CommunityToolkit.Sample.Pages.Converters.MathExpressionConverterPage">
     <ContentPage.Resources>
         <ResourceDictionary>
-            <xct:MathExpressionConverter x:Key="MathExpressionConverter" />
+            <xct:MathExpressionConverter x:Key="DivideByTwoConverter" Expression="x/2" />
             <xct:MultiMathExpressionConverter x:Key="MultiMathExpressionConverter" />
         </ResourceDictionary>
     </ContentPage.Resources>
@@ -27,7 +27,7 @@
                 BackgroundColor="Bisque"
                 Padding="10"
                 HeightRequest="120"
-                CornerRadius="{Binding Source={x:Reference CalculatedFrame}, Path=HeightRequest, Converter={StaticResource MathExpressionConverter}, ConverterParameter='x/2'}">
+                CornerRadius="{Binding Source={x:Reference CalculatedFrame}, Path=HeightRequest, Converter={StaticResource DivideByTwoConverter}}">
                 <Label
                     Text="Frame with calculated CornerRadius = HeightRequest / 2"
                     TextColor="Black"

samples/XCT.Sample/Pages/Converters/UtcDateTimeToLocalStringConverterPage.xaml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pages:BasePage
+ xmlns:pages="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages"
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
+    xmlns:vm="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Converters" 
+    x:DataType="vm:UtcDateTimeToLocalStringConverterViewModel"
+    x:Class="Xamarin.CommunityToolkit.Sample.Pages.Converters.UtcDateTimeToLocalStringConverterPage">
+    <pages:BasePage.BindingContext>
+        <vm:UtcDateTimeToLocalStringConverterViewModel/>
+    </pages:BasePage.BindingContext>
+    <pages:BasePage.Resources>
+        <ResourceDictionary>
+            <x:String x:Key="dateTimeFormat">MM/dd/yyyy h:mm tt</x:String>
+            <xct:UtcDateTimeToLocalStringConverter x:Key="UtcDateTimeToLocalStringConverter"  DateTimeFormat="{StaticResource dateTimeFormat}"/>
+        </ResourceDictionary>
+    </pages:BasePage.Resources>
+    <ContentPage.Content>
+        <StackLayout
+            Padding="10,10"
+            HorizontalOptions="Fill"
+            Spacing="10"
+            VerticalOptions="Fill">
+            <Label Text="The UtcDateTimeToLocalStringConverter is a converter that allows users to convert an incoming DateTime or DateTimeOffset value and return the local time representation in the provided datetime format" TextColor="{StaticResource NormalLabelTextColor}" />
+            <Label Text="Convert the following DateTime to local time string value." TextColor="{StaticResource NormalLabelTextColor}" />
+            <Label
+                TextColor="{StaticResource NormalLabelTextColor}" >
+                <Label.FormattedText>
+                    <FormattedString>
+                        <Span Text="DateTime in UTC now: "/>
+                        <Span Text="{Binding UtcDateTime, StringFormat='{0:MM/dd/yyyy h:mm tt}'}"/>
+                    </FormattedString>
+                </Label.FormattedText>
+            </Label>
+            <Label
+                Padding="0,0,0,0"
+                TextColor="{StaticResource NormalLabelTextColor}" >
+                <Label.FormattedText>
+                    <FormattedString>
+                        <Span Text="Local date time string value: "/>
+                        <Span Text="{Binding UtcDateTime, Converter={StaticResource UtcDateTimeToLocalStringConverter}}"/>
+                    </FormattedString>
+                </Label.FormattedText>
+            </Label>
+        </StackLayout>
+    </ContentPage.Content>
+</pages:BasePage>

samples/XCT.Sample/Pages/Converters/UtcDateTimeToLocalStringConverterPage.xaml.cs

@@ -0,0 +1,7 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Converters
+{
+	public partial class UtcDateTimeToLocalStringConverterPage
+	{
+		public UtcDateTimeToLocalStringConverterPage() => InitializeComponent();
+	}
+}

samples/XCT.Sample/Pages/Effects/CornerRadiusEffectPage.xaml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BasePage
+    x:Class="Xamarin.CommunityToolkit.Sample.Pages.Effects.CornerRadiusEffectPage"
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:pages="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages"
+    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
+    x:Name="Page">
+
+    <pages:BasePage.Resources>
+        <ResourceDictionary>
+            <Style TargetType="Slider">
+                <Setter Property="MaximumTrackColor" Value="White" />
+                <Setter Property="ThumbColor" Value="Blue" />
+            </Style>
+            <Style TargetType="Label">
+                <Setter Property="LineBreakMode" Value="TailTruncation" />
+            </Style>
+        </ResourceDictionary>
+    </pages:BasePage.Resources>
+
+    <ScrollView>
+        <Grid RowDefinitions="*,Auto">
+            <Grid Grid.Row="0">
+                <ContentView
+                    Grid.Row="0"
+                    xct:CornerRadiusEffect.CornerRadius="{Binding CornerRadius, Source={x:Reference Page}}"
+                    BackgroundColor="Blue"
+                    HeightRequest="{Binding Value, Source={x:Reference Name=SliderHeight}}"
+                    HorizontalOptions="Center"
+                    VerticalOptions="Center"
+                    WidthRequest="{Binding Value, Source={x:Reference Name=SliderWidth}}" />
+            </Grid>
+
+            <Grid
+                Grid.Row="1"
+                Padding="10"
+                BackgroundColor="LightGray"
+                RowSpacing="0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="100" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="100" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Label
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    HorizontalOptions="End"
+                    Text="Width" />
+                <Slider
+                    x:Name="SliderWidth"
+                    Grid.Row="0"
+                    Grid.Column="2"
+                    Maximum="1000"
+                    Minimum="100"
+                    Value="100" />
+
+                <Label
+                    Grid.Row="0"
+                    Grid.Column="3"
+                    HorizontalOptions="End"
+                    Text="Height" />
+                <Slider
+                    x:Name="SliderHeight"
+                    Grid.Row="0"
+                    Grid.Column="4"
+                    Maximum="1000"
+                    Minimum="100"
+                    Value="100" />
+
+                <Label
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    HorizontalOptions="End"
+                    Text="TopLeft" />
+                <Slider
+                    x:Name="SliderCornerRadiusTopLeft"
+                    Grid.Row="1"
+                    Grid.Column="2"
+                    Maximum="200"
+                    Minimum="0"
+                    Value="10" />
+
+                <Label
+                    Grid.Row="1"
+                    Grid.Column="3"
+                    HorizontalOptions="End"
+                    Text="TopRight" />
+                <Slider
+                    x:Name="SliderCornerRadiusTopRight"
+                    Grid.Row="1"
+                    Grid.Column="4"
+                    Maximum="200"
+                    Minimum="0"
+                    Value="10" />
+
+                <Label
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    HorizontalOptions="End"
+                    Text="BottomLeft" />
+                <Slider
+                    x:Name="SliderCornerRadiusBottomLeft"
+                    Grid.Row="2"
+                    Grid.Column="2"
+                    Maximum="200"
+                    Minimum="0"
+                    Value="10" />
+
+                <Label
+                    Grid.Row="2"
+                    Grid.Column="3"
+                    HorizontalOptions="End"
+                    Text="BottomRight" />
+                <Slider
+                    x:Name="SliderCornerRadiusBottomRight"
+                    Grid.Row="2"
+                    Grid.Column="4"
+                    Maximum="200"
+                    Minimum="0"
+                    Value="10" />
+            </Grid>
+        </Grid>
+    </ScrollView>
+</pages:BasePage>

samples/XCT.Sample/Pages/Effects/CornerRadiusEffectPage.xaml.cs

@@ -0,0 +1,27 @@
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Sample.Pages.Effects
+{
+	public partial class CornerRadiusEffectPage
+	{
+		public CornerRadiusEffectPage()
+		{
+			InitializeComponent();
+
+			SliderCornerRadiusTopLeft.ValueChanged += OnCornerRadiusValueChanged;
+			SliderCornerRadiusTopRight.ValueChanged += OnCornerRadiusValueChanged;
+			SliderCornerRadiusBottomLeft.ValueChanged += OnCornerRadiusValueChanged;
+			SliderCornerRadiusBottomRight.ValueChanged += OnCornerRadiusValueChanged;
+		}
+
+		void OnCornerRadiusValueChanged(object sender, ValueChangedEventArgs e)
+		{
+			CornerRadius = new CornerRadius(
+				SliderCornerRadiusTopLeft.Value, SliderCornerRadiusTopRight.Value,
+				SliderCornerRadiusBottomLeft.Value, SliderCornerRadiusBottomRight.Value);
+			OnPropertyChanged(nameof(CornerRadius));
+		}
+
+		public CornerRadius CornerRadius { get; private set; } = new (10);
+	}
+}

samples/XCT.Sample/ViewModels/Converters/ConvertersGalleryViewModel.cs

@@ -119,6 +119,10 @@ protected override IEnumerable<SectionModel> CreateItems() => new[]
 				typeof(ColorsConverterPage),
 				"Colors converters",
 				"A group of converters that convert a Color to your strings values (RGB, HEX, HSL, etc)"),
+			new SectionModel(
+				typeof(UtcDateTimeToLocalStringConverterPage),
+				nameof(UtcDateTimeToLocalStringConverter),
+				"A converter that allows you to convert either a DateTimeOffset or DateTime from UTC into the local time string value with the provided datetime format."),
 		};
 	}
 }

samples/XCT.Sample/ViewModels/Converters/UtcDateTimeToLocalStringConverterViewModel.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace Xamarin.CommunityToolkit.Sample.ViewModels.Converters
+{
+	public class UtcDateTimeToLocalStringConverterViewModel : BaseViewModel
+	{
+		DateTime utcDateTime = DateTime.Now.ToUniversalTime();
+
+		public DateTime UtcDateTime
+		{
+			get => utcDateTime;
+			set => SetProperty(ref utcDateTime, value);
+		}
+
+		DateTimeOffset utcDateTimeOffset = DateTimeOffset.Now.ToUniversalTime();
+
+		public DateTimeOffset UtcDateTimeOffset
+		{
+			get => utcDateTimeOffset;
+			set => SetProperty(ref utcDateTimeOffset, value);
+		}
+	}
+}

samples/XCT.Sample/ViewModels/Effects/EffectsGalleryViewModel.cs

@@ -50,6 +50,11 @@ protected override IEnumerable<SectionModel> CreateItems() => new[]
 				"The SemanticEffect allows you to set semantic properties for accessibility."),
 
 			new SectionModel(
+				typeof(CornerRadiusEffectPage),
+				nameof(CornerRadiusEffect),
+				"The CornerRadius allows rounded corners everywhere."),
+
+      new SectionModel(
 				typeof(StatusBarEffectPage),
 				nameof(StatusBarEffect),
 				"The StatusBar allows to change status bar color and style. This page also demonstrates Android only NavigationBar changes.")

src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Converters/MathExpressionConverter_Tests.cs

@@ -38,6 +38,27 @@ public void MathExpressionConverter_ReturnsCorrectResult(
 			}
 		}
 
+		[TestCase("min(max(4+x, 5), 10)", 2d, 6d)]
+		public void MathExpressionConverter_ExpressionProperty_ReturnsCorrectResult(
+			string expression, double x, double expectedResult)
+		{
+			var mathExpressionConverter = new MathExpressionConverter
+			{
+				Expression = expression
+			};
+
+			var result = mathExpressionConverter.Convert(x, type, null, cultureInfo);
+
+			if (result == null)
+			{
+				Assert.Fail();
+			}
+			else
+			{
+				Assert.IsTrue(Math.Abs((double)result - expectedResult) < tolerance);
+			}
+		}
+
 		[TestCase("x + x1 * x1", new object[] { 2d, 1d }, 3d)]
 		[TestCase("(x1 + x) * x1", new object[] { 2d, 3d }, 15d)]
 		[TestCase("3 + x * x1 / (1 - 5)^x1", new object[] { 4d, 2d }, 3.5d)]
@@ -59,6 +80,27 @@ public void MathExpressionConverter_WithMultiplyVariable_ReturnsCorrectResult(
 			}
 		}
 
+		[TestCase("x + x1 * x1", new object[] { 2d, 1d }, 3d)]
+		public void MathExpressionConverter_WithMultiplyVariable_ExpressionProperty_ReturnsCorrectResult(
+			string expression, object[] variables, double expectedResult)
+		{
+			var mathExpressionConverter = new MultiMathExpressionConverter
+			{
+				Expression = expression
+			};
+
+			var result = mathExpressionConverter.Convert(variables, type, null, cultureInfo);
+
+			if (result == null)
+			{
+				Assert.Fail();
+			}
+			else
+			{
+				Assert.IsTrue(Math.Abs((double)result - expectedResult) < tolerance);
+			}
+		}
+
 		[TestCase("1 + 3 + 5 + (3 - 2))")]
 		[TestCase("1 + 2) + (9")]
 		[TestCase("100 + pow(2)")]