diff --git a/maui/samples/Gallery/SampleList/CartesianChartSamplesList.xml b/maui/samples/Gallery/SampleList/CartesianChartSamplesList.xml
index 422c3557..b6612407 100644
--- a/maui/samples/Gallery/SampleList/CartesianChartSamplesList.xml
+++ b/maui/samples/Gallery/SampleList/CartesianChartSamplesList.xml
@@ -57,7 +57,7 @@
-
+
@@ -166,14 +166,15 @@
-
+
+
-
+
diff --git a/maui/samples/Gallery/SampleList/CircularChartSamplesList.xml b/maui/samples/Gallery/SampleList/CircularChartSamplesList.xml
index 006b4ee1..e48d772e 100644
--- a/maui/samples/Gallery/SampleList/CircularChartSamplesList.xml
+++ b/maui/samples/Gallery/SampleList/CircularChartSamplesList.xml
@@ -1,7 +1,7 @@
-
+
@@ -12,12 +12,17 @@
-
+
+
diff --git a/maui/samples/Gallery/SampleList/PickerSamplesList.xml b/maui/samples/Gallery/SampleList/PickerSamplesList.xml
index c1960833..edc44ab5 100644
--- a/maui/samples/Gallery/SampleList/PickerSamplesList.xml
+++ b/maui/samples/Gallery/SampleList/PickerSamplesList.xml
@@ -5,32 +5,36 @@
-
+
-
+
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/Cards/GettingStarted/View/CardView.xaml b/maui/samples/Gallery/Samples/Cards/GettingStarted/View/CardView.xaml
index bdd03e3e..1d6050eb 100644
--- a/maui/samples/Gallery/Samples/Cards/GettingStarted/View/CardView.xaml
+++ b/maui/samples/Gallery/Samples/Cards/GettingStarted/View/CardView.xaml
@@ -31,12 +31,11 @@
Grid.Column="{OnPlatform Default=0, WinUI=1, MacCatalyst=1}"
VerticalOptions="{OnPlatform Default=Center, WinUI=Center, MacCatalyst=Center}"
WidthRequest="{OnPlatform WinUI=400, MacCatalyst=450, Default=350}"
- HeightRequest="{OnPlatform MacCatalyst=700}"
HorizontalOptions="{OnPlatform WinUI=Center, MacCatalyst=Center, Default=Fill}">
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Annotation/ShapeAnnotationSample.xaml b/maui/samples/Gallery/Samples/CartesianChart/Annotation/ShapeAnnotationSample.xaml
index 11ef35ca..457b020e 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Annotation/ShapeAnnotationSample.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Annotation/ShapeAnnotationSample.xaml
@@ -15,7 +15,7 @@
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Annotation/ViewAnnotationSample.xaml b/maui/samples/Gallery/Samples/CartesianChart/Annotation/ViewAnnotationSample.xaml
index 18c82624..97335334 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Annotation/ViewAnnotationSample.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Annotation/ViewAnnotationSample.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.ViewAnnotationSample"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:AnnotationViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaChart.xaml
index ec9fbf97..2dfdf9be 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.AreaChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:AreaSeriesViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaChart_DynamicUpdate.xaml b/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaChart_DynamicUpdate.xaml
index 8bc2b212..7cbcf784 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaChart_DynamicUpdate.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaChart_DynamicUpdate.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.AreaChart_DynamicUpdate"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DynamicAnimationViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaSeriesViewModel.cs b/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaSeriesViewModel.cs
index 24fa7c76..3863fe15 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaSeriesViewModel.cs
+++ b/maui/samples/Gallery/Samples/CartesianChart/AreaChart/AreaSeriesViewModel.cs
@@ -25,7 +25,7 @@ public AreaSeriesViewModel()
new ChartDataModel("2012", 3.126, 2.69, 2.44, 2.16),
new ChartDataModel("2013", 3.34, 3.01, 2.77, 2.51),
new ChartDataModel("2014", 3.58, 3.22, 2.91, 2.61),
- ];
+ ];
}
}
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Axis/AxisCrossing.xaml b/maui/samples/Gallery/Samples/CartesianChart/Axis/AxisCrossing.xaml
index b5849c83..0b84843c 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Axis/AxisCrossing.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Axis/AxisCrossing.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.AxisCrossing"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:NumericalAxisViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Axis/CategoryAxis.xaml b/maui/samples/Gallery/Samples/CartesianChart/Axis/CategoryAxis.xaml
index ef7af10b..74456663 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Axis/CategoryAxis.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Axis/CategoryAxis.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.CategoryAxisChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:CategoryAxisViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeAxis.xaml b/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeAxis.xaml
index 5907cafd..4345ef0e 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeAxis.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeAxis.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.DateTimeAxisChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DateTimeAxisViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeCategoryAxis.xaml b/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeCategoryAxis.xaml
new file mode 100644
index 00000000..69f964c3
--- /dev/null
+++ b/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeCategoryAxis.xaml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeCategoryAxis.xaml.cs b/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeCategoryAxis.xaml.cs
new file mode 100644
index 00000000..32ebf923
--- /dev/null
+++ b/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeCategoryAxis.xaml.cs
@@ -0,0 +1,9 @@
+namespace Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart;
+
+public partial class DateTimeCategoryAxis : SampleView
+{
+ public DateTimeCategoryAxis()
+ {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeCategoryAxisViewModel.cs b/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeCategoryAxisViewModel.cs
new file mode 100644
index 00000000..3da2a97f
--- /dev/null
+++ b/maui/samples/Gallery/Samples/CartesianChart/Axis/DateTimeCategoryAxisViewModel.cs
@@ -0,0 +1,33 @@
+
+using System.Collections.ObjectModel;
+
+namespace Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart
+{
+ public partial class DateTimeCategoryAxisViewModel : BaseViewModel
+ {
+ public ObservableCollection SalesRevenue { get; set; }
+ public ObservableCollection ChartColors { get; set; }
+ public DateTimeCategoryAxisViewModel()
+ {
+ SalesRevenue =
+ [
+ new ChartDataModel() { Date = new DateTime(2017, 12, 24), Value = 40 },
+ new ChartDataModel() { Date = new DateTime(2017, 12, 25), Value = 60 },
+ new ChartDataModel() { Date = new DateTime(2017, 12, 31), Value = 57 },
+ new ChartDataModel() { Date = new DateTime(2018, 01, 01), Value = 64 },
+ new ChartDataModel() { Date = new DateTime(2018, 01, 02), Value = 60 },
+ new ChartDataModel() { Date = new DateTime(2018, 01, 14), Value = 50 },
+ ];
+
+ ChartColors =
+ [
+ new SolidColorBrush(Color.FromArgb("#95DB9C")),
+ new SolidColorBrush(Color.FromArgb("#B95375")),
+ new SolidColorBrush(Color.FromArgb("#56BBAF")),
+ new SolidColorBrush(Color.FromArgb("#606D7F")),
+ new SolidColorBrush(Color.FromArgb("#E99941")),
+ new SolidColorBrush(Color.FromArgb("#327DBE")),
+ ];
+ }
+ }
+}
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Axis/LogarithmicAxis.xaml b/maui/samples/Gallery/Samples/CartesianChart/Axis/LogarithmicAxis.xaml
index 3736ec8d..08a070f2 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Axis/LogarithmicAxis.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Axis/LogarithmicAxis.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.LogarithmicAxisChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:LogarithmicAxisViewModel">
@@ -14,14 +15,15 @@
+
-
+
-
-
+
+
@@ -74,8 +76,8 @@
-
-
+
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Axis/NumericalAxis.xaml b/maui/samples/Gallery/Samples/CartesianChart/Axis/NumericalAxis.xaml
index 630ddd84..35a863c1 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Axis/NumericalAxis.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Axis/NumericalAxis.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.NumericalAxisChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:NumericalAxisViewModel">
@@ -12,16 +13,22 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
@@ -60,7 +67,7 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Bar/BarBackToBack.xaml b/maui/samples/Gallery/Samples/CartesianChart/Bar/BarBackToBack.xaml
index 42ed6fb5..2eeda36d 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Bar/BarBackToBack.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Bar/BarBackToBack.xaml
@@ -3,9 +3,10 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.BarBackToBack"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:BarSeriesViewModel">
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Bar/BarChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/Bar/BarChart.xaml
index 84d7d94f..2269da2c 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Bar/BarChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Bar/BarChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.BarChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:BarSeriesViewModel">
@@ -12,13 +13,17 @@
-
-
+
+
-
-
+
+
+
+
+
+ IsTransposed="True" x:Name="Chart1" HorizontalOptions="Fill" VerticalOptions="Fill">
@@ -46,7 +51,7 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_DynamicUpdate.xaml b/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_DynamicUpdate.xaml
index 5c859cac..2deeac77 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_DynamicUpdate.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_DynamicUpdate.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.Bar_DynamicUpdate"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DynamicAnimationViewModel">
@@ -12,7 +13,7 @@
-
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_RoundedEdge.xaml b/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_RoundedEdge.xaml
index b44feded..4931df04 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_RoundedEdge.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_RoundedEdge.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.BarChart_RoundedEdge"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:BarSeriesViewModel">
@@ -12,7 +13,7 @@
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_WidthCustomization.xaml b/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_WidthCustomization.xaml
index fb9e41bf..95d27539 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_WidthCustomization.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Bar/Bar_WidthCustomization.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.Bar_WidthCustomization"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:BarSeriesViewModel">
@@ -12,13 +13,19 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
@@ -47,14 +54,14 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/BoxAndWhisker/BoxAndWhisker.xaml b/maui/samples/Gallery/Samples/CartesianChart/BoxAndWhisker/BoxAndWhisker.xaml
index a469d319..a3737f4f 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/BoxAndWhisker/BoxAndWhisker.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/BoxAndWhisker/BoxAndWhisker.xaml
@@ -4,20 +4,27 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.BoxAndWhisker"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:BoxAndWhiskerViewModel">
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
@@ -35,9 +42,9 @@
ShowOutlier="True"
ShowMedian="True">
-
+
-
+
-
+
@@ -53,7 +60,6 @@
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DynamicAnimationViewModel">
@@ -14,15 +15,15 @@
-
+
-
+
-
+ FontSize="16" HorizontalOptions="Fill" VerticalOptions="Center" HorizontalTextAlignment="Center"
+ LineBreakMode="WordWrap" Padding="0,0,0,5"/>
+
-
+
@@ -42,11 +43,11 @@
SizeValuePath="Size"
EnableTooltip="False" Fill="{AppThemeBinding Light={StaticResource series1Light}, Dark={StaticResource series1Dark}}"
EnableAnimation="True"
- ItemsSource="{Binding DynamicBubbleMotionAnimation}"
+ ItemsSource="{Binding DynamicBubbleMotionAnimation}"
ShowDataLabels="False"
- XBindingPath="Value1" YBindingPath="Value"/>
+ XBindingPath="Value1" YBindingPath="Value"/>
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/BubbleChart/DefaultBubbleChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/BubbleChart/DefaultBubbleChart.xaml
index 8f1ca8e1..50e065dd 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/BubbleChart/DefaultBubbleChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/BubbleChart/DefaultBubbleChart.xaml
@@ -4,7 +4,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.DefaultBubbleChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:CartesianBubbleViewModel">
@@ -13,24 +14,29 @@
-
+
-
+
-
+ FontSize="16" HorizontalOptions="Fill" VerticalOptions="Center" HorizontalTextAlignment="Center"
+ LineBreakMode="WordWrap" Padding="0,0,0,5"/>
+
-
+
-
-
+
+
+
+
+
-
+
+
@@ -41,16 +47,16 @@
-
-
-
-
+
+
+
@@ -72,17 +78,16 @@
PaletteBrushes="{AppThemeBinding Light={StaticResource PaletteBrushesLight}, Dark={StaticResource PaletteBrushesDark}}"
EnableTooltip="True" TooltipTemplate="{StaticResource tooltiptemplate}"
ItemsSource="{Binding GDPGrowthCollection}" ShowDataLabels="False"
- XBindingPath="Value" YBindingPath="High"/>
+ XBindingPath="Value" YBindingPath="High"/>
-
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/BubbleChart/MultipleColorBubbleSeries.xaml b/maui/samples/Gallery/Samples/CartesianChart/BubbleChart/MultipleColorBubbleSeries.xaml
index 60f58406..b52e2691 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/BubbleChart/MultipleColorBubbleSeries.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/BubbleChart/MultipleColorBubbleSeries.xaml
@@ -4,24 +4,29 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.MultipleColorBubbleSeries"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:CartesianBubbleViewModel">
-
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
+
-
+
+
@@ -31,19 +36,19 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -90,7 +95,7 @@
@@ -112,8 +117,8 @@
-
-
+
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Column/ColumnChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/Column/ColumnChart.xaml
index f786f737..e5151f6d 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Column/ColumnChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Column/ColumnChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.ColumnChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:ColumnSeriesViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Column/Column_Customization.xaml b/maui/samples/Gallery/Samples/CartesianChart/Column/Column_Customization.xaml
index fed4e005..fe9c7bf5 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Column/Column_Customization.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Column/Column_Customization.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.Column_Customization"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:ColumnViewModelEXT" >
@@ -12,11 +13,15 @@
-
-
+
+
-
-
+
+
+
+
+
+
@@ -43,7 +48,7 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Column/Column_DynamicUpdate.xaml b/maui/samples/Gallery/Samples/CartesianChart/Column/Column_DynamicUpdate.xaml
index 493d4385..139fc01e 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Column/Column_DynamicUpdate.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Column/Column_DynamicUpdate.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.Column_DynamicUpdate"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DynamicAnimationViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Column/Column_RoundedEdges.xaml b/maui/samples/Gallery/Samples/CartesianChart/Column/Column_RoundedEdges.xaml
index d7bd8ada..0fac9641 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Column/Column_RoundedEdges.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Column/Column_RoundedEdges.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.Column_RoundedEdges"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:ColumnSeriesViewModel">
@@ -43,7 +44,7 @@
+ PaletteBrushes="{AppThemeBinding Light={StaticResource AlterBrushesLight}, Dark={StaticResource AlterBrushesDark}}" XBindingPath="Value" YBindingPath="Size">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Column/Column_WidthCustomization.xaml b/maui/samples/Gallery/Samples/CartesianChart/Column/Column_WidthCustomization.xaml
index 17414439..cde13d6e 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Column/Column_WidthCustomization.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Column/Column_WidthCustomization.xaml
@@ -3,13 +3,18 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.Column_WidthCustomization"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:ColumnSeriesViewModel">
-
-
+
+
-
-
+
+
+
+
+
+
@@ -30,7 +35,7 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/DataLabel/DataLabelTemplate.xaml b/maui/samples/Gallery/Samples/CartesianChart/DataLabel/DataLabelTemplate.xaml
index 7e3eeaee..f47a4fa3 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/DataLabel/DataLabelTemplate.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/DataLabel/DataLabelTemplate.xaml
@@ -3,16 +3,22 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.DataLabelTemplate"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DataLabelViewModel">
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
@@ -22,10 +28,10 @@
@@ -60,18 +66,18 @@
+ ShowDataLabels="True"
+ ItemsSource="{Binding RevenueCollection}"
+ XBindingPath="Year"
+ YBindingPath="TotalGrossInBillion"
+ LabelTemplate="{StaticResource labelTemplate}">
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/EmptyPoints/EmptyPointSupport.xaml b/maui/samples/Gallery/Samples/CartesianChart/EmptyPoints/EmptyPointSupport.xaml
index 65ef4f83..68467f7b 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/EmptyPoints/EmptyPointSupport.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/EmptyPoints/EmptyPointSupport.xaml
@@ -4,7 +4,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.EmptyPointSupport"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:EmptyPointViewModel">
@@ -104,9 +105,8 @@
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:ErrorBarViewModel">
@@ -12,15 +13,15 @@
-
+
-
+
-
+
-
@@ -38,16 +39,14 @@
-
-
+
+
@@ -66,23 +65,22 @@
-
+
-
+
-
+
-
-
+
@@ -139,7 +135,7 @@
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/ErrorBar/ErrorBarChart.xaml.cs b/maui/samples/Gallery/Samples/CartesianChart/ErrorBar/ErrorBarChart.xaml.cs
index f9dee264..7cb7d26f 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/ErrorBar/ErrorBarChart.xaml.cs
+++ b/maui/samples/Gallery/Samples/CartesianChart/ErrorBar/ErrorBarChart.xaml.cs
@@ -16,9 +16,11 @@ public partial class ErrorBarChart : SampleView
#region Public Constructor
- public ErrorBarChart()
- {
- InitializeComponent();
+ public ErrorBarChart()
+ {
+ InitializeComponent();
+ errorBar.HorizontalErrorValue = 1;
+ errorBar.VerticalErrorValue = 5;
}
#endregion
@@ -141,7 +143,20 @@ private void directionPicker_SelectedIndexChanged(object sender, EventArgs e)
}
}
-
+ private void stepper_ValueChanged(object sender, ValueChangedEventArgs e)
+ {
+ var stepper = (Stepper)sender;
+ var selectedValue = stepper.StyleId;
+ switch (selectedValue)
+ {
+ case "horStepper":
+ errorBar.HorizontalErrorValue = stepper.Value;
+ break;
+ case "verStepper":
+ errorBar.VerticalErrorValue = stepper.Value;
+ break;
+ }
+ }
#endregion
diff --git a/maui/samples/Gallery/Samples/CartesianChart/ErrorBar/ErrorBarDefault.xaml b/maui/samples/Gallery/Samples/CartesianChart/ErrorBar/ErrorBarDefault.xaml
index ee6446aa..404f12d6 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/ErrorBar/ErrorBarDefault.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/ErrorBar/ErrorBarDefault.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.ErrorBarDefault"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:ErrorBarViewModel">
@@ -12,19 +13,22 @@
-
+
-
+
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -61,7 +65,7 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/FastLineChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/FastLineChart.xaml
index a8f98476..c3b01d71 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/FastLineChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/FastLineChart.xaml
@@ -3,10 +3,11 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.FastLineChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:FastLineSeriesViewModel">
+ VerticalOptions="Fill">
@@ -39,13 +40,13 @@
+ EnablePanning="True"/>
+ EnableAntiAliasing="True"
+ XBindingPath="Date" YBindingPath="Value"/>
diff --git a/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/RealTimeChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/RealTimeChart.xaml
index be12b05f..65de40d5 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/RealTimeChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/RealTimeChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.RealTimeChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:RealTimeChartViewModel">
@@ -14,7 +15,7 @@
+ VerticalOptions="Fill">
@@ -44,8 +45,8 @@
+ EnableAntiAliasing="True"
+ XBindingPath="Value" YBindingPath="Size">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/VerticalLiveChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/VerticalLiveChart.xaml
index 732c33ff..5369c030 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/VerticalLiveChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/FastLineChart/VerticalLiveChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.VerticalLiveChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:RealTimeVerticalChartViewModel">
@@ -13,8 +14,8 @@
+ x:Name="verticalLiveChart"
+ PaletteBrushes="{AppThemeBinding Light={StaticResource PaletteBrushesLight}, Dark={StaticResource PaletteBrushesDark}}" VerticalOptions="Fill">
@@ -42,8 +43,8 @@
+ EnableAntiAliasing="True"
+ XBindingPath="Value" YBindingPath="Size"/>
diff --git a/maui/samples/Gallery/Samples/CartesianChart/FastScatterChart/FastScatterChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/FastScatterChart/FastScatterChart.xaml
index f2b60578..8a86eb52 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/FastScatterChart/FastScatterChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/FastScatterChart/FastScatterChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.FastScatterChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:FastScatterSeriesViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/CandleChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/CandleChart.xaml
index 9d9c6e72..dc5dd1e8 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/CandleChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/CandleChart.xaml
@@ -4,16 +4,21 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.CandleChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:FinancialViewModel">
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
@@ -38,7 +43,6 @@
Low="Low"
Close="Size"
EnableTooltip="True"
- EnableSolidCandle="{Binding Source={x:Reference checkBox},Path=IsChecked}"
EnableAnimation="True">
@@ -46,7 +50,7 @@
-
+
-
+
-
-
+
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/CandleChart.xaml.cs b/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/CandleChart.xaml.cs
index 347a385b..359dc62b 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/CandleChart.xaml.cs
+++ b/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/CandleChart.xaml.cs
@@ -50,5 +50,14 @@ public override void OnAppearing()
YAxis.Title = new ChartAxisTitle() { Text = "Index Price" };
}
}
+
+ private void checkBox_CheckedChanged(object sender, CheckedChangedEventArgs e)
+ {
+ var checkBox = (CheckBox)sender;
+ if (ViewModel != null)
+ {
+ Candle.EnableSolidCandle = checkBox.IsChecked;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/OHLC.xaml b/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/OHLC.xaml
index 976ba194..9855e02b 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/OHLC.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/FinancialChart/OHLC.xaml
@@ -4,17 +4,21 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.OHLC"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:FinancialViewModel">
-
-
+
+
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -44,7 +48,7 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/HistogramChart/HistogramChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/HistogramChart/HistogramChart.xaml
index e19c14fd..4f486608 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/HistogramChart/HistogramChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/HistogramChart/HistogramChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.HistogramChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:HistogramSeriesViewModel">
@@ -12,30 +13,33 @@
-
-
+
+
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
+
+
-
+
@@ -50,11 +54,10 @@
-
-
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/HistogramChart/HistogramChart.xaml.cs b/maui/samples/Gallery/Samples/CartesianChart/HistogramChart/HistogramChart.xaml.cs
index 0f416a1a..a38ad072 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/HistogramChart/HistogramChart.xaml.cs
+++ b/maui/samples/Gallery/Samples/CartesianChart/HistogramChart/HistogramChart.xaml.cs
@@ -21,6 +21,14 @@ public override void OnAppearing()
}
}
+ private void checkBox_CheckedChanged(object sender, CheckedChangedEventArgs e)
+ {
+ var checkBox = (CheckBox)sender;
+ if (viewModel != null)
+ {
+ series.ShowNormalDistributionCurve = checkBox.IsChecked;
+ }
+ }
public override void OnDisappearing()
{
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Interactions/AutoScrolling.xaml b/maui/samples/Gallery/Samples/CartesianChart/Interactions/AutoScrolling.xaml
index 757ac820..544f2657 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Interactions/AutoScrolling.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Interactions/AutoScrolling.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.AutoScrolling"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:AutoScrollingViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Interactions/TapToAdd.xaml b/maui/samples/Gallery/Samples/CartesianChart/Interactions/TapToAdd.xaml
index 7f56ff7e..1d123ac4 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Interactions/TapToAdd.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Interactions/TapToAdd.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.TapToAdd"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:TapToAddViewModel">
@@ -25,7 +26,7 @@
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Legend/CartesianLegend.xaml b/maui/samples/Gallery/Samples/CartesianChart/Legend/CartesianLegend.xaml
index 76c9ecc7..cfea915e 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Legend/CartesianLegend.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Legend/CartesianLegend.xaml
@@ -3,11 +3,13 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.CartesianLegend"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:converter="clr-namespace:Syncfusion.Maui.ControlsGallery.Converters"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:converter="clr-namespace:Syncfusion.Maui.ControlsGallery.Converters"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ xmlns:core="clr-namespace:Syncfusion.Maui.Toolkit;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:LegendViewModel">
-
+
@@ -21,21 +23,21 @@
-
+
+
-
+
-
+ HorizontalTextAlignment="Start"/>
@@ -43,10 +45,10 @@
-
+
-
-
+
+
@@ -55,10 +57,10 @@
-
+
-
-
+
+
@@ -67,10 +69,10 @@
-
+
-
-
+
+
@@ -79,10 +81,10 @@
-
+
-
-
+
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/LineChart/DashedLineChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/LineChart/DashedLineChart.xaml
index 71481f32..333294eb 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/LineChart/DashedLineChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/LineChart/DashedLineChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.DashedLineChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:LineSeriesViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/LineChart/LineChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/LineChart/LineChart.xaml
index 04f434fa..9eaedb78 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/LineChart/LineChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/LineChart/LineChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.LineChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:LineSeriesViewModel">
@@ -13,7 +14,7 @@
diff --git a/maui/samples/Gallery/Samples/CartesianChart/LineChart/Line_DynamicUpdate.xaml b/maui/samples/Gallery/Samples/CartesianChart/LineChart/Line_DynamicUpdate.xaml
index d4b5e33e..34492941 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/LineChart/Line_DynamicUpdate.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/LineChart/Line_DynamicUpdate.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.Line_DynamicUpdate"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DynamicAnimationViewModel">
@@ -12,7 +13,7 @@
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/NeumorphismUI/NeumorphismColumnChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/NeumorphismUI/NeumorphismColumnChart.xaml
index 7a75a8c6..f5545da4 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/NeumorphismUI/NeumorphismColumnChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/NeumorphismUI/NeumorphismColumnChart.xaml
@@ -6,7 +6,8 @@
xmlns:control="clr-namespace:Syncfusion.Maui.ControlsGallery.CustomView;assembly=Syncfusion.Maui.ControlsGallery"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery" Margin="-10" BackgroundColor="#F5F5F5"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:NeumorphismViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/HorizontalPlotBand.xaml b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/HorizontalPlotBand.xaml
index 20d597c1..9bececda 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/HorizontalPlotBand.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/HorizontalPlotBand.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.HorizontalPlotBand"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:PlotBandViewModel">
@@ -12,14 +13,15 @@
-
+
+
-
-
-
+
+
+
@@ -30,7 +32,7 @@
-
+
@@ -72,7 +74,7 @@
-
diff --git a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/HorizontalPlotBandWindows.xaml b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/HorizontalPlotBandWindows.xaml
index cb63e74d..bb0dc1a4 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/HorizontalPlotBandWindows.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/HorizontalPlotBandWindows.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.HorizontalPlotBandWindows"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:PlotBandViewModel">
@@ -12,14 +13,15 @@
-
+
+
-
-
-
+
+
+
@@ -31,7 +33,7 @@
+ VerticalOptions="Center" FontSize="16" LineBreakMode="WordWrap"/>
@@ -71,7 +73,7 @@
-
diff --git a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/PlotBandRecurrence.xaml b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/PlotBandRecurrence.xaml
index f49beb8a..01ffa859 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/PlotBandRecurrence.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/PlotBandRecurrence.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.PlotBandRecurrence"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:PlotBandRecurrenceViewModel">
@@ -12,13 +13,18 @@
-
+
-
+
-
-
-
+
+
+
+
+
+
+
@@ -27,7 +33,7 @@
+ VerticalOptions="Center" FontSize="16" LineBreakMode="WordWrap" Margin="2,0,2,0"/>
@@ -39,8 +45,7 @@
AutoScrollingDelta="{OnPlatform iOS=4, Android=4}" AutoScrollingMode="Start">
-
+
@@ -50,8 +55,8 @@
-
+
@@ -85,7 +90,7 @@
-
+
-
+
@@ -101,11 +106,11 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/PlotBandRecurrence.xaml.cs b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/PlotBandRecurrence.xaml.cs
index 3bc0b0d2..8f615e37 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/PlotBandRecurrence.xaml.cs
+++ b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/PlotBandRecurrence.xaml.cs
@@ -1,16 +1,47 @@
namespace Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart
{
- public partial class PlotBandRecurrence : SampleView
- {
- public PlotBandRecurrence()
+ public partial class PlotBandRecurrence : SampleView
+ {
+ public PlotBandRecurrence()
+ {
+ InitializeComponent();
+ InitializePlatBandValues();
+
+ }
+
+ #region InitializePlatBandValues
+
+ private void InitializePlatBandValues()
{
- InitializeComponent();
+ dateTimePlotBand.IsVisible = false;
+ numericalPlotBand.IsVisible = true;
}
+
+ #endregion
public override void OnDisappearing()
+ {
+ base.OnDisappearing();
+ plotBandRecurrenceChart.Handler?.DisconnectHandler();
+ }
+
+ private void axis_CheckedChanged(object sender, CheckedChangedEventArgs e)
{
- base.OnDisappearing();
- plotBandRecurrenceChart.Handler?.DisconnectHandler();
+ var checkBox = (CheckBox)sender;
+ if (ViewModel != null)
+ {
+ var input = checkBox.StyleId;
+ switch (input)
+ {
+ case "xAxis":
+ dateTimePlotBand.IsVisible = checkBox.IsChecked;
+ break;
+ case "yAxis":
+ numericalPlotBand.IsVisible = checkBox.IsChecked;
+ break;
+
+ }
+ }
}
}
}
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/VerticalPlotBand.xaml b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/VerticalPlotBand.xaml
index 0d50b0c0..5554913b 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/VerticalPlotBand.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/VerticalPlotBand.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.VerticalPlotBand"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:PlotBandViewModel">
@@ -12,14 +13,15 @@
-
+
+
-
-
-
+
+
+
@@ -31,7 +33,7 @@
+ VerticalOptions="Center" FontSize="16" LineBreakMode="WordWrap"/>
diff --git a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/VerticalPlotBandWindows.xaml b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/VerticalPlotBandWindows.xaml
index 49f8faf9..33a72a2e 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/PlotBand/VerticalPlotBandWindows.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/PlotBand/VerticalPlotBandWindows.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.VerticalPlotBandWindows"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:PlotBandViewModel">
@@ -12,15 +13,16 @@
-
-
+
+
+
-
-
-
+
+
+
@@ -32,7 +34,7 @@
+ VerticalOptions="Center" FontSize="16" LineBreakMode="WordWrap"/>
diff --git a/maui/samples/Gallery/Samples/CartesianChart/RangeAreaChart/RangeAreaChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/RangeAreaChart/RangeAreaChart.xaml
index 3d2c505b..b575db2c 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/RangeAreaChart/RangeAreaChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/RangeAreaChart/RangeAreaChart.xaml
@@ -3,19 +3,26 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.RangeAreaChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:RangeAreaSeriesViewModel">
-
+
+
+
+
+
+
-
+
-
+
-
+
+
@@ -24,9 +31,9 @@
-
-
-
+
+
+
@@ -61,7 +68,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/RangeBar/DefaultRangeBar.xaml b/maui/samples/Gallery/Samples/CartesianChart/RangeBar/DefaultRangeBar.xaml
index ffa0ed05..df4b01b0 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/RangeBar/DefaultRangeBar.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/RangeBar/DefaultRangeBar.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.DefaultRangeBar"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:RangeBarSerieViewModel">
@@ -12,19 +13,24 @@
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
@@ -65,7 +71,7 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/RangeBar/RangeBarAnimation.xaml b/maui/samples/Gallery/Samples/CartesianChart/RangeBar/RangeBarAnimation.xaml
index 4d0ae3c7..4546dc69 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/RangeBar/RangeBarAnimation.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/RangeBar/RangeBarAnimation.xaml
@@ -4,7 +4,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.RangeBarAnimation"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DynamicAnimationViewModel">
@@ -13,15 +14,15 @@
-
+
-
+
-
+
-
@@ -36,12 +37,12 @@
-
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/RangeColumn/DefaultRangeColumn.xaml b/maui/samples/Gallery/Samples/CartesianChart/RangeColumn/DefaultRangeColumn.xaml
index 3d35011f..5cfd1654 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/RangeColumn/DefaultRangeColumn.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/RangeColumn/DefaultRangeColumn.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.DefaultRangeColumn"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:RangeColumnSerieViewModel">
@@ -12,19 +13,24 @@
-
+
-
+
-
+
-
+
-
+ FontSize="16" HorizontalOptions="Fill" VerticalOptions="Center" HorizontalTextAlignment="Center"
+ LineBreakMode="WordWrap" Padding="0,0,0,5"/>
+
-
+
+
+
+
+
@@ -64,7 +70,7 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/RangeColumn/RangeColumnAnimation.xaml b/maui/samples/Gallery/Samples/CartesianChart/RangeColumn/RangeColumnAnimation.xaml
index 240cd8eb..0bc41122 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/RangeColumn/RangeColumnAnimation.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/RangeColumn/RangeColumnAnimation.xaml
@@ -4,7 +4,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.RangeColumnAnimation"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DynamicAnimationViewModel">
@@ -13,15 +14,15 @@
-
+
-
+
-
+ FontSize="16" HorizontalOptions="Fill" VerticalOptions="Center" HorizontalTextAlignment="Center"
+ LineBreakMode="WordWrap" Padding="0,0,0,5"/>
+
-
@@ -37,10 +38,10 @@
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Scatter/ScatterChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/Scatter/ScatterChart.xaml
index c88dbdc0..e68b48e9 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Scatter/ScatterChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Scatter/ScatterChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.ScatterChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:ScatterSeriesViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Scatter/Scatter_DynamicUpdate.xaml b/maui/samples/Gallery/Samples/CartesianChart/Scatter/Scatter_DynamicUpdate.xaml
index 12f4587a..ba189899 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Scatter/Scatter_DynamicUpdate.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Scatter/Scatter_DynamicUpdate.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.Scatter_DynamicUpdate"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DynamicAnimationViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Selection/Selection.xaml b/maui/samples/Gallery/Samples/CartesianChart/Selection/Selection.xaml
index 0cdd425c..bbf20be8 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Selection/Selection.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Selection/Selection.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.Selection"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:SelectionViewModel">
@@ -13,15 +14,16 @@
-
+
+
-
-
-
+
+
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Selection/Selection.xaml.cs b/maui/samples/Gallery/Samples/CartesianChart/Selection/Selection.xaml.cs
index 1b019f8e..0701b209 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Selection/Selection.xaml.cs
+++ b/maui/samples/Gallery/Samples/CartesianChart/Selection/Selection.xaml.cs
@@ -27,9 +27,15 @@ public class SelectionValueConverter : IValueConverter
{
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
- if (value != null)
+
+ if (value is ChartDataModel model && parameter != null)
{
- return ((DateTime)value).ToString("ddd-hh:mm");
+ string? param = parameter?.ToString();
+
+ if (param == "Date")
+ {
+ return model.Date.ToString("ddd-hh:mm");
+ }
}
return null;
}
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Selection/SeriesSelection.xaml b/maui/samples/Gallery/Samples/CartesianChart/Selection/SeriesSelection.xaml
index aa393edd..27102113 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Selection/SeriesSelection.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Selection/SeriesSelection.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.SeriesSelection"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:SeriesSelectionViewModel">
@@ -12,13 +13,13 @@
-
+
-
+
@@ -82,7 +83,7 @@
-
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StackedArea/StackedAreaChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StackedArea/StackedAreaChart.xaml
index e8f9e5d2..34b27344 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StackedArea/StackedAreaChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StackedArea/StackedAreaChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StackedAreaChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StackedAreaViewModel">
@@ -12,17 +13,18 @@
-
+
-
+
+
-
+
-
-
+
+
@@ -30,10 +32,10 @@
-
+
-
-
+
+
@@ -41,10 +43,10 @@
-
+
-
-
+
+
@@ -52,10 +54,10 @@
-
+
-
-
+
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StackedArea100/StackedArea100Chart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StackedArea100/StackedArea100Chart.xaml
index 72453808..b739b51d 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StackedArea100/StackedArea100Chart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StackedArea100/StackedArea100Chart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StackedArea100Chart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StackedArea100ViewModel">
@@ -12,21 +13,26 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
-
+
-
-
+
+
@@ -34,10 +40,10 @@
-
+
-
-
+
+
@@ -45,10 +51,10 @@
-
+
-
-
+
+
@@ -56,10 +62,10 @@
-
+
-
-
+
+
@@ -122,7 +128,7 @@
EnableTooltip="True"
TooltipTemplate="{StaticResource template4}"/>
-
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/GroupingStackedColumn.xaml b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/GroupingStackedColumn.xaml
index a4435776..038d0cfd 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/GroupingStackedColumn.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/GroupingStackedColumn.xaml
@@ -3,16 +3,17 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.GroupingStackedColumn"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StackedColumnViewModel">
+ FontSize="16" HorizontalOptions="Fill" VerticalOptions="Center" HorizontalTextAlignment="Center"
+ LineBreakMode="WordWrap" Padding="0,0,0,5"/>
-
+
@@ -41,7 +42,7 @@
EnableTooltip="True"
Fill="#45D669"
Spacing="0.07"
- LegendIcon="SeriesType"
+ LegendIcon="SeriesType"
GroupingLabel="GroupOne"
Label="Forecast Labor Cost"/>
@@ -53,7 +54,7 @@
Fill="#6EDE8A"
Spacing="0.07"
LegendIcon="SeriesType"
- GroupingLabel="GroupOne"
+ GroupingLabel="GroupOne"
Label="Forecast Material Cost"/>
@@ -63,9 +64,9 @@
EnableAnimation="True"
EnableTooltip="True"
Fill="#B7EFC5"
- Spacing="0.07"
+ Spacing="0.07"
LegendIcon="SeriesType"
- GroupingLabel="GroupOne"
+ GroupingLabel="GroupOne"
Label="Forecast Misc Cost"/>
@@ -75,9 +76,9 @@
EnableAnimation="True"
EnableTooltip="True"
Fill="#D65F45"
- LegendIcon="SeriesType"
+ LegendIcon="SeriesType"
Spacing="0.07"
- GroupingLabel="GroupTwo"
+ GroupingLabel="GroupTwo"
Label="Actual Labor Cost"/>
@@ -97,9 +98,9 @@
EnableAnimation="True"
EnableTooltip="True"
Fill="#EFC4B7"
- LegendIcon="SeriesType"
- Spacing="0.07"
- GroupingLabel="GroupTwo"
+ LegendIcon="SeriesType"
+ Spacing="0.07"
+ GroupingLabel="GroupTwo"
Label="Actual Misc Cost"/>
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/StackedBar.xaml b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/StackedBar.xaml
index 7452129d..848672e3 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/StackedBar.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/StackedBar.xaml
@@ -3,20 +3,26 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StackedBar"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StackedColumnViewModel">
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
-
+
@@ -67,7 +73,7 @@
LegendIcon="SeriesType"/>
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/StackedColumnChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/StackedColumnChart.xaml
index ad169308..998a2e76 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/StackedColumnChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn/StackedColumnChart.xaml
@@ -4,7 +4,8 @@
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
xmlns:converter="clr-namespace:Syncfusion.Maui.ControlsGallery.Converters;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StackedColumnViewModel">
@@ -12,9 +13,10 @@
+
-
-
-
-
+
+
-
-
+
+
+
+
+
+
@@ -76,7 +82,7 @@
TooltipTemplate="{StaticResource tooltipTemplate}"
LegendIcon="SeriesType"/>
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/GroupingStackedColumn100.xaml b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/GroupingStackedColumn100.xaml
index 9156d67d..93849709 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/GroupingStackedColumn100.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/GroupingStackedColumn100.xaml
@@ -4,20 +4,26 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.GroupingStackedColumn100"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StackedColumn100ViewModel">
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -111,8 +117,8 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/StackedBar100Chart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/StackedBar100Chart.xaml
index 066c09fe..e50d4451 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/StackedBar100Chart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/StackedBar100Chart.xaml
@@ -4,14 +4,18 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StackedBar100Chart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StackedColumn100ViewModel">
-
-
+
+
-
-
-
+
+
+
+
+
+
@@ -67,8 +71,8 @@
LegendIcon="Rectangle"/>
-
-
+
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/StackedColumn100Chart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/StackedColumn100Chart.xaml
index 1de1e950..2a91fa7d 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/StackedColumn100Chart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StackedColumn100/StackedColumn100Chart.xaml
@@ -4,7 +4,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StackedColumn100Chart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StackedColumn100ViewModel">
@@ -13,12 +14,15 @@
-
-
+
+
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StackedLine/StackedLineChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StackedLine/StackedLineChart.xaml
index bcbeccce..823d1249 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StackedLine/StackedLineChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StackedLine/StackedLineChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StackedLineChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StackedLineViewModel">
@@ -14,23 +15,27 @@
-
+
-
+
-
-
-
+
+
+
+
+
+
-
+
+
-
+
-
-
+
+
@@ -38,10 +43,10 @@
-
+
-
-
+
+
@@ -49,10 +54,10 @@
-
+
-
-
+
+
@@ -60,10 +65,10 @@
-
+
-
-
+
+
@@ -131,8 +136,8 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StackedLine100/StackedLine100Chart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StackedLine100/StackedLine100Chart.xaml
index e3278936..b754ec0e 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StackedLine100/StackedLine100Chart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StackedLine100/StackedLine100Chart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StackedLine100Chart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StackedLine100ViewModel">
@@ -14,26 +15,30 @@
-
+
-
+
-
-
-
+
+
+
+
+
+
-
+
+
-
+
-
+
@@ -41,15 +46,15 @@
-
+
-
+
@@ -57,15 +62,15 @@
-
+
-
+
@@ -73,15 +78,15 @@
-
+
-
+
@@ -158,8 +163,8 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StepAreaChart/StepAreaChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StepAreaChart/StepAreaChart.xaml
index 7128cab9..7c482860 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StepAreaChart/StepAreaChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StepAreaChart/StepAreaChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StepAreaChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StepAreaSeriesViewModel">
@@ -13,33 +14,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -47,10 +49,10 @@
-
+
-
-
+
+
@@ -85,6 +87,6 @@
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StepAreaChart/StepAreaChart_DynamicUpdate.xaml b/maui/samples/Gallery/Samples/CartesianChart/StepAreaChart/StepAreaChart_DynamicUpdate.xaml
index 746c1960..27f9e9c9 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StepAreaChart/StepAreaChart_DynamicUpdate.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StepAreaChart/StepAreaChart_DynamicUpdate.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StepAreaChart_DynamicUpdate"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DynamicAnimationViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/DashedStepLineChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/DashedStepLineChart.xaml
index 2f297064..5f386969 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/DashedStepLineChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/DashedStepLineChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.DashedStepLineChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StepLineChartViewModel">
@@ -14,16 +15,21 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
6
3
@@ -35,10 +41,10 @@
-
+
-
-
+
+
@@ -75,7 +81,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/StepLineChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/StepLineChart.xaml
index 9313d076..9d38f1cd 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/StepLineChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/StepLineChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StepLineChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StepLineChartViewModel">
@@ -12,11 +13,15 @@
-
-
+
+
-
-
+
+
+
+
+
+
@@ -59,7 +64,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/StepLine_DynamicUpdate.xaml b/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/StepLine_DynamicUpdate.xaml
index 0a905b76..92e8d738 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/StepLine_DynamicUpdate.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/StepLine_DynamicUpdate.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.StepLine_DynamicUpdate"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DynamicAnimationViewModel">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/VerticalStepLineChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/VerticalStepLineChart.xaml
index 206adbfb..c153940f 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/VerticalStepLineChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/StepLineChart/VerticalStepLineChart.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.VerticalStepLineChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:StepLineChartViewModel">
@@ -13,11 +14,15 @@
-
-
+
+
-
-
+
+
+
+
+
+
@@ -27,15 +32,16 @@
+
-
+
-
-
+
+
@@ -43,10 +49,10 @@
-
+
-
-
+
+
@@ -94,7 +100,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Tooltip/CartesianTooltip.xaml b/maui/samples/Gallery/Samples/CartesianChart/Tooltip/CartesianTooltip.xaml
index b978d652..f8c4375d 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Tooltip/CartesianTooltip.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Tooltip/CartesianTooltip.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.CartesianTooltip"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:TooltipViewModel">
@@ -12,11 +13,15 @@
-
-
+
+
-
-
+
+
+
+
+
+
@@ -25,17 +30,17 @@
-
-
-
+
+
+
-
-
+
+
@@ -45,8 +50,8 @@
-
-
+
+
@@ -90,7 +95,7 @@
-
+
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Tooltip/TooltipViewModel.cs b/maui/samples/Gallery/Samples/CartesianChart/Tooltip/TooltipViewModel.cs
index 7bfaa8f3..be06ecf8 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Tooltip/TooltipViewModel.cs
+++ b/maui/samples/Gallery/Samples/CartesianChart/Tooltip/TooltipViewModel.cs
@@ -23,32 +23,4 @@ public TooltipViewModel()
];
}
}
-
- public class TooltipValuesConverter : IValueConverter
- {
- public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
- {
- if (value is ChartDataModel model)
- {
- var param = parameter?.ToString();
-
- switch (param)
- {
- case "Value":
- return $": {model.Value}M";
- case "Size":
- return $": {model.Size}M";
- case "Value1":
- return model.Value1;
- }
- }
-
- return value;
- }
-
- public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
- {
- return value;
- }
- }
}
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Trackball/CartesianTrackball.xaml b/maui/samples/Gallery/Samples/CartesianChart/Trackball/CartesianTrackball.xaml
index eb9123b4..7fdd6fbe 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Trackball/CartesianTrackball.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Trackball/CartesianTrackball.xaml
@@ -4,7 +4,8 @@
xmlns:imageExtension="clr-namespace:Syncfusion.Maui.ControlsGallery.Converters;assembly=Syncfusion.Maui.ControlsGallery"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:CartesianTrackballViewModel">
@@ -13,12 +14,17 @@
-
-
+
+
+
+
+
+
+
-
-
+
+
@@ -35,7 +41,7 @@
-
+
@@ -65,7 +71,7 @@
-
@@ -105,8 +111,8 @@
-
-
+
+
@@ -114,7 +120,6 @@
+ public class TooltipValuesConverter : IValueConverter
{
+ public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ if (value is ChartDataModel model)
+ {
+ switch (parameter?.ToString())
+ {
+ case "Name":
+ return model.Name;
+ case "Value":
+ return model.Value;
+ case "High":
+ return model.High;
+ case "Low":
+ return model.Low;
+ case "Size":
+ return model.Size;
+ case "Label":
+ return model.Label;
+ case "Data":
+ return model.Data;
+ case "Date":
+ return model.Date;
+ case "Year":
+ return model.Year;
+ case "Organic":
+ return model.Organic;
+ case "FairTrade":
+ return model.FairTrade;
+ case "VegAlternatives":
+ return model.VegAlternatives;
+ case "Others":
+ return model.Others;
+ case "Value1":
+ return model.Value1;
+ case "GrossLastYearDelta":
+ return model.GrossLastYearDelta;
+ case "Peru":
+ return model.Peru;
+ case "Ethiopia":
+ return model.Ethiopia;
+ case "Mali":
+ return model.Mali;
+ case "Canada":
+ return model.Canada;
+ case "Energy":
+ return model.Energy;
+ case "Department":
+ return model.Department;
+ case "TopMovie":
+ return model.TopMovie;
+ case "TotalGrossInBillion":
+ return model.TotalGrossInBillion;
+
+ }
+ }
+ else if (value is LineSeries series)
+ {
+ switch (parameter?.ToString())
+ {
+ case "Label":
+ return series.Label;
+ case "MarkerSettings.Stroke":
+ return series.MarkerSettings.Stroke;
+
+ }
+ var line = value as LineSeriesExt;
+ switch (parameter?.ToString())
+ {
+ case "PathData":
+ return line?.PathData;
+ }
+ }
+
+ return value;
+ }
+
+ public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ return value;
+ }
+ }
+
+ public class ChartColorModel : ObservableCollection
+ {
}
}
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Waterfall/WaterFallChart.xaml b/maui/samples/Gallery/Samples/CartesianChart/Waterfall/WaterFallChart.xaml
index cc41abcd..1d573386 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Waterfall/WaterFallChart.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Waterfall/WaterFallChart.xaml
@@ -3,13 +3,14 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.WaterFallChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:WaterFallSeriesViewModel">
+ FontSize="16" HorizontalOptions="Fill" VerticalOptions="Center" HorizontalTextAlignment="Center"
+ LineBreakMode="WordWrap" Padding="0,0,0,5"/>
+ SummaryBindingPath="IsSummary" ShowDataLabels="{OnPlatform Android=False,iOS=False,Default=True}" EnableTooltip="{OnPlatform Android=True,iOS=True,Default=False}">
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Waterfall/WaterFallChartIsTransposed.xaml b/maui/samples/Gallery/Samples/CartesianChart/Waterfall/WaterFallChartIsTransposed.xaml
index 214757d4..1f162ea6 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Waterfall/WaterFallChartIsTransposed.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Waterfall/WaterFallChartIsTransposed.xaml
@@ -3,14 +3,15 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.WaterFallChartIsTransposed"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:WaterFallSeriesViewModel">
-
+
@@ -18,7 +19,7 @@
-
+
@@ -29,7 +30,7 @@
+ ShowDataLabels="{OnPlatform Android=False,iOS=False,Default=True}" EnableTooltip="{OnPlatform Android=True,iOS=True,Default=False}">
@@ -51,7 +52,7 @@
-
+
@@ -62,7 +63,7 @@
+ ShowDataLabels="{OnPlatform Android=False,iOS=False,Default=True}" EnableTooltip="{OnPlatform Android=True,iOS=True,Default=False}">
@@ -77,7 +78,7 @@
-
+
@@ -99,8 +100,8 @@
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Zoom/ChartZooming.xaml b/maui/samples/Gallery/Samples/CartesianChart/Zoom/ChartZooming.xaml
index a80a779a..93e6a337 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Zoom/ChartZooming.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Zoom/ChartZooming.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.ChartZooming"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:ZoomViewModel">
@@ -55,8 +56,7 @@
-
+
@@ -72,7 +72,6 @@
-
+
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Zoom/ChartZooming.xaml.cs b/maui/samples/Gallery/Samples/CartesianChart/Zoom/ChartZooming.xaml.cs
index 793d8912..055f09bc 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Zoom/ChartZooming.xaml.cs
+++ b/maui/samples/Gallery/Samples/CartesianChart/Zoom/ChartZooming.xaml.cs
@@ -33,5 +33,15 @@ private void ZoomModeChanged(object sender, EventArgs e)
zoomingBehavior.ZoomMode = ZoomMode.XY;
}
}
+
+ private void checkbox_CheckedChanged(object sender, CheckedChangedEventArgs e)
+ {
+ var checkBox = (CheckBox)sender;
+ if (ViewModel != null && (DeviceInfo.Platform == DevicePlatform.iOS || DeviceInfo.Platform == DevicePlatform.Android))
+ {
+ zoomingBehavior.EnableDirectionalZooming = checkBox.IsChecked;
+ }
+ }
+
}
}
diff --git a/maui/samples/Gallery/Samples/CartesianChart/Zoom/SelectionZooming.xaml b/maui/samples/Gallery/Samples/CartesianChart/Zoom/SelectionZooming.xaml
index ad47653f..25007303 100644
--- a/maui/samples/Gallery/Samples/CartesianChart/Zoom/SelectionZooming.xaml
+++ b/maui/samples/Gallery/Samples/CartesianChart/Zoom/SelectionZooming.xaml
@@ -3,7 +3,8 @@
x:Class="Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart.SelectionZooming"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CartesianChart.SfCartesianChart"
xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:ScatterSeriesViewModel">
diff --git a/maui/samples/Gallery/Samples/CircularChart/Doughnut/CenterElevation.xaml b/maui/samples/Gallery/Samples/CircularChart/Doughnut/CenterElevation.xaml
index 9ccaf410..ef8c47d3 100644
--- a/maui/samples/Gallery/Samples/CircularChart/Doughnut/CenterElevation.xaml
+++ b/maui/samples/Gallery/Samples/CircularChart/Doughnut/CenterElevation.xaml
@@ -3,8 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart.CenterElevation"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart"
- xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DoughnutSeriesViewModel">
@@ -25,7 +26,7 @@
-
+
@@ -34,7 +35,7 @@
-
@@ -42,14 +43,18 @@
-
-
+
diff --git a/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutChart.xaml b/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutChart.xaml
index 566a4876..bd2f63fb 100644
--- a/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutChart.xaml
+++ b/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutChart.xaml
@@ -2,8 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart.DoughnutChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart"
- xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DoughnutSeriesViewModel">
@@ -30,10 +31,14 @@
XBindingPath="Name" YBindingPath="Value" EnableAnimation="False" StrokeWidth="1"
Stroke="{AppThemeBinding Default={StaticResource ContentBackground}}" LegendIcon="SeriesType">
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutChartWithCurvedEdge.xaml b/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutChartWithCurvedEdge.xaml
new file mode 100644
index 00000000..9fc7851e
--- /dev/null
+++ b/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutChartWithCurvedEdge.xaml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutChartWithCurvedEdge.xaml.cs b/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutChartWithCurvedEdge.xaml.cs
new file mode 100644
index 00000000..c2cf32a9
--- /dev/null
+++ b/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutChartWithCurvedEdge.xaml.cs
@@ -0,0 +1,32 @@
+namespace Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart
+{
+ public partial class DoughnutChartWithCurvedEdge : SampleView
+ {
+ public DoughnutChartWithCurvedEdge()
+ {
+ InitializeComponent();
+ pathData.Data = doughnutViewModel.TruckPathData;
+ }
+
+ public override void OnAppearing()
+ {
+ base.OnAppearing();
+ if (IsCardView)
+ {
+ series.ShowDataLabels = false;
+
+#if IOS
+ chart.WidthRequest = 350;
+ chart.HeightRequest = 400;
+ chart.VerticalOptions = LayoutOptions.Start;
+#endif
+ }
+ }
+
+ public override void OnDisappearing()
+ {
+ base.OnDisappearing();
+ chart.Handler?.DisconnectHandler();
+ }
+ }
+}
\ No newline at end of file
diff --git a/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutSeriesViewModel.cs b/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutSeriesViewModel.cs
index 0c562aa6..123a080e 100644
--- a/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutSeriesViewModel.cs
+++ b/maui/samples/Gallery/Samples/CircularChart/Doughnut/DoughnutSeriesViewModel.cs
@@ -1,4 +1,6 @@
using System.Collections.ObjectModel;
+using Microsoft.Maui.Controls.Shapes;
+using Syncfusion.Maui.Toolkit.Charts;
namespace Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart
{
@@ -8,12 +10,15 @@ public partial class DoughnutSeriesViewModel : BaseViewModel
public ObservableCollection SemiCircularData { get; set; }
public ObservableCollection CenterElevationData { get; set; }
public ObservableCollection GroupToData { get; set; }
+ public ObservableCollection CapStyleData { get; set; }
int _selectedIndex = 1;
string _name = "";
int _value1;
int _total = 357580;
+ public Geometry? TruckPathData { get; set; } = (Geometry?) (new PathGeometryConverter().ConvertFromInvariantString("M46.5 22.4813V22.4437C46.503 22.3992 46.4966 22.3545 46.4812 22.3125V22.2562C46.4812 22.2187 46.4625 22.1812 46.4625 22.1437V22.1063L46.425 21.9562H46.4062L43.7812 15.4313C43.5721 14.8602 43.1912 14.3679 42.691 14.0221C42.1907 13.6763 41.5956 13.4939 40.9875 13.5H34.5V12C34.5 11.6022 34.342 11.2206 34.0607 10.9393C33.7794 10.658 33.3978 10.5 33 10.5H4.5C3.70435 10.5 2.94129 10.8161 2.37868 11.3787C1.81607 11.9413 1.5 12.7044 1.5 13.5V34.5C1.5 35.2956 1.81607 36.0587 2.37868 36.6213C2.94129 37.1839 3.70435 37.5 4.5 37.5H6.9375C7.26795 38.7906 8.01855 39.9346 9.07096 40.7515C10.1234 41.5684 11.4177 42.0118 12.75 42.0118C14.0823 42.0118 15.3766 41.5684 16.429 40.7515C17.4814 39.9346 18.232 38.7906 18.5625 37.5H29.4375C29.7679 38.7906 30.5185 39.9346 31.571 40.7515C32.6234 41.5684 33.9177 42.0118 35.25 42.0118C36.5823 42.0118 37.8766 41.5684 38.929 40.7515C39.9814 39.9346 40.732 38.7906 41.0625 37.5H43.5C44.2956 37.5 45.0587 37.1839 45.6213 36.6213C46.1839 36.0587 46.5 35.2956 46.5 34.5V22.5V22.4813ZM34.5 16.5H40.9875L42.7875 21H34.5V16.5ZM4.5 13.5H31.5V25.5H4.5V13.5ZM12.75 39C12.1567 39 11.5766 38.8241 11.0833 38.4944C10.5899 38.1648 10.2054 37.6962 9.97836 37.1481C9.7513 36.5999 9.69189 35.9967 9.80764 35.4147C9.9234 34.8328 10.2091 34.2982 10.6287 33.8787C11.0482 33.4591 11.5828 33.1734 12.1647 33.0576C12.7467 32.9419 13.3499 33.0013 13.898 33.2284C14.4462 33.4554 14.9148 33.8399 15.2444 34.3333C15.5741 34.8266 15.75 35.4067 15.75 36C15.75 36.7956 15.4339 37.5587 14.8713 38.1213C14.3087 38.6839 13.5456 39 12.75 39ZM35.25 39C34.6567 39 34.0766 38.8241 33.5833 38.4944C33.0899 38.1648 32.7054 37.6962 32.4784 37.1481C32.2513 36.5999 32.1919 35.9967 32.3076 35.4147C32.4234 34.8328 32.7091 34.2982 33.1287 33.8787C33.5482 33.4591 34.0828 33.1734 34.6647 33.0576C35.2467 32.9419 35.8499 33.0013 36.398 33.2284C36.9462 33.4554 37.4148 33.8399 37.7444 34.3333C38.074 34.8266 38.25 35.4067 38.25 36C38.25 36.7956 37.9339 37.5587 37.3713 38.1213C36.8087 38.6839 36.0456 39 35.25 39Z"));
+
public int SelectedIndex
{
get { return _selectedIndex; }
@@ -79,7 +84,7 @@ public DoughnutSeriesViewModel()
new ChartDataModel("Facilities", 10),
new ChartDataModel("Taxes", 6),
new ChartDataModel("Insurance", 18)
- ];
+ ];
SemiCircularData =
[
@@ -119,6 +124,13 @@ public DoughnutSeriesViewModel()
new ChartDataModel("Mexico",1.00,0.01),
new ChartDataModel("Luxembourg",0.90,0.01),
];
+
+ CapStyleData=
+ [
+ new ChartDataModel("Delivered", 56),
+ new ChartDataModel("Cancelled", 27),
+ new ChartDataModel("Scheduled", 17),
+ ];
}
}
}
diff --git a/maui/samples/Gallery/Samples/CircularChart/Doughnut/GroupToDoughnutChart.xaml b/maui/samples/Gallery/Samples/CircularChart/Doughnut/GroupToDoughnutChart.xaml
index 750eff1a..819bc53c 100644
--- a/maui/samples/Gallery/Samples/CircularChart/Doughnut/GroupToDoughnutChart.xaml
+++ b/maui/samples/Gallery/Samples/CircularChart/Doughnut/GroupToDoughnutChart.xaml
@@ -2,8 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart.GroupToDoughnutChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart"
- xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
@@ -14,29 +14,33 @@
-
-
+
+
-
-
+
+
+
+
+
+
-
+
-
+
+ TextColor="{AppThemeBinding Default={StaticResource ContentBackground}}" Grid.Column="0"
+ HorizontalOptions="Start" HorizontalTextAlignment="Start"
+ FontSize="Caption"
+ VerticalOptions="Center"/>
+ FontSize="Caption" Grid.Column="2"
+ TextColor="{AppThemeBinding Default={StaticResource ContentBackground}}" FontAttributes="Bold"
+ HorizontalOptions="End" HorizontalTextAlignment="End"
+ VerticalOptions="Center"/>
@@ -44,13 +48,13 @@
-
-
+
+
-
+
@@ -72,7 +76,7 @@
-
+
-
+
@@ -95,10 +99,10 @@
-
-
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:DoughnutSeriesViewModel">
diff --git a/maui/samples/Gallery/Samples/CircularChart/Interaction/Selection.xaml b/maui/samples/Gallery/Samples/CircularChart/Interaction/Selection.xaml
index 29965e74..b20a4c4c 100644
--- a/maui/samples/Gallery/Samples/CircularChart/Interaction/Selection.xaml
+++ b/maui/samples/Gallery/Samples/CircularChart/Interaction/Selection.xaml
@@ -1,9 +1,10 @@
+ xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart"
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:SelectionViewModel">
diff --git a/maui/samples/Gallery/Samples/CircularChart/Interaction/Tooltip.xaml b/maui/samples/Gallery/Samples/CircularChart/Interaction/Tooltip.xaml
index 18317211..3b95272f 100644
--- a/maui/samples/Gallery/Samples/CircularChart/Interaction/Tooltip.xaml
+++ b/maui/samples/Gallery/Samples/CircularChart/Interaction/Tooltip.xaml
@@ -1,9 +1,10 @@
+ xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart"
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:PieSeriesViewModel">
@@ -44,8 +45,8 @@
+ x:Name="pieSeries" StrokeWidth="2" Stroke="{AppThemeBinding Default={StaticResource ContentBackground}}" EnableAnimation="{Binding EnableAnimation}" ItemsSource="{Binding PieSeriesData}"
+ XBindingPath="Name" YBindingPath="Value" LegendIcon="SeriesType" PaletteBrushes="{AppThemeBinding Light={StaticResource PaletteBrushesLight1}, Dark={StaticResource PaletteBrushesDark1}}">
diff --git a/maui/samples/Gallery/Samples/CircularChart/Interaction/Tooltip.xaml.cs b/maui/samples/Gallery/Samples/CircularChart/Interaction/Tooltip.xaml.cs
index 79459a2b..d0ae98dc 100644
--- a/maui/samples/Gallery/Samples/CircularChart/Interaction/Tooltip.xaml.cs
+++ b/maui/samples/Gallery/Samples/CircularChart/Interaction/Tooltip.xaml.cs
@@ -15,27 +15,4 @@ public override void OnDisappearing()
Chart.Handler?.DisconnectHandler();
}
}
-
- public class TooltipValueConverter : IValueConverter
- {
- public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
- {
- if (value is ChartDataModel model)
- {
- switch (parameter?.ToString())
- {
- case "Name":
- return model.Name;
- case "Value":
- return model.Value;
- }
- }
-
- return value;
- }
- public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
- {
- return value;
- }
- }
}
diff --git a/maui/samples/Gallery/Samples/CircularChart/Pie/GroupToPieChart.xaml b/maui/samples/Gallery/Samples/CircularChart/Pie/GroupToPieChart.xaml
index 40ebab78..761c8887 100644
--- a/maui/samples/Gallery/Samples/CircularChart/Pie/GroupToPieChart.xaml
+++ b/maui/samples/Gallery/Samples/CircularChart/Pie/GroupToPieChart.xaml
@@ -2,8 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart.GroupToPieChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart"
- xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
@@ -14,9 +14,9 @@
-
-
-
+
+
+
@@ -42,11 +42,15 @@
-
-
+
+
-
-
+
+
+
+
+
+
@@ -57,9 +61,9 @@
-
+
@@ -71,7 +75,7 @@
-
+
-
+
@@ -94,10 +98,10 @@
-
-
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:PieSeriesViewModel">
diff --git a/maui/samples/Gallery/Samples/CircularChart/Pie/SemiPieChart.xaml b/maui/samples/Gallery/Samples/CircularChart/Pie/SemiPieChart.xaml
index 8af99b0f..1d5f116d 100644
--- a/maui/samples/Gallery/Samples/CircularChart/Pie/SemiPieChart.xaml
+++ b/maui/samples/Gallery/Samples/CircularChart/Pie/SemiPieChart.xaml
@@ -2,8 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart.SemiPieChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart"
- xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:PieSeriesViewModel">
diff --git a/maui/samples/Gallery/Samples/CircularChart/Pie/SmartDataLabels.xaml b/maui/samples/Gallery/Samples/CircularChart/Pie/SmartDataLabels.xaml
index 78ad1a49..4407e6ac 100644
--- a/maui/samples/Gallery/Samples/CircularChart/Pie/SmartDataLabels.xaml
+++ b/maui/samples/Gallery/Samples/CircularChart/Pie/SmartDataLabels.xaml
@@ -2,8 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart.SmartDataLabels"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart"
- xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:PieSeriesViewModel">
@@ -14,16 +15,20 @@
-
-
+
+
-
-
+
+
+
+
+
+
-
+
@@ -38,7 +43,7 @@
-
-
+
-
+
@@ -76,7 +81,7 @@
diff --git a/maui/samples/Gallery/Samples/CircularChart/RadialBar/CustomizedRadialBarChart.xaml b/maui/samples/Gallery/Samples/CircularChart/RadialBar/CustomizedRadialBarChart.xaml
index 55f4143a..24189493 100644
--- a/maui/samples/Gallery/Samples/CircularChart/RadialBar/CustomizedRadialBarChart.xaml
+++ b/maui/samples/Gallery/Samples/CircularChart/RadialBar/CustomizedRadialBarChart.xaml
@@ -3,9 +3,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart.CustomizedRadialBarChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart"
- xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
xmlns:converter="clr-namespace:Syncfusion.Maui.ControlsGallery.Converters;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ xmlns:core="clr-namespace:Syncfusion.Maui.Toolkit;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:RadialBarSeriesViewModel">
@@ -18,6 +20,8 @@
+
+
@@ -34,38 +38,39 @@
YBindingPath="Value"
GapRatio="{OnPlatform WinUI='0.4',Android='0.4',iOS='0.5',MacCatalyst='0.4'}"
CapStyle="BothCurve" XBindingPath="Name"
- Radius="1" MaximumValue="100">
+ Radius="1" MaximumValue="100">
+ WidthRequest="{Binding CenterHoleSize}"
+ x:DataType="chart:RadialBarSeries">
+ Source={x:Reference series}}"/>
-
+
-
-
-
+
-
+
@@ -78,9 +83,9 @@
+ VerticalOptions="Fill" HorizontalOptions="Fill">
-
+ WidthRequest="{Binding CenterHoleSize}" x:DataType="chart:RadialBarSeries">
+ Converter={StaticResource innerRadiusConverter},Source={x:Reference series1}}"/>
-
+
-
@@ -111,15 +116,15 @@
-
-
diff --git a/maui/samples/Gallery/Samples/CircularChart/RadialBar/RadialBarChart.xaml b/maui/samples/Gallery/Samples/CircularChart/RadialBar/RadialBarChart.xaml
index fba1c0ca..bc9abb02 100644
--- a/maui/samples/Gallery/Samples/CircularChart/RadialBar/RadialBarChart.xaml
+++ b/maui/samples/Gallery/Samples/CircularChart/RadialBar/RadialBarChart.xaml
@@ -3,8 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart.RadialBarChart"
xmlns:local="clr-namespace:Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart"
- xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
- xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit">
+ xmlns:localCore="clr-namespace:Syncfusion.Maui.ControlsGallery;assembly=Syncfusion.Maui.ControlsGallery"
+ xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+ x:DataType="local:RadialBarSeriesViewModel">
@@ -16,18 +17,18 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -48,14 +49,10 @@
@@ -78,12 +75,12 @@
-
-
@@ -93,10 +90,10 @@
-
-
@@ -124,9 +121,9 @@
+ VerticalOptions="Center" Grid.Column="0"/>
@@ -136,9 +133,9 @@
+ VerticalOptions="Center" />
@@ -148,10 +145,10 @@
+ VerticalOptions="Center" />
+ VerticalOptions="Center" Margin="0,5,2,0" ValueChanged="slider_ValueChanged"
+ Minimum="90" Maximum="270">
diff --git a/maui/samples/Gallery/Samples/CircularChart/RadialBar/RadialBarChart.xaml.cs b/maui/samples/Gallery/Samples/CircularChart/RadialBar/RadialBarChart.xaml.cs
index 94f064c1..36f2b37c 100644
--- a/maui/samples/Gallery/Samples/CircularChart/RadialBar/RadialBarChart.xaml.cs
+++ b/maui/samples/Gallery/Samples/CircularChart/RadialBar/RadialBarChart.xaml.cs
@@ -111,6 +111,47 @@ private void trackFill_SelectedIndexChanged(object sender, EventArgs e)
}
}
}
+
+ private void slider_ValueChanged(object sender, ValueChangedEventArgs e)
+ {
+ var slider = (Slider)sender;
+ if (viewModel != null)
+ {
+ var value = slider.StyleId;
+ switch (value)
+ {
+ case "endAngle":
+ radialBarSeries.EndAngle = slider.Value;
+ break;
+ case "startAngle":
+ radialBarSeries.StartAngle = slider.Value;
+ break;
+ case "trackStrokeWidth":
+ radialBarSeries.TrackStrokeWidth = slider.Value;
+ break;
+ }
+ }
+ }
+
+ private void capStyle_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ var value = capStyle.SelectedIndex;
+ switch (value)
+ {
+ case 0:
+ radialBarSeries.CapStyle = Syncfusion.Maui.Toolkit.Charts.CapStyle.BothFlat;
+ break;
+ case 1:
+ radialBarSeries.CapStyle = Syncfusion.Maui.Toolkit.Charts.CapStyle.BothCurve;
+ break;
+ case 2:
+ radialBarSeries.CapStyle = Syncfusion.Maui.Toolkit.Charts.CapStyle.StartCurve;
+ break;
+ case 3:
+ radialBarSeries.CapStyle = Syncfusion.Maui.Toolkit.Charts.CapStyle.EndCurve;
+ break;
+ }
+ }
}
}
diff --git a/maui/samples/Gallery/Samples/CircularChart/ViewModel/BaseViewModel.cs b/maui/samples/Gallery/Samples/CircularChart/ViewModel/BaseViewModel.cs
index 5b1e29d6..cc4940b8 100644
--- a/maui/samples/Gallery/Samples/CircularChart/ViewModel/BaseViewModel.cs
+++ b/maui/samples/Gallery/Samples/CircularChart/ViewModel/BaseViewModel.cs
@@ -1,8 +1,9 @@
-using Syncfusion.Maui.Toolkit.Charts;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Globalization;
using System.Windows.Input;
+using Syncfusion.Maui.Toolkit;
+using Syncfusion.Maui.Toolkit.Charts;
namespace Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart
{
@@ -114,7 +115,6 @@ public BaseViewModel()
}
}
-
public class CornerRadiusConverter : IValueConverter
{
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
@@ -137,4 +137,49 @@ public partial class ChartColorModel : ObservableCollection
{
}
+
+ public class TooltipValueConverter : IValueConverter
+ {
+ public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ if (value is ChartDataModel model)
+ {
+ switch (parameter?.ToString())
+ {
+ case "Name":
+ return model.Name;
+ case "Value":
+ return model.Value;
+ case "Percentage":
+ return model.Percentage;
+ }
+ }
+
+ return value;
+ }
+
+ public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ return value;
+ }
+ }
+
+ public class ImageValueConverter : IValueConverter
+ {
+ public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ if (value is LegendItem legendItem)
+ {
+ var image = (legendItem.Item as ChartDataModel)?.Image;
+ return image;
+ }
+
+ return value;
+ }
+
+ public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ return value;
+ }
+ }
}
diff --git a/maui/samples/Gallery/Samples/DatePicker/GettingStarted/Behavior/GettingStartedBehavior.cs b/maui/samples/Gallery/Samples/DatePicker/GettingStarted/Behavior/GettingStartedBehavior.cs
index 9cb19afe..a21120dd 100644
--- a/maui/samples/Gallery/Samples/DatePicker/GettingStarted/Behavior/GettingStartedBehavior.cs
+++ b/maui/samples/Gallery/Samples/DatePicker/GettingStarted/Behavior/GettingStartedBehavior.cs
@@ -13,7 +13,7 @@ public class GettingStartedBehavior : Behavior
///
/// The show header switch.
///
- Switch? _showHeaderSwitch, _showColumnHeaderSwitch, _showFooterSwitch, _clearSelectionSwitch;
+ Switch? _showHeaderSwitch, _showColumnHeaderSwitch, _showFooterSwitch, _clearSelectionSwitch, _showEnableLoopingSwitch;
///
/// The date format combo box.
@@ -90,6 +90,7 @@ protected override void OnAttachedTo(SampleView sampleView)
_showColumnHeaderSwitch = sampleView.Content.FindByName("showColumnHeaderSwitch");
_showFooterSwitch = sampleView.Content.FindByName("showFooterSwitch");
_clearSelectionSwitch = sampleView.Content.FindByName("clearSelectionSwitch");
+ _showEnableLoopingSwitch = sampleView.Content.FindByName("enableLoopingSwitch");
_datePicker.SelectedTextStyle.TextColor = _isLightTheme ? Color.FromArgb("#FFFFFF") : Color.FromArgb("#381E72");
_formats = new ObservableCollection
internal interface ICalendarView
{
- ///
- /// Method to update when visible dates change.
- ///
- /// The visible dates collection.
- /// Checks whether the view is current view or not.
- void UpdateVisibleDatesChange(List visibleDates, bool isCurrentView);
+ ///
+ /// Method to update when visible dates change.
+ ///
+ /// The visible dates collection.
+ /// Checks whether the view is current view or not.
+ /// Gets the month view instance for current canvas.
+ void UpdateVisibleDatesChange(List visibleDates, bool isCurrentView, CustomSnapLayout customSnapLayout);
- ///
- /// Method to update selected date on visible date change.
- ///
- void UpdateSelectionValue();
+ ///
+ /// Method to update selected date on visible date change.
+ ///
+ void UpdateSelectionValue();
///
/// Method to update the selected dates.
diff --git a/maui/src/Calendar/LoopingPannel/CustomSnapManager.cs b/maui/src/Calendar/LoopingPannel/CustomSnapManager.cs
index 8bb2b7c5..e1bc8b75 100644
--- a/maui/src/Calendar/LoopingPannel/CustomSnapManager.cs
+++ b/maui/src/Calendar/LoopingPannel/CustomSnapManager.cs
@@ -750,7 +750,7 @@ void CalculateVisibleDateOnView()
for (int i = 0; i < Children.Count; i++)
{
List visibleDates = GetVisibleDatesForView(i);
- (Children[i] as ICalendarView)?.UpdateVisibleDatesChange(visibleDates, i == _currentChildIndex);
+ (Children[i] as ICalendarView)?.UpdateVisibleDatesChange(visibleDates, i == _currentChildIndex, this);
//// Condition to update the disabled date only for the current view.
if (_visibleDates == visibleDates)
{
@@ -996,7 +996,7 @@ void UpdateVisibleDatesOnChange(int currentIndex)
return;
}
- (Children[currentIndex] as ICalendarView)?.UpdateVisibleDatesChange(GetVisibleDatesForView(currentIndex), currentIndex == _currentChildIndex);
+ (Children[currentIndex] as ICalendarView)?.UpdateVisibleDatesChange(GetVisibleDatesForView(currentIndex), currentIndex == _currentChildIndex, this);
for (int i = 0; i < ChildCount; i++)
{
(Children[i] as YearView)?.InvalidateSemanticsNode(i == _currentChildIndex);
@@ -1358,6 +1358,11 @@ DateTime GetNextViewStartDate(DateTime date)
/// The visible dates collection.
void UpdateSpecialAndDisableDates(List visibleDates)
{
+ if (visibleDates.Count == 0)
+ {
+ return;
+ }
+
List? disabledDates = UpdateDisabledDates(visibleDates);
List? specialDates = UpdateSpecialDates(visibleDates);
//// Disable dates null means the disabled dates are already updated for current visible dates.
diff --git a/maui/src/Calendar/Model/SfCalendar.cs b/maui/src/Calendar/Model/SfCalendar.cs
index 76c93560..b63c6117 100644
--- a/maui/src/Calendar/Model/SfCalendar.cs
+++ b/maui/src/Calendar/Model/SfCalendar.cs
@@ -1,6 +1,7 @@
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Windows.Input;
+using Microsoft.Maui.Controls.Shapes;
namespace Syncfusion.Maui.Toolkit.Calendar
{
@@ -563,13 +564,26 @@ public partial class SfCalendar
defaultValueCreator: bindable => null,
propertyChanged: OnMonthViewHeaderTemplateChanged);
- ///
- /// Identifies the dependency property.
- ///
- ///
- /// The identifier for dependency property.
- ///
- public static readonly BindableProperty IsOpenProperty =
+ ///
+ /// Identifies the dependency propert.
+ ///
+ ///
+ /// The identifier for dependency property.
+ ///
+ public static readonly BindableProperty SelectionCellTemplateProperty =
+ BindableProperty.Create(
+ nameof(SelectionCellTemplate),
+ typeof(DataTemplate),
+ typeof(SfCalendar),
+ null);
+
+ ///
+ /// Identifies the dependency property.
+ ///
+ ///
+ /// The identifier for dependency property.
+ ///
+ public static readonly BindableProperty IsOpenProperty =
BindableProperty.Create(
nameof(IsOpen),
typeof(bool),
@@ -2174,56 +2188,156 @@ public DataTemplate MonthViewHeaderTemplate
{
get { return (DataTemplate)GetValue(MonthViewHeaderTemplateProperty); }
set { SetValue(MonthViewHeaderTemplateProperty, value); }
- }
-
- ///
- /// Gets or sets a value indicating whether the calendar popup is open or not.
- ///
- /// The default value of is "False".
- ///
- /// It will be applicable to set the or .
- ///
- ///
- /// The following code example demonstrates, how to set IsOpen property for the control.
- /// # [C#](#tab/tabid-2)
- ///
- ///
- /// # [XAML](#tab/tabid-1)
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// ]]>
- ///
- ///
- public bool IsOpen
+ }
+
+ ///
+ /// Gets or sets the Selection cell template
+ ///
+ ///
+ /// The following code used to configure the month view header using the .
+ /// # [XAML](#tab/tabid-11)
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// ]]>
+ ///
+ /// The following code used to configure the month view header using the .
+ /// # [DataTemplateSelector](#tab/tabid-12)
+ ///
+ ///
+ /// {
+ /// // Create a Grid with two columns
+ /// Grid grid = new Grid
+ /// {
+ /// RowDefinitions =
+ /// {
+ /// new RowDefinition { Height = GridLength.Star },
+ /// new RowDefinition { Height = GridLength.Star }
+ /// },
+ /// Padding = new Thickness(1),
+ /// VerticalOptions = LayoutOptions.Center,
+ /// HeightRequest = 40
+ /// };
+ /// // Create a Border with rounded corners
+ /// Border border = new Border
+ /// {
+ /// BackgroundColor = Color.FromArgb("#4285F4"),
+ /// Stroke = Colors.Transparent,
+ /// StrokeShape = new RoundRectangle
+ /// {
+ /// CornerRadius = new CornerRadius(10)
+ /// }
+ /// };
+ /// // Create Label and bind to Date.Year
+ /// Label label = new Label
+ /// {
+ /// TextColor = Colors.White,
+ /// HorizontalTextAlignment = TextAlignment.Center,
+ /// VerticalTextAlignment = TextAlignment.Center,
+ /// HorizontalOptions = LayoutOptions.Center,
+ /// VerticalOptions = LayoutOptions.Center
+ /// };
+ /// label.SetBinding(Label.TextProperty, "Date.Day");
+ /// // Create Image
+ /// Image image = new Image
+ /// {
+ /// Source = "tick_image2.png",
+ /// HeightRequest = 17,
+ /// WidthRequest = 17,
+ /// HorizontalOptions = LayoutOptions.Center,
+ /// VerticalOptions = LayoutOptions.Center
+ /// };
+ /// // Add label and image to inner grid
+ /// grid.Add(label, 0, 0);
+ /// grid.Add(image, 0, 1);
+ /// // Set content of border
+ /// border.Content = grid;
+ /// // Add border to outer grid
+ /// //grid.Add(border);
+ /// return border;
+ /// });
+ /// }
+ ///}
+ ///
+ /// ]]>
+ ///
+ ///
+ public DataTemplate SelectionCellTemplate
+ {
+ get { return (DataTemplate)this.GetValue(SelectionCellTemplateProperty); }
+ set { this.SetValue(SelectionCellTemplateProperty, value); }
+ }
+
+ ///
+ /// Gets or sets a value indicating whether the calendar popup is open or not.
+ ///
+ /// The default value of is "False".
+ ///
+ /// It will be applicable to set the or .
+ ///
+ ///
+ /// The following code example demonstrates, how to set IsOpen property for the control.
+ /// # [C#](#tab/tabid-2)
+ ///
+ ///
+ /// # [XAML](#tab/tabid-1)
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// ]]>
+ ///
+ ///
+ public bool IsOpen
{
get { return (bool)GetValue(IsOpenProperty); }
set { SetValue(IsOpenProperty, value); }
diff --git a/maui/src/Calendar/Views/CalendarView/MonthView/MonthView.cs b/maui/src/Calendar/Views/CalendarView/MonthView/MonthView.cs
index 1ec7ae74..3e45703e 100644
--- a/maui/src/Calendar/Views/CalendarView/MonthView/MonthView.cs
+++ b/maui/src/Calendar/Views/CalendarView/MonthView/MonthView.cs
@@ -6,6 +6,7 @@
using Syncfusion.Maui.Toolkit.Graphics.Internals;
using PointerEventArgs = Syncfusion.Maui.Toolkit.Internals.PointerEventArgs;
using Globalization = System.Globalization;
+using Rect = Microsoft.Maui.Graphics.Rect;
namespace Syncfusion.Maui.Toolkit.Calendar
{
@@ -128,20 +129,35 @@ internal class MonthView : SfView, ITapGestureListener, IDoubleTapGestureListene
///
DateTime? _previousSelectedRangeDate;
- #endregion
+ ///
+ /// To store the selected date data template view
+ ///
+ View? _selectionCellTemplateView;
- #region Constructor
+ ///
+ /// To store the selected cell template previous view
+ ///
+ View? _previousSelectionCellTemplateView;
- ///
- /// Initializes a new instance of the class.
- ///
- /// The calendar view.
- /// The visible dates for the view.
- /// The selected date for the view.
- /// The disabled dates for the view.
- /// The special dates for the view.
- /// Defines whether the view is current view or not.
- internal MonthView(ICalendar calendarView, List visibleDates, DateTime? selectedDate, List disabledDates, List specialDatesDetails, bool isCurrentView)
+ ///
+ /// To store the previous month cell template view
+ ///
+ View? _previousMonthCellTemplateView;
+
+ #endregion
+
+ #region Constructor
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The calendar view.
+ /// The visible dates for the view.
+ /// The selected date for the view.
+ /// The disabled dates for the view.
+ /// The special dates for the view.
+ /// Defines whether the view is current view or not.
+ internal MonthView(ICalendar calendarView, List visibleDates, DateTime? selectedDate, List disabledDates, List specialDatesDetails, bool isCurrentView)
{
_isCurrentView = isCurrentView;
_calendarViewInfo = calendarView;
@@ -241,12 +257,13 @@ internal void OnSelection(Point point)
}
#endif
- ///
- /// Method to update when visible dates changed.
- ///
- /// The visible dates.
- /// Defines whether the view is current view or not.
- internal void UpdateVisibleDatesChange(List visibleDates, bool isCurrentView)
+ ///
+ /// Method to update when visible dates changed.
+ ///
+ /// The visible dates.
+ /// Defines whether the view is current view or not.
+ /// Gets the month view instance for current canvas.
+ internal void UpdateVisibleDatesChange(List visibleDates, bool isCurrentView, CustomSnapLayout customSnapLayout)
{
int numberOfVisibleWeeks = CalendarViewHelper.GetNumberOfWeeks(_calendarViewInfo.MonthView);
bool isNumberOfWeeksChanged = _numberOfWeeks != numberOfVisibleWeeks;
@@ -254,8 +271,137 @@ internal void UpdateVisibleDatesChange(List visibleDates, bool isCurre
int previousVisibleDatesCount = _visibleDates.Count;
//// This method only triggers when the previous visible dates are not equal to the current visible dates.
_visibleDates = visibleDates;
+
+ // Proceed only if a SelectionCellTemplate is defined in the calendar view info
+ if (_calendarViewInfo.SelectionCellTemplate != null && _calendarViewInfo.SelectionMode == CalendarSelectionMode.Single)
+ {
+ // If the custom snap layout is null, exit early (no layout to process)
+ if (customSnapLayout == null)
+ {
+ return;
+ }
+
+ // Iterate through each MonthViewLayout inside the customSnapLayout
+ foreach (MonthViewLayout layout in customSnapLayout.Children)
+ {
+ // Skip if the layout or its children are null
+ if (layout?.Children == null)
+ {
+ continue;
+ }
+
+ // Iterate through each view in the layout's children
+ foreach (var view in layout.Children)
+ {
+ // Check if the view is a MonthView and has child views
+ if (view is not MonthView month || month.Children == null)
+ {
+ continue;
+ }
+
+ // Get the reference to the current selectionCellTemplateView from the month view
+ var child = month._selectionCellTemplateView;
+
+ // Skip if the selection cell template view is not present
+ if (child == null)
+ {
+ continue;
+ }
+
+ // If a CellTemplate is defined for the MonthView
+ if (_calendarViewInfo.MonthView.CellTemplate != null)
+ {
+ // Find the index of the selection cell in the month view's children
+ int index = month.Children.IndexOf(child);
+
+ // Validate the index and ensure the cell at the index matches the selection view
+ if (month._monthCells != null && index >= 0 && index < month._monthCells.Count)
+ {
+ // Skip if the selection view is already correctly placed
+ if (month._monthCells[index] == child)
+ {
+ continue;
+ }
+
+ // Skip if the selected date is already within the visible dates of this month
+ if (month._visibleDates.Contains(_selectedDate!.Value))
+ {
+ continue;
+ }
+ }
+ }
+ else
+ {
+ // Skip if the child view is not the current selection cell template view
+ if (child != month._selectionCellTemplateView)
+ {
+ continue;
+ }
+ }
+
+ // Default values for visibility checks
+ bool isVisible = false;
+ bool checkVisibility = false;
+
+ // Proceed only for single selection mode and a selected date is available
+ if (_selectedDate.HasValue)
+ {
+ DateTime selectedDate = _selectedDate.Value;
+
+ // Check if the selected date is among the visible dates of the month
+ bool isInVisibleDates = month._visibleDates?.Contains(selectedDate) ?? false;
+
+ // Check if the selected date is allowed via the selection predicate
+ bool isSelectable = _calendarViewInfo.IsSelectableDayPredicate(selectedDate);
+
+ // Validate the selected date against calendar rules and settings
+ if (selectedDate >= _calendarViewInfo.MinimumDate && selectedDate <= _calendarViewInfo.MaximumDate &&
+ (!isInVisibleDates || _calendarViewInfo.EnablePastDates) && (isInVisibleDates && isSelectable) &&
+ (_calendarViewInfo.ShowTrailingAndLeadingDates || selectedDate.Month == _calendarViewInfo.DisplayDate.Month))
+ {
+ // Mark that visibility check is needed
+ checkVisibility = true;
+
+ // If using a cell template and selected date is not in visible dates, remove the template
+ if (_calendarViewInfo.MonthView.CellTemplate != null)
+ {
+ if (!isInVisibleDates)
+ {
+ MonthView.RemoveTemplateView(month, child);
+ continue;
+ }
+ }
+ else
+ {
+ isVisible = isInVisibleDates;
+ }
+ }
+ }
+
+ // If no visibility check passed (invalid selection or not visible), handle cleanup
+ if (!checkVisibility)
+ {
+ // If using a cell template, remove it
+ if (_calendarViewInfo.MonthView.CellTemplate != null)
+ {
+ // If the selection cell template on canvas following condition based that time should remove the selection cell template.
+ MonthView.RemoveTemplateView(month, child);
+ }
+ else
+ {
+ // Otherwise, just hide the view
+ child.IsVisible = isVisible;
+ }
+ }
+
+ // Exit inner loop after processing the first valid selection cell
+ break;
+ }
+ }
+ }
+
#if MACCATALYST || (!ANDROID && !IOS)
- _hoverView.UpdateVisibleDatesChange(visibleDates);
+ _hoverView.UpdateVisibleDatesChange(visibleDates);
#endif
//// In cell template need to draw the selection.
//// If cell template null then need to draw the visible dates and selection.
@@ -326,7 +472,17 @@ internal void UpdateDisableAndSpecialDateChange(List? disabledDates, L
isNeedToInvalidate = true;
}
- if (isNeedToInvalidate)
+ if (_selectionCellTemplateView != null && _calendarViewInfo.SelectionMode == CalendarSelectionMode.Single)
+ {
+ // If I select any date on current month and selectable predicate date is same as selected date.
+ if (_selectedDate != null && !_calendarViewInfo.IsSelectableDayPredicate((DateTime)_selectedDate))
+ {
+ // To handle the selection cell template visibility
+ HideSelectionCellTemplateView();
+ }
+ }
+
+ if (isNeedToInvalidate)
{
InvalidateDrawable();
}
@@ -337,7 +493,14 @@ internal void UpdateDisableAndSpecialDateChange(List? disabledDates, L
///
internal void UpdateSelectionValue()
{
- DateTime? previousSelectedDate = _selectedDate;
+ // If Selected date changed dynamically that time it can perform
+ if (_selectionCellTemplateView != null && _calendarViewInfo.SelectionMode == CalendarSelectionMode.Single)
+ {
+ // To handle the selection cell template visibility
+ HideSelectionCellTemplateView();
+ }
+
+ DateTime? previousSelectedDate = _selectedDate;
_selectedDate = _calendarViewInfo.SelectedDate;
if (_calendarViewInfo.SelectionMode != CalendarSelectionMode.Single || _selectedDate?.Date == previousSelectedDate?.Date)
{
@@ -505,7 +668,15 @@ internal void UpdateSelectedDatesOnAction(NotifyCollectionChangedEventArgs e)
///
internal void InvalidateMonthView()
{
- InvalidateDrawable();
+ // Check if the SelectionMode is not set to 'Single'.
+ // If the SelectionMode is not 'Single', hide the selection cell template view by calling the SelectionCellTemplateVisibility method.
+ if (_selectionCellTemplateView != null && _calendarViewInfo.SelectionMode != CalendarSelectionMode.Single)
+ {
+ // To handle the selection cell template visibility
+ HideSelectionCellTemplateView();
+ }
+
+ InvalidateDrawable();
}
///
@@ -526,7 +697,26 @@ internal void InvalidateViewMeasure()
///
internal void InvalidateView()
{
- InvalidateDrawable();
+ // Check if selectedDate and selectionCellTemplateView is not null before proceeding with the date restriction validation logic.
+ if (_selectionCellTemplateView != null && _selectedDate != null)
+ {
+ bool isInVisibleDates = _visibleDates?.Contains(_selectedDate.Value) ?? false;
+ bool isTemplateView = false;
+ if (_selectedDate >= _calendarViewInfo.MinimumDate && _selectedDate <= _calendarViewInfo.MaximumDate &&
+ (_calendarViewInfo.ShowTrailingAndLeadingDates || _selectedDate.Value.Month == _calendarViewInfo.DisplayDate.Month) &&
+ (!isInVisibleDates || _calendarViewInfo.EnablePastDates))
+ {
+ isTemplateView = isInVisibleDates;
+ }
+
+ if (!isTemplateView)
+ {
+ // To handle the selection cell template visibility
+ HideSelectionCellTemplateView();
+ }
+ }
+
+ InvalidateDrawable();
#if MACCATALYST || (!ANDROID && !IOS)
_hoverView.InvalidateDrawable();
#endif
@@ -554,7 +744,13 @@ internal void UpdateTemplateViews(bool isCurrentView)
}
else
{
- DrawingOrder = DrawingOrder.AboveContent;
+ // It's perform when i change show trailing and leading date dynamically
+ if (_calendarViewInfo.SelectionCellTemplate != null && _previousMonthCellTemplateView != null)
+ {
+ _previousMonthCellTemplateView = null;
+ }
+
+ DrawingOrder = DrawingOrder.AboveContent;
RemoveMonthCellsHandler();
_monthCells = new List();
GenerateMonthCells(isCurrentView);
@@ -721,7 +917,11 @@ static void DrawIcon(ICanvas canvas, RectF bounds, float iconSize, CalendarIconD
float rectXPosition = bounds.Left + ((bounds.Width - iconSize) / 2);
//// The rectYPosition = month cell bounds bottom(90) - iconSize(9)) - 5 = 85.5(rectYPosition).
//// 5 denotes the bottom padding between the icon and month cell.
- float rectYPosition = bounds.Bottom - iconSize - 5;
+ float bottomPadding = 5;
+#if WINDOWS || MACCATALYST
+ bottomPadding = 10;
+#endif
+ float rectYPosition = bounds.Bottom - iconSize - bottomPadding;
//// The iconRect = new RectF(95.5, 85.5, 9, 9).
RectF iconRect = new RectF(rectXPosition, rectYPosition, iconSize, iconSize);
canvas.FillColor = calendarSpecialDayIconDetails.Fill.ToColor();
@@ -793,8 +993,8 @@ static PathF CreateHeartPath(RectF rect)
heartPath.MoveTo(rect.X + (rect.Width * .5f), rect.Y + (rect.Height * .15f));
heartPath.CurveTo(rect.X + (rect.Width * 0.60f), rect.Y + (rect.Height * 0.05f), rect.X + (rect.Width * 0.9f), rect.Y + (rect.Height * 0.05f), rect.X + (rect.Width * .95f), rect.Y + (rect.Height * .25f));
heartPath.CurveTo(rect.X + (rect.Width * 1f), rect.Y + (rect.Height * .45f), rect.X + (rect.Width * .75f), rect.Y + (rect.Height * .70f), rect.X + (rect.Width * .50f), rect.Y + (rect.Height * .95f));
- heartPath.CurveTo(rect.X + (rect.Width * .25f), rect.Y + (rect.Height * .70f), rect.X, rect.Y + (rect.Height * .45f), rect.X + (rect.Width * .05f), rect.Y + (rect.Height * .25f));
- heartPath.CurveTo(rect.X + (rect.Width * 0.01f), rect.Y + (rect.Height * .05f), rect.X + (rect.Width * .4f), rect.Y + (rect.Height * 0.05f), rect.X + (rect.Width * .50f), rect.Y + (rect.Height * .15f));
+ heartPath.CurveTo(rect.X + (rect.Width * .25f), rect.Y + (rect.Height * .70f), rect.X, rect.Y + (rect.Height * .45f), rect.X + (rect.Width * .05f), rect.Y + (rect.Height * .25f));
+ heartPath.CurveTo(rect.X + (rect.Width * 0.01f), rect.Y + (rect.Height * .05f), rect.X + (rect.Width * .4f), rect.Y + (rect.Height * 0.05f), rect.X + (rect.Width * .50f), rect.Y + (rect.Height * .15f));
return heartPath;
}
@@ -885,6 +1085,42 @@ static PathF GetStarShapePath(RectF rect)
return null;
}
+ ///
+ /// This method is used to remove selection cell template and insert the normal month cell template
+ ///
+ /// Get the month details from current canvas
+ /// Get the view details from the month
+ static void RemoveTemplateView(MonthView month, View child)
+ {
+ int index = -1;
+#if !WINDOWS
+ if (month._monthCells != null && month._monthCells.Count > 0)
+ {
+ for (int i = 0; i < month._monthCells.Count; i++)
+ {
+ if (month.Children[i] != month._monthCells[i])
+ {
+ index = i;
+ break;
+ }
+ }
+ }
+#else
+ index = month.Children.IndexOf(child);
+#endif
+ if (index != -1)
+ {
+ month.Children.RemoveAt(index);
+ if (month._previousMonthCellTemplateView != null)
+ {
+ month.Insert(index, month._previousMonthCellTemplateView);
+ }
+
+ month._previousMonthCellTemplateView = null;
+ month._selectionCellTemplateView = null;
+ }
+ }
+
#if __IOS__ || __MACCATALYST__
///
@@ -900,12 +1136,12 @@ async void SetFocus(int delay)
#endif
- ///
- /// Method to find the range is start range or end range or in between range.
- ///
- /// The date time.
- /// The rage is startRange or endRange or inBetween range.
- SelectedRangeStatus? GetRangeSelectionStatus(DateTime? dateTime)
+ ///
+ /// Method to find the range is start range or end range or in between range.
+ ///
+ /// The date time.
+ /// The rage is startRange or endRange or inBetween range.
+ SelectedRangeStatus? GetRangeSelectionStatus(DateTime? dateTime)
{
if (_selectedRange == null)
{
@@ -1387,8 +1623,8 @@ void DrawMonthCells(ICanvas canvas, bool isRTL, float weekNumberWidth, float mon
// The current date is today date and not a range then need to considered the today text style.
bool isTodayDate = todayDate.Date.Equals(dateTime.Date);
- //// Restrict the special day icon highlight while the month cell have today highlight.
- CalendarIconDetails? calendarSpecialDayIconDetails = isTodayDate && todayHighlightColor != Colors.Transparent ? null : _specialDates.FirstOrDefault(details => CalendarViewHelper.IsSameDate(_calendarViewInfo.View, details.Date, dateTime, _calendarViewInfo.Identifier));
+ //// Stores the special dates icon details for drawing.
+ CalendarIconDetails? calendarSpecialDayIconDetails = _specialDates.FirstOrDefault(details => CalendarViewHelper.IsSameDate(_calendarViewInfo.View, details.Date, dateTime, _calendarViewInfo.Identifier));
CalendarTextStyle textStyle = GetMonthCellStyle(dateTime, isTodayDate, isLeadingAndTrailingDates, isBlackoutDate, isDisabledDate, _calendarViewInfo.ShowOutOfRangeDates, calendarSpecialDayIconDetails != null, ref fillColor, cellBackground, trailingLeadingDateBackground, weekendsBackground, todayBackground, disabledDatesBackground, specialDatesBackground, cultureCalendar);
//// If background color is not transparent then the background color for month cell is applied.
if (fillColor != Colors.Transparent)
@@ -1418,8 +1654,9 @@ void DrawMonthCells(ICanvas canvas, bool isRTL, float weekNumberWidth, float mon
//// If it is selected date then the selection is drawn based on the selection shape.
if (isSelectedDate)
{
- textStyle = monthViewSettings.SelectionTextStyle;
- DrawSelectionShape(canvas, highlightBounds, selectionRadius, cornerRadius, selectedDateBackground, centerPosition);
+ bool useCustomTemplate = _calendarViewInfo.SelectionCellTemplate == null;
+ textStyle = useCustomTemplate ? monthViewSettings.SelectionTextStyle : (_calendarViewInfo.SelectionMode == CalendarSelectionMode.Single ? new CalendarTextStyle { TextColor = Colors.Transparent } : monthViewSettings.SelectionTextStyle);
+ DrawSelectionShape(canvas, highlightBounds, selectionRadius, cornerRadius, selectedDateBackground, centerPosition);
}
break;
@@ -1462,7 +1699,7 @@ void DrawMonthCells(ICanvas canvas, bool isRTL, float weekNumberWidth, float mon
string dateText = isGregorianCalendar ? dateTime.Day.ToString() : dateTime.ToString("dd", cultureInfo);
CalendarViewHelper.DrawText(canvas, dateText, textStyle, new RectF(xPosition, yPosition, monthCellWidth, monthCellHeight), HorizontalAlignment.Center, VerticalAlignment.Center);
- //// No need to draw the special day icon while the date is today date, selected date, dates and range.
+ //// No need to draw the special day icon while the date is selected date, dates and range.
if (calendarSpecialDayIconDetails != null && !isSelectedDate)
{
float iconSize = maximumSquareSize * 0.15f;
@@ -1810,16 +2047,108 @@ void DrawWeekNumbers(ICanvas canvas, bool isRTL, float weekNumberWidth, float mo
/// The center position of the month cell.
void DrawSelectionShape(ICanvas canvas, RectF highlightBounds, float selectionRadius, float cornerRadius, Color cellBackground, PointF centerPosition)
{
- canvas.FillColor = cellBackground;
- if (_calendarViewInfo.SelectionShape == CalendarSelectionShape.Rectangle)
- {
- RectF rectF = new RectF(highlightBounds.Left + HighlightPadding, highlightBounds.Top + HighlightPadding, highlightBounds.Width - (2 * HighlightPadding), highlightBounds.Height - (2 * HighlightPadding));
- canvas.FillRoundedRectangle(rectF, cornerRadius);
- }
- else
- {
- canvas.FillCircle(centerPosition, selectionRadius);
- }
+ // Check if a SelectionCellTemplate is defined, if the selection mode is Single,
+ // and if the current view is a Month view (i.e., all conditions must be true).
+ if (_calendarViewInfo.SelectionCellTemplate != null && _calendarViewInfo.SelectionMode == CalendarSelectionMode.Single && _calendarViewInfo.View == CalendarView.Month && _selectedDate != null)
+ {
+ // Create the selection cell template view based on the selected date and template settings.
+ // This calls a helper function to generate the view using the template.
+ // To get the month cell details for selected date
+ CalendarCellDetails details = GetMonthCellDetails(_selectedDate.Value.Month, _selectedDate.Value);
+ if (details != null)
+ {
+ _selectionCellTemplateView = CalendarViewHelper.CreateSelectionCellTemplate(_selectedDate, _calendarViewInfo.SelectionCellTemplate, _calendarViewInfo.MonthView, details, highlightBounds);
+ }
+
+ // Only proceed if the selection cell template view was successfully created (not null).
+ if (_selectionCellTemplateView != null)
+ {
+ // Check if a CellTemplate is defined for the MonthView
+ if (_calendarViewInfo.MonthView.CellTemplate != null)
+ {
+ // If there are no monthCells available, exit early (nothing to process)
+ if (_monthCells == null || _monthCells.Count == 0)
+ {
+ return;
+ }
+
+ // Try to find the index of the month cell that matches the currently selected date
+ int index = _monthCells.FindIndex(cell =>
+ {
+ var cellDetails = ((View)cell).BindingContext as CalendarCellDetails;
+ return cellDetails?.Date == _selectedDate;
+ });
+
+ // If a matching month cell was found
+ if (index != -1)
+ {
+ // Get the view corresponding to the found month cell
+ var currentCellView = (View)_monthCells[index];
+
+ // If there is a previously stored template view and its index is valid and different from the current one
+ if (_previousMonthCellTemplateView != null)
+ {
+ int previousMonthCellIndex = _monthCells.IndexOf(_previousMonthCellTemplateView);
+ if (previousMonthCellIndex != index && previousMonthCellIndex >= 0 && previousMonthCellIndex < _monthCells.Count)
+ {
+ // Restore the previous template view to its original position
+ Children.RemoveAt(previousMonthCellIndex);
+ Insert(previousMonthCellIndex, _previousMonthCellTemplateView);
+#if !WINDOWS
+ // Clear the previous template tracking variables
+ _previousMonthCellTemplateView = null;
+#endif
+ }
+ }
+
+#if WINDOWS
+ UpdateSelectionCellTemplate(index);
+#else
+ // If there is no currently tracked previous template (i.e., first time or after clearing)
+ if (_previousMonthCellTemplateView == null)
+ {
+ // Update the cell at the selected index with the new selection cell template view
+ UpdateSelectionCellTemplate(index);
+ }
+#endif
+ }
+ }
+ else
+ {
+ // Add the new selection view to the parent container (the current view).
+ Add(_selectionCellTemplateView);
+
+ // If there was a previously existing cell template view, remove it from the container.
+ // This ensures only one selection cell template is visible at a time.
+ if (_previousSelectionCellTemplateView != null)
+ {
+ Remove(_previousSelectionCellTemplateView);
+ }
+
+ // Update the previous cell template view reference to the current one.
+ // This allows the next time to know which view to remove (for reusability).
+ _previousSelectionCellTemplateView = _selectionCellTemplateView;
+ AbsoluteLayout.SetLayoutBounds(_selectionCellTemplateView, highlightBounds);
+ }
+
+#if ANDROID
+ this.InvalidateViewMeasure();
+#endif
+ }
+ }
+ else
+ {
+ canvas.FillColor = cellBackground;
+ if (_calendarViewInfo.SelectionShape == CalendarSelectionShape.Rectangle)
+ {
+ RectF rectF = new RectF(highlightBounds.Left + HighlightPadding, highlightBounds.Top + HighlightPadding, highlightBounds.Width - (2 * HighlightPadding), highlightBounds.Height - (2 * HighlightPadding));
+ canvas.FillRoundedRectangle(rectF, cornerRadius);
+ }
+ else
+ {
+ canvas.FillCircle(centerPosition, selectionRadius);
+ }
+ }
}
///
@@ -2301,16 +2630,59 @@ bool IsCurrentViewRangesUpdated(ObservableCollection? oldSele
return !CalendarViewHelper.IsSameDateRanges(_calendarViewInfo.View, currentViewOldSelectedRanges, currentViewNewSelectedRanges, _calendarViewInfo.Identifier);
}
- #endregion
-
- #region Override Methods
-
- ///
- /// Method to draw the month view.
- ///
- /// The draw canvas.
- /// The rectangle.
- protected override void OnDraw(ICanvas canvas, RectF dirtyRect)
+ ///
+ /// Insert the selection cell template instead of selected month cell.
+ ///
+ /// Gets the selected month cell index
+ void UpdateSelectionCellTemplate(int index)
+ {
+ if (_monthCells != null && _selectionCellTemplateView != null)
+ {
+ // Store current selection info
+ _previousMonthCellTemplateView = (View)_monthCells[index];
+
+ // Replace with the selection view
+ Children.RemoveAt(index);
+ Insert(index, _selectionCellTemplateView);
+ }
+ }
+
+ ///
+ /// This method handle the selection cell template visibility for date restrictions
+ ///
+ void HideSelectionCellTemplateView()
+ {
+ if (_selectionCellTemplateView == null)
+ {
+ return;
+ }
+
+ // to check If the month cell template value not null
+ if (_calendarViewInfo.MonthView.CellTemplate != null)
+ {
+ MonthView.RemoveTemplateView(this, _selectionCellTemplateView);
+ }
+ else
+ {
+ // Check if the selectionCellTemplateView is not null and is already part of the view's children.
+ if (_selectionCellTemplateView != null && Children.Contains(_selectionCellTemplateView))
+ {
+ // Set the IsVisible property to false, effectively hiding the selectionCellTemplateView.
+ _selectionCellTemplateView.IsVisible = false;
+ }
+ }
+ }
+
+ #endregion
+
+ #region Override Methods
+
+ ///
+ /// Method to draw the month view.
+ ///
+ /// The draw canvas.
+ /// The rectangle.
+ protected override void OnDraw(ICanvas canvas, RectF dirtyRect)
{
//// Method to save the current state of the graphics in the canvas.
canvas.SaveState();
@@ -2721,7 +3093,14 @@ void ITapGestureListener.OnTap(TapEventArgs e)
if (_calendarViewInfo.CanToggleDaySelection && _selectedDate?.Date == tappedDate?.Date)
{
tappedDate = null;
- }
+
+ // If the selection cell template applied over click the same date while the CanToggleDaySelection value true.
+ if (_selectionCellTemplateView != null)
+ {
+ // To handle the selection cell template visibility
+ HideSelectionCellTemplateView();
+ }
+ }
_calendarViewInfo.UpdateSelectedDate(tappedDate);
break;
diff --git a/maui/src/Calendar/Views/CalendarView/MonthView/MonthViewLayout.cs b/maui/src/Calendar/Views/CalendarView/MonthView/MonthViewLayout.cs
index d7f4a7df..f37df214 100644
--- a/maui/src/Calendar/Views/CalendarView/MonthView/MonthViewLayout.cs
+++ b/maui/src/Calendar/Views/CalendarView/MonthView/MonthViewLayout.cs
@@ -202,20 +202,21 @@ void ICalendarView.SetFocusOnViewChanged()
_monthView.SetFocusOnViewChanged();
}
- ///
- /// Method to update when visible dates changed.
- ///
- /// The visible dates.
- /// Defines whether the view is current view or not.
- void ICalendarView.UpdateVisibleDatesChange(List visibleDates, bool isCurrentView)
- {
+ ///
+ /// Method to update when visible dates changed.
+ ///
+ /// The visible dates.
+ /// Defines whether the view is current view or not.
+ /// Gets the month view instance for current canvas.
+ void ICalendarView.UpdateVisibleDatesChange(List visibleDates, bool isCurrentView, CustomSnapLayout customSnapLayout)
+ {
if (_visibleDates == visibleDates)
{
return;
}
_visibleDates = visibleDates;
- _monthView.UpdateVisibleDatesChange(visibleDates, isCurrentView);
+ _monthView.UpdateVisibleDatesChange(visibleDates, isCurrentView, customSnapLayout);
_monthViewHeader?.UpdateVisibleDatesChange(visibleDates);
}
diff --git a/maui/src/Calendar/Views/CalendarView/YearView/YearView.cs b/maui/src/Calendar/Views/CalendarView/YearView/YearView.cs
index fd3a9cfb..c0917e2b 100644
--- a/maui/src/Calendar/Views/CalendarView/YearView/YearView.cs
+++ b/maui/src/Calendar/Views/CalendarView/YearView/YearView.cs
@@ -104,18 +104,33 @@ internal class YearView : SfView, ITapGestureListener, IDoubleTapGestureListener
///
DateTime? _previousSelectedDateRange;
- #endregion
-
- #region Constructor
-
- ///
- /// Initializes a new instance of the class.
- ///
- /// The Calendar Year view info.
- /// The visible dates collection.
- /// The disabled dates collection.
- /// Defines whether the view is current view or not.
- internal YearView(ICalendar calendarViewInfo, List visibleDates, List disabledDates, bool isCurrentView)
+ ///
+ /// To store the selected date data template view
+ ///
+ View? _selectionCellTemplateView;
+
+ ///
+ /// To store the selected cell template view
+ ///
+ View? _previousSelectionCellTemplateView;
+
+ ///
+ /// To store the previous year cell template view
+ ///
+ View? _previousYearCellTemplateView;
+
+ #endregion
+
+ #region Constructor
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The Calendar Year view info.
+ /// The visible dates collection.
+ /// The disabled dates collection.
+ /// Defines whether the view is current view or not.
+ internal YearView(ICalendar calendarViewInfo, List visibleDates, List disabledDates, bool isCurrentView)
{
_calendarViewInfo = calendarViewInfo;
_visibleDates = visibleDates;
@@ -162,9 +177,45 @@ internal void InvalidateSemanticsNode(bool isCurrentView)
InvalidateSemantics();
}
- #endregion
+ #endregion
- #region Private Methods
+ #region Private Methods
+
+ ///
+ /// This method is used to remove selection template and insert the normal year cell template
+ ///
+ /// Get the year details from current canvas
+ /// Get the view details from the year
+ static void RemoveTemplateView(YearView year, View child)
+ {
+ int index = -1;
+#if !WINDOWS
+ if (year._yearCells != null && year._yearCells.Count > 0)
+ {
+ for (int i = 0; i < year._yearCells.Count; i++)
+ {
+ if (year._yearCells[i] != year.Children[i])
+ {
+ index = i;
+ break;
+ }
+ }
+ }
+#else
+ index = year.Children.IndexOf(child);
+#endif
+ if (index != -1)
+ {
+ year.Children.RemoveAt(index);
+ if (year._previousYearCellTemplateView != null)
+ {
+ year.Insert(index, year._previousYearCellTemplateView);
+ }
+
+ year._previousYearCellTemplateView = null;
+ year._selectionCellTemplateView = null;
+ }
+ }
#if __IOS__ || __MACCATALYST__
@@ -181,16 +232,16 @@ async void SetFocus(int delay)
#endif
- ///
- /// Method to draw the start range selection highlight
- ///
- /// The canvas to draw
- /// Position to draw
- /// Position and size for highlight
- /// The circle corner radius
- /// The rectangle corner radius
- /// The end range background to apply
- void DrawStartRangeSelectionHighlight(ICanvas canvas, RectF rect, RectF highlightRect, float circleCornerRadius, float rectCornerRadius, Color selectionBackground)
+ ///
+ /// Method to draw the start range selection highlight
+ ///
+ /// The canvas to draw
+ /// Position to draw
+ /// Position and size for highlight
+ /// The circle corner radius
+ /// The rectangle corner radius
+ /// The end range background to apply
+ void DrawStartRangeSelectionHighlight(ICanvas canvas, RectF rect, RectF highlightRect, float circleCornerRadius, float rectCornerRadius, Color selectionBackground)
{
canvas.FillColor = selectionBackground;
float leftPadding = (rect.Width - highlightRect.Width) * 0.5f;
@@ -361,8 +412,9 @@ void DrawYearViewPanelCells(ICanvas canvas, float xPosition, float yPosition, bo
//// If it is selected date then the selection is drawn based on the selection shape.
if (isSelectedDate)
{
- textStyle = _calendarViewInfo.YearView.SelectionTextStyle;
- DrawSelectionHighlight(canvas, highlightRect, rectCornerRadius, circleCornerRadius, selectionBackground);
+ bool useCustomTemplate = _calendarViewInfo.SelectionCellTemplate == null;
+ textStyle = useCustomTemplate ? _calendarViewInfo.YearView.SelectionTextStyle : (_calendarViewInfo.SelectionMode == CalendarSelectionMode.Single ? new CalendarTextStyle { TextColor = Colors.Transparent } : _calendarViewInfo.YearView.SelectionTextStyle);
+ DrawSelectionHighlight(canvas, highlightRect, rectCornerRadius, circleCornerRadius, selectionBackground);
}
break;
@@ -711,15 +763,113 @@ void DrawTodayHighlight(ICanvas canvas, RectF highlightRect, float rectCornerRad
/// The background Color to fill
void DrawSelectionHighlight(ICanvas canvas, RectF highlightRect, float rectCornerRadius, float circleCornerRadius, Color backgroundColor)
{
- canvas.FillColor = backgroundColor;
- if (_calendarViewInfo.SelectionShape == CalendarSelectionShape.Circle)
- {
- canvas.FillRoundedRectangle(highlightRect, circleCornerRadius);
- }
- else
- {
- canvas.FillRoundedRectangle(highlightRect, rectCornerRadius);
- }
+ if (_calendarViewInfo.SelectionCellTemplate != null && _calendarViewInfo.SelectionMode == CalendarSelectionMode.Single && !_calendarViewInfo.AllowViewNavigation && _calendarViewInfo.View != CalendarView.Month && _selectedDate != null)
+ {
+ // Create the selection cell template view based on the selected date and template settings.
+ // This calls a helper function to generate the view for the year view using the selected date and visible dates.
+ // To get the selected date cell details
+ CalendarCellDetails details = GetYearCellDetails(_selectedDate.Value, _visibleDates[0]);
+ if (details != null)
+ {
+ _selectionCellTemplateView = CalendarViewHelper.CreateSelectionCellTemplate(_selectedDate, _calendarViewInfo.SelectionCellTemplate, _calendarViewInfo.MonthView, details, highlightRect);
+ }
+
+ // Only proceed if the selection cell template view was successfully created (i.e., it is not null).
+ if (_selectionCellTemplateView != null)
+ {
+ // Proceed only if a YearView CellTemplate is defined and a date is currently selected
+ if (_calendarViewInfo.YearView.CellTemplate != null && _selectedDate != null)
+ {
+ // Get the value of the selected date
+ DateTime selected = _selectedDate.Value;
+
+ // Adjust the selected date based on specific year view logic
+ selected = SelectedDateBasedOnYearViews(selected);
+
+ // Ensure yearCells is not null or empty before proceeding
+ if (_yearCells == null || _yearCells.Count == 0)
+ {
+ return; // Exit early if there's nothing to work with
+ }
+
+ // Try to find the index of the cell that matches the adjusted selected date
+ int index = _yearCells.FindIndex(cell =>
+ {
+ var cellDetails = ((View)cell).BindingContext as CalendarCellDetails;
+ return cellDetails?.Date == selected;
+ });
+
+ // If a matching cell was found
+ if (index != -1)
+ {
+ // Retrieve the current cell view at the found index
+ var currentYearCellView = (View)_yearCells[index];
+
+ // If a previous selection template exists and is different from the current index
+ // Also check that the stored index is within valid range
+ if (_previousYearCellTemplateView != null)
+ {
+ int previousYearCellIndex = _yearCells.IndexOf(_previousYearCellTemplateView);
+ if (previousYearCellIndex != index && previousYearCellIndex >= 0 && previousYearCellIndex < _yearCells.Count)
+ {
+ // Remove the previous selection view from the layout
+ Children.RemoveAt(previousYearCellIndex);
+
+ // Reinsert the original view that was replaced by the selection view
+ Insert(previousYearCellIndex, _previousYearCellTemplateView);
+#if !WINDOWS
+ // Reset the tracking variables for the previous selection view
+ _previousYearCellTemplateView = null;
+#endif
+ }
+ }
+
+#if WINDOWS
+ UpdateSelectionCellTemplate(index);
+#else
+ // If no previous selection template is currently tracked
+ if (_previousYearCellTemplateView == null)
+ {
+ UpdateSelectionCellTemplate(index);
+ }
+#endif
+ }
+ }
+ else
+ {
+ // Add the new selection view to the parent container (likely the calendar or its view).
+ Add(_selectionCellTemplateView);
+
+ // If there was a previously existing cell template view, remove it from the container.
+ // This ensures only one selection cell template is visible at a time.
+ if (_previousSelectionCellTemplateView != null)
+ {
+ Remove(_previousSelectionCellTemplateView);
+ }
+
+ // Update the previous cell template view reference to the current one.
+ // This allows the next time to know which view to remove (for reusability).
+ _previousSelectionCellTemplateView = _selectionCellTemplateView;
+ AbsoluteLayout.SetLayoutBounds(_selectionCellTemplateView, highlightRect);
+ }
+ }
+
+#if ANDROID
+ InvalidateViewMeasure();
+#endif
+ }
+ else
+ {
+ canvas.FillColor = backgroundColor;
+ if (_calendarViewInfo.SelectionShape == CalendarSelectionShape.Circle)
+ {
+ canvas.FillRoundedRectangle(highlightRect, circleCornerRadius);
+ }
+ else
+ {
+ canvas.FillRoundedRectangle(highlightRect, rectCornerRadius);
+ }
+ }
}
///
@@ -1629,16 +1779,78 @@ void UpdateSelectionWhileKeyNavigation(KeyEventArgs args, DateTime oldSelectedDa
CalendarViewHelper.ValidateDateOnKeyNavigation(args, oldSelectedDates, newDate, _calendarViewInfo, _visibleDates, _disabledDates);
}
- #endregion
-
- #region Override Methods
-
- ///
- /// Method to draw the Year view cells.
- ///
- /// The draw canvas.
- /// The rectangle.
- protected override void OnDraw(ICanvas canvas, RectF dirtyRect)
+ ///
+ /// This method handle the selected date based on year views
+ ///
+ /// The selected date on year view
+ /// Returns the updated select date based on year view
+ DateTime SelectedDateBasedOnYearViews(DateTime selected)
+ {
+ selected = _calendarViewInfo.View switch
+ {
+ CalendarView.Year => new DateTime(selected.Year, selected.Month, 1),
+ CalendarView.Decade => new DateTime(selected.Year, 1, 1),
+ CalendarView.Century => new DateTime((selected.Year / 10) * 10, 1, 1),
+ _ => selected // or handle default case appropriately
+ };
+
+ return selected;
+ }
+
+ ///
+ /// Insert the selection cell template instead of selected year cell.
+ ///
+ /// Gets the selected month cell index
+ void UpdateSelectionCellTemplate(int index)
+ {
+ // Insert the selection cell template view at the current index
+ if (_yearCells != null && _selectionCellTemplateView != null)
+ {
+ // Store current selection info
+ _previousYearCellTemplateView = (View)_yearCells[index];
+
+ // Replace with the selection view
+ Children.RemoveAt(index);
+ Insert(index, _selectionCellTemplateView);
+ }
+ }
+
+ ///
+ /// This method handle the selection cell template visibility for date restrictions
+ ///
+ void HideSelectionCellTemplateView()
+ {
+ if (_selectionCellTemplateView == null)
+ {
+ return;
+ }
+
+ // to check If the month cell template value not null
+ if (_calendarViewInfo.YearView.CellTemplate != null)
+ {
+ YearView.RemoveTemplateView(this, _selectionCellTemplateView);
+ }
+ else
+ {
+ // Check if the selectionCellTemplateView is not null and is already part of the view's children.
+ if (_selectionCellTemplateView != null && Children.Contains(_selectionCellTemplateView))
+ {
+ // Set the IsVisible property to false, effectively hiding the selectionCellTemplateView.
+ _selectionCellTemplateView.IsVisible = false;
+ }
+ }
+ }
+
+ #endregion
+
+ #region Override Methods
+
+ ///
+ /// Method to draw the Year view cells.
+ ///
+ /// The draw canvas.
+ /// The rectangle.
+ protected override void OnDraw(ICanvas canvas, RectF dirtyRect)
{
//// If the Width and Height value is less than or equal to zero, no need to draw the view.
if (dirtyRect.Width <= 0 || dirtyRect.Height <= 0)
@@ -1930,7 +2142,14 @@ void ITapGestureListener.OnTap(TapEventArgs e)
if (_calendarViewInfo.CanToggleDaySelection && CalendarViewHelper.IsSameDate(_calendarViewInfo.View, _selectedDate, tappedDate, _calendarViewInfo.Identifier))
{
tappedDate = null;
- }
+
+ // If the selection cell template applied over click the same date while the CanToggleDaySelection value true.
+ if (_selectionCellTemplateView != null)
+ {
+ // To handle the selection cell template visibility
+ HideSelectionCellTemplateView();
+ }
+ }
_calendarViewInfo.UpdateSelectedDate(tappedDate);
break;
@@ -2016,20 +2235,145 @@ void IKeyboardListener.OnKeyUp(KeyEventArgs args)
{
}
- ///
- /// Method to update visible dates on view change.
- ///
- /// The visible dates collection.
- /// Defines whether the view is current view or not.
- void ICalendarView.UpdateVisibleDatesChange(List visibleDatesCollection, bool isCurrentView)
+ ///
+ /// Method to update visible dates on view change.
+ ///
+ /// The visible dates collection.
+ /// Defines whether the view is current view or not.
+ /// Gets the month view instance for current canvas.
+ void ICalendarView.UpdateVisibleDatesChange(List visibleDatesCollection, bool isCurrentView, CustomSnapLayout customSnapLayout)
{
if (_visibleDates == visibleDatesCollection)
{
return;
}
- List previousVisibleDates = _visibleDates;
+ // Check if a SelectionCellTemplate is defined in the calendar configuration
+ if (_calendarViewInfo.SelectionCellTemplate != null && _calendarViewInfo.SelectionMode == CalendarSelectionMode.Single)
+ {
+ // If the custom layout container is null, exit early nothing to process
+ if (customSnapLayout == null)
+ {
+ return;
+ }
+
+ // Iterate through each child view within the custom layout (expected to be YearView instances)
+ foreach (var yearView in customSnapLayout.Children)
+ {
+ var year = yearView as YearView;
+
+ // Proceed only if the view is a YearView and all essential data is present
+ if (year != null && year._visibleDates != null && year._selectionCellTemplateView != null && year.Children != null)
+ {
+ // Loop through each child view of the YearView
+ for (int i = 0; i < year.Children.Count; i++)
+ {
+ View view = (View)year.Children[i];
+
+ // If a CellTemplate is being used for YearView
+ if (_calendarViewInfo.YearView.CellTemplate != null)
+ {
+ // Ensure valid indexing and matching view before proceeding
+ if (year._yearCells != null && year._yearCells.Count > 0 && i < year._yearCells.Count)
+ {
+ // Skip if the current view is already part of the yearCells collection (i.e., already properly placed)
+ if (year._yearCells[i] == view)
+ {
+ continue;
+ }
+
+ // Skip if the selected date is already visible in this year view
+ if (year._visibleDates.Contains(_selectedDate!.Value))
+ {
+ continue;
+ }
+ }
+ }
+ else
+ {
+ // Skip views that are not the selection cell template view
+ if (view != year._selectionCellTemplateView)
+ {
+ continue;
+ }
+ }
+
+ // Process only when a date is selected and the selection mode is single
+ if (_selectedDate != null)
+ {
+ // Get the selected date value
+ DateTime selected = _selectedDate.Value;
+
+ // Determine whether the selected date falls within the allowed range for the current calendar view
+ bool isSelectedDateAfterMinDateForView = _calendarViewInfo.View switch
+ {
+ CalendarView.Year => selected.Month >= _calendarViewInfo.MinimumDate.Month,
+ CalendarView.Decade => selected.Year >= _calendarViewInfo.MinimumDate.Year,
+ CalendarView.Century => (selected.Year / 100) >= (_calendarViewInfo.MinimumDate.Year / 100),
+ _ => false
+ };
+
+ bool isSelectedDateBeforeMaxDateForView = _calendarViewInfo.View switch
+ {
+ CalendarView.Year => selected.Month <= _calendarViewInfo.MaximumDate.Month,
+ CalendarView.Decade => selected.Year <= _calendarViewInfo.MaximumDate.Year,
+ CalendarView.Century => (selected.Year / 100) <= (_calendarViewInfo.MaximumDate.Year / 100),
+ _ => false
+ };
+
+ // Adjust selected date using helper method for the specific view type
+ selected = SelectedDateBasedOnYearViews(selected);
+
+ // It's applicable only Decade and Century views. Because these have trailing and leading dates.
+ bool check = GetYearCellDetails(selected, year._visibleDates[0]).IsTrailingOrLeadingDate;
+
+ // Check if the selected date is part of the visible date range of the YearView
+ bool isInVisibleDates = year._visibleDates.Contains(selected);
+
+ // Determine whether the view should be visible, based on several calendar settings
+ bool isVisible = _calendarViewInfo.EnablePastDates && isSelectedDateAfterMinDateForView && isSelectedDateBeforeMaxDateForView &&
+ _calendarViewInfo.IsSelectableDayPredicate(selected) && (_calendarViewInfo.ShowTrailingAndLeadingDates || !check);
+
+ // Handle visibility or removal depending on template usage
+ if (_calendarViewInfo.YearView.CellTemplate != null)
+ {
+ // Remove the template if date isn't visible or isn't valid
+ if (!isVisible || !isInVisibleDates)
+ {
+ YearView.RemoveTemplateView(year, view);
+ }
+ }
+ else
+ {
+ // If not using template, just set visibility accordingly
+ view.IsVisible = isVisible && isInVisibleDates;
+ }
+ }
+ else
+ {
+ // If no selection is made
+ if (_calendarViewInfo.YearView.CellTemplate != null)
+ {
+ // Remove the selection view if using template
+ YearView.RemoveTemplateView(year, view);
+ }
+ else
+ {
+ // Otherwise, just hide the view
+ view.IsVisible = false;
+ }
+ }
+
+ // Exit the inner loop after processing the selection view for this YearView
+ break;
+ }
+ }
+ }
+ }
+
+ List previousVisibleDates = _visibleDates;
_visibleDates = visibleDatesCollection;
+
#if MACCATALYST || (!ANDROID && !IOS)
_hoverView.UpdateVisibleDatesChange(_visibleDates);
#endif
@@ -2104,7 +2448,14 @@ void ICalendarView.UpdateVisibleDatesChange(List visibleDatesCollectio
///
void ICalendarView.UpdateSelectionValue()
{
- DateTime? previousSelectedDate = _selectedDate;
+ // If Selected date changed dynamically that time it can perform
+ if (_selectionCellTemplateView != null && _calendarViewInfo.SelectionMode == CalendarSelectionMode.Single)
+ {
+ // To handle the selection cell template visibility
+ HideSelectionCellTemplateView();
+ }
+
+ DateTime? previousSelectedDate = _selectedDate;
_selectedDate = _calendarViewInfo.SelectedDate;
if (_calendarViewInfo.SelectionMode != CalendarSelectionMode.Single || CalendarViewHelper.IsSameDate(_calendarViewInfo.View, previousSelectedDate, _selectedDate, _calendarViewInfo.Identifier))
{
@@ -2221,13 +2572,23 @@ void ICalendarView.UpdateDisableAndSpecialDateChange(List? disabledDat
return;
}
+ if (_selectionCellTemplateView != null && _calendarViewInfo.SelectionMode == CalendarSelectionMode.Single)
+ {
+ // If I select any date on current year and selectable predicate date is same as selected date.
+ if (_selectedDate != null && !_calendarViewInfo.IsSelectableDayPredicate((DateTime)_selectedDate))
+ {
+ // To handle the selection cell template visibility
+ HideSelectionCellTemplateView();
+ }
+ }
+
#if MACCATALYST || (!ANDROID && !IOS)
- //// Here we are updating the hover position before checking the previous and current disabled dates are equal.
- //// Because the previous and current view disabled dates may be same and we can't update the hover position on swiping to next or previous view.
- //// On view navigation, the mouse hover position will remain same but visible dates will be changed.
- //// So we are removing hovering when updating disabled date for each view.
- //// If we not update the hover position, the hovering view will be remain even after view changed.
- _hoverView.UpdateHoverPosition(null);
+ //// Here we are updating the hover position before checking the previous and current disabled dates are equal.
+ //// Because the previous and current view disabled dates may be same and we can't update the hover position on swiping to next or previous view.
+ //// On view navigation, the mouse hover position will remain same but visible dates will be changed.
+ //// So we are removing hovering when updating disabled date for each view.
+ //// If we not update the hover position, the hovering view will be remain even after view changed.
+ _hoverView.UpdateHoverPosition(null);
#endif
//// Disabled dates is null then the method called only for update special dates.
@@ -2255,7 +2616,25 @@ void ICalendarView.UpdateDisableAndSpecialDateChange(List? disabledDat
///
void ICalendarView.InvalidateView()
{
- InvalidateDrawable();
+ // Check if selectedDate and selectionCellTemplateView is not null before proceeding with the date restriction validation logic.
+ if (_selectionCellTemplateView != null && _selectedDate != null)
+ {
+ bool isInVisibleDates = _visibleDates?.Contains(_selectedDate.Value) ?? false;
+ bool isTemplateView = false;
+ if (_selectedDate >= _calendarViewInfo.MinimumDate && _selectedDate <= _calendarViewInfo.MaximumDate &&
+ (!isInVisibleDates || _calendarViewInfo.EnablePastDates))
+ {
+ isTemplateView = isInVisibleDates;
+ }
+
+ if (!isTemplateView)
+ {
+ // To handle the selection cell template visibility
+ HideSelectionCellTemplateView();
+ }
+ }
+
+ InvalidateDrawable();
#if MACCATALYST || (!ANDROID && !IOS)
_hoverView.InvalidateDrawable();
#endif
@@ -2266,7 +2645,15 @@ void ICalendarView.InvalidateView()
///
void ICalendarView.InvalidateViewCells()
{
- InvalidateDrawable();
+ // Check if the SelectionMode is not set to 'Single'.
+ // If the SelectionMode is not 'Single', hide the selection cell template view by calling the SelectionCellTemplateVisibility method.
+ if (_selectionCellTemplateView != null && _calendarViewInfo.SelectionMode != CalendarSelectionMode.Single)
+ {
+ // To handle the selection cell template visibility
+ HideSelectionCellTemplateView();
+ }
+
+ InvalidateDrawable();
}
///
@@ -2291,7 +2678,13 @@ void ICalendarView.UpdateTemplateViews(bool isCurrentView)
}
else
{
- DrawingOrder = DrawingOrder.AboveContent;
+ // It's perform when i change show trailing and leading date dynamically
+ if (_calendarViewInfo.SelectionCellTemplate != null && _previousYearCellTemplateView != null)
+ {
+ _previousYearCellTemplateView = null;
+ }
+
+ DrawingOrder = DrawingOrder.AboveContent;
RemoveYearCellsHandler();
_yearCells = new List();
GenerateYearCells(isCurrentView);
diff --git a/maui/src/Carousel/Platform/Android/PlatformCarousel.Android.cs b/maui/src/Carousel/Platform/Android/PlatformCarousel.Android.cs
index d3b0739a..45ee1271 100644
--- a/maui/src/Carousel/Platform/Android/PlatformCarousel.Android.cs
+++ b/maui/src/Carousel/Platform/Android/PlatformCarousel.Android.cs
@@ -3654,4 +3654,4 @@ public override void GetItemOffsets(Rect outRect, View view, RecyclerView parent
}
#endregion
-}
+}
\ No newline at end of file
diff --git a/maui/src/Charts/Annotation/ChartAnnotation.cs b/maui/src/Charts/Annotation/ChartAnnotation.cs
index 08c00ccf..7e88af36 100644
--- a/maui/src/Charts/Annotation/ChartAnnotation.cs
+++ b/maui/src/Charts/Annotation/ChartAnnotation.cs
@@ -471,11 +471,6 @@ internal static void OnAnnotationPropertyInvalidate(BindableObject bindable, obj
{
if (bindable is ChartAnnotation annotation)
{
- if (annotation is ShapeAnnotation shapeAnnotation)
- {
- shapeAnnotation.InitializeDynamicResource(shapeAnnotation);
- }
-
annotation.Invalidate();
}
}
diff --git a/maui/src/Charts/Annotation/ShapeAnnotation.cs b/maui/src/Charts/Annotation/ShapeAnnotation.cs
index 980d4817..9400c542 100644
--- a/maui/src/Charts/Annotation/ShapeAnnotation.cs
+++ b/maui/src/Charts/Annotation/ShapeAnnotation.cs
@@ -605,19 +605,6 @@ internal virtual Brush GetDefaultStrokeColor()
return new SolidColorBrush(Color.FromArgb("#6750A4"));
}
- internal void InitializeDynamicResource(ShapeAnnotation annotation)
- {
- if (annotation is LineAnnotation)
- {
- SetDynamicResource(StrokeProperty, "SfCartesianChartLineAnnotationStroke");
- }
- else
- {
- SetDynamicResource(FillProperty, "SfCartesianChartShapeAnnotationFill");
- SetDynamicResource(StrokeProperty, "SfCartesianChartShapeAnnotationStroke");
- }
- }
-
#endregion
#region Private Methods
diff --git a/maui/src/Charts/Area/CircularPlotArea.cs b/maui/src/Charts/Area/CircularPlotArea.cs
index 0aae7680..f261cee8 100644
--- a/maui/src/Charts/Area/CircularPlotArea.cs
+++ b/maui/src/Charts/Area/CircularPlotArea.cs
@@ -22,7 +22,7 @@ public CircularPlotArea(CircularChartArea chartArea) : base()
#region Methods
protected override void UpdateLegendItemsSource()
{
- if (Series == null || _legend == null || !_legend.IsVisible)
+ if (Series == null || _legend == null)
{
return;
}
diff --git a/maui/src/Charts/Area/Partial/CartesianChartArea.cs b/maui/src/Charts/Area/Partial/CartesianChartArea.cs
index c9f5c783..ad6d14bf 100644
--- a/maui/src/Charts/Area/Partial/CartesianChartArea.cs
+++ b/maui/src/Charts/Area/Partial/CartesianChartArea.cs
@@ -465,7 +465,6 @@ static void CalculateStackingValues(Dictionary>
{
foreach (var seriesList in seriesGroup.Values)
{
- var xValues = seriesList[0].GetXValues();
var positiveYValues = new Dictionary();
var negativeYValues = new Dictionary();
@@ -482,15 +481,16 @@ static void CalculateStackingValues(Dictionary>
axisCross = 1;
}
}
-
- if (xValues != null)
+
+ foreach (var series in seriesList)
{
- foreach (var series in seriesList)
- {
- var yValues = series.YValues;
- var bottomValues = new List();
- var topValues = new List();
+ var xValues = series.GetXValues();
+ var yValues = series.YValues;
+ var bottomValues = new List();
+ var topValues = new List();
+ if (xValues != null)
+ {
for (int i = 0; i < xValues.Count; i++)
{
var xValue = xValues[i];
diff --git a/maui/src/Charts/Axis/CategoryAxis.cs b/maui/src/Charts/Axis/CategoryAxis.cs
index 3090a03a..c45125f2 100644
--- a/maui/src/Charts/Axis/CategoryAxis.cs
+++ b/maui/src/Charts/Axis/CategoryAxis.cs
@@ -21,7 +21,7 @@ protected override double CalculateActualInterval(DoubleRange range, Size availa
}
///
- protected override DoubleRange ApplyRangePadding(DoubleRange range, double interval)
+ protected sealed override DoubleRange ApplyRangePadding(DoubleRange range, double interval)
{
return LabelPlacement == LabelPlacement.BetweenTicks ? new DoubleRange(-0.5, (int)range.End + 0.5) : range;
}
diff --git a/maui/src/Charts/Axis/ChartAxis.cs b/maui/src/Charts/Axis/ChartAxis.cs
index 4677fb98..33602687 100644
--- a/maui/src/Charts/Axis/ChartAxis.cs
+++ b/maui/src/Charts/Axis/ChartAxis.cs
@@ -684,16 +684,16 @@ void VisibleLabels_CollectionChanged(object? sender, NotifyCollectionChangedEven
if (e.NewItems[0] is ChartAxisLabel item)
{
- var currentLabelCoeffientValue = ValueToCoefficient(item.Position);
+ var currentLabelCoefficientValue = ValueToCoefficient(item.Position);
//Checking the position of the current label already has a label or not.
- if (double.Equals(Math.Round(_previousLabelCoefficientValue, 3), Math.Round(currentLabelCoeffientValue, 3)))
+ if (double.Equals(Math.Round(_previousLabelCoefficientValue, 3), Math.Round(currentLabelCoefficientValue, 3)))
{
VisibleLabels?.Remove(item);
}
else
{
- _previousLabelCoefficientValue = currentLabelCoeffientValue;
+ _previousLabelCoefficientValue = currentLabelCoefficientValue;
}
InvokeLabelCreated(item);
diff --git a/maui/src/Charts/Axis/ChartAxisPartial/ChartAxis.cs b/maui/src/Charts/Axis/ChartAxisPartial/ChartAxis.cs
index f550a371..d5a7f7e1 100644
--- a/maui/src/Charts/Axis/ChartAxisPartial/ChartAxis.cs
+++ b/maui/src/Charts/Axis/ChartAxisPartial/ChartAxis.cs
@@ -479,7 +479,7 @@ public partial class ChartAxis
///
/// Determines the maximum number of labels displayed per 100 pixels.
///
- internal static readonly BindableProperty MaximumLabelsProperty = BindableProperty.Create(
+ public static readonly BindableProperty MaximumLabelsProperty = BindableProperty.Create(
nameof(MaximumLabels),
typeof(int),
typeof(ChartAxis),
@@ -1870,6 +1870,46 @@ public AxisElementPosition LabelsPosition
set { SetValue(LabelsPositionProperty, value); }
}
+ ///
+ /// Gets or sets the value that determines the number of labels to be displayed per 100 pixels.
+ ///
+ /// This property takes the integer value.
+ /// This property used to give constrain over the auto generated labels, which reduces the number elements rendering in view.
+ /// Intended for use with Cartesian axes in SfCartesianChart to control label density; not recommended for Polar charts.
+ ///
+ /// ///
+ /// # [MainPage.xaml](#tab/tabid-1)
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// ]]>
+ ///
+ /// # [MainPage.xaml.cs](#tab/tabid-2)
+ ///
+ ///
+ /// ***
+ ///
+ public int MaximumLabels
+ {
+ get { return (int)GetValue(MaximumLabelsProperty); }
+ set { SetValue(MaximumLabelsProperty, value); }
+ }
+
///
/// Gets the axis labels visible
///
@@ -1909,18 +1949,6 @@ internal ChartAxisRangeStyleCollection RangeStyles
set { SetValue(RangeStylesProperty, value); }
}
- ///
- /// Gets or sets the value that determines the number of labels to be displayed per 100 pixels.
- ///
- /// This property takes the integer value.
- /// This property used to give constrain over the auto generated labels, which reduces the number elements rendering in view.
- ///TODO: Provide alter way for this support.
- internal int MaximumLabels
- {
- get { return (int)GetValue(MaximumLabelsProperty); }
- set { SetValue(MaximumLabelsProperty, value); }
- }
-
internal static readonly BindableProperty TrackballAxisBackgroundProperty = BindableProperty.Create(nameof(TrackballAxisBackground), typeof(Brush), typeof(ChartAxis), SolidColorBrush.Black, BindingMode.Default, null, null);
internal Brush TrackballAxisBackground
@@ -1945,6 +1973,22 @@ internal Brush MajorGridLineStroke
set { SetValue(MajorGridLineStrokeProperty, value); }
}
+ internal static readonly BindableProperty MajorTickLineStrokeProperty = BindableProperty.Create(nameof(MajorTickLineStroke), typeof(Brush), typeof(ChartAxis), new SolidColorBrush(Color.FromArgb("#CAC4D0")), BindingMode.Default, null, null);
+
+ internal Brush MajorTickLineStroke
+ {
+ get { return (Brush)GetValue(MajorTickLineStrokeProperty); }
+ set { SetValue(MajorTickLineStrokeProperty, value); }
+ }
+
+ internal static readonly BindableProperty AxisLineStrokeProperty = BindableProperty.Create(nameof(AxisLineStroke), typeof(Brush), typeof(ChartAxis), new SolidColorBrush(Color.FromArgb("#CAC4D0")), BindingMode.Default, null, null);
+
+ internal Brush AxisLineStroke
+ {
+ get { return (Brush)GetValue(AxisLineStrokeProperty); }
+ set { SetValue(AxisLineStrokeProperty, value); }
+ }
+
#region is Polar
internal PolarChartArea? PolarArea { get; set; }
@@ -2447,12 +2491,14 @@ void InitializeConstructor()
SetDynamicResource(TrackballAxisBackgroundProperty, "SfCartesianChartTrackballAxisLabelBackground");
SetDynamicResource(TrackballAxisFontSizeProperty, "SfCartesianChartTrackballAxisLabelTextFontSize");
SetDynamicResource(MajorGridLineStrokeProperty, "SfCartesianChartMajorGridLineStroke");
+ SetDynamicResource(MajorTickLineStrokeProperty, "SfCartesianChartMajorTickLineStroke");
+ SetDynamicResource(AxisLineStrokeProperty, "SfCartesianChartAxisLineStroke");
//Todo: Remove this code, After ClipsToBounds works in iOS and Windows.
EdgeLabelsDrawingMode = EdgeLabelsDrawingMode.Shift;
- AxisLineStyle = new ChartLineStyle();
+ AxisLineStyle = new ChartLineStyle() { Stroke = AxisLineStroke };
LabelStyle = new ChartAxisLabelStyle();
MajorGridLineStyle = new ChartLineStyle() { Stroke = MajorGridLineStroke };
- MajorTickStyle = new ChartAxisTickStyle();
+ MajorTickStyle = new ChartAxisTickStyle() { Stroke = MajorTickLineStroke };
TrackballLabelStyle = new ChartLabelStyle() { FontSize = TrackballAxisFontSize, Background = TrackballAxisBackground };
}
@@ -2604,7 +2650,6 @@ static void OnMajorTickStyleChanged(BindableObject bindable, object oldValue, ob
if (newValue is ChartAxisTickStyle tickStyle)
{
SetInheritedBindingContext(tickStyle, axis.BindingContext);
- axis.MajorTickStyle.InitializeDynamicResource("MajorTickStyle");
tickStyle.PropertyChanged += axis.Style_PropertyChanged;
}
@@ -2712,7 +2757,6 @@ static void OnAxisLineStyleChanged(BindableObject bindable, object oldValue, obj
if (newValue is ChartLineStyle lineStyle)
{
SetInheritedBindingContext(lineStyle, axis.BindingContext);
- lineStyle.SetDynamicResource(ChartLineStyle.StrokeProperty, "SfCartesianChartAxisLineStroke");
lineStyle.PropertyChanged += axis.Style_PropertyChanged;
}
diff --git a/maui/src/Charts/Axis/ChartAxisPartial/RangeAxisBase.cs b/maui/src/Charts/Axis/ChartAxisPartial/RangeAxisBase.cs
index 40047140..04cfff6e 100644
--- a/maui/src/Charts/Axis/ChartAxisPartial/RangeAxisBase.cs
+++ b/maui/src/Charts/Axis/ChartAxisPartial/RangeAxisBase.cs
@@ -101,8 +101,10 @@ public RangeAxisBase()
Stroke = MinorGridLineStroke,
StrokeWidth = 0.5f
};
+ SetDynamicResource(MinorTickLineStrokeProperty, "SfCartesianChartMinorTickLineStroke");
MinorTickStyle = new ChartAxisTickStyle
{
+ Stroke = MinorTickLineStroke,
TickSize = 4d
};
}
@@ -329,12 +331,21 @@ public bool ShowMinorGridLines
#endregion
internal static readonly BindableProperty MinorGridLineStrokeProperty = BindableProperty.Create(nameof(MinorGridLineStroke), typeof(Brush), typeof(RangeAxisBase), new SolidColorBrush(Color.FromArgb("#EDEFF1")), BindingMode.Default, null, null);
+
internal Brush MinorGridLineStroke
{
get { return (Brush)GetValue(MinorGridLineStrokeProperty); }
set { SetValue(MinorGridLineStrokeProperty, value); }
}
+ internal static readonly BindableProperty MinorTickLineStrokeProperty = BindableProperty.Create(nameof(MinorTickLineStroke), typeof(Brush), typeof(RangeAxisBase), new SolidColorBrush(Color.FromArgb("#CAC4D0")), BindingMode.Default, null, null);
+
+ internal Brush MinorTickLineStroke
+ {
+ get { return (Brush)GetValue(MinorTickLineStrokeProperty); }
+ set { SetValue(MinorTickLineStrokeProperty, value); }
+ }
+
#region Methods
#region Protected Methods
@@ -356,6 +367,24 @@ protected override void OnBindingContextChanged()
}
}
+ ///
+ /// Sets the parent for the axis elements.
+ ///
+ ///
+ protected override void OnParentSet()
+ {
+ base.OnParentSet();
+
+ if (MinorGridLineStyle != null)
+ {
+ MinorGridLineStyle.Parent = Parent;
+ }
+ if (MinorTickStyle != null)
+ {
+ MinorTickStyle.Parent = Parent;
+ }
+ }
+
#endregion
#region Internal Methods
@@ -440,7 +469,6 @@ static void OnMinorTickStylePropertyChanged(BindableObject bindable, object oldV
if (newValue is ChartAxisTickStyle tickStyle)
{
SetInheritedBindingContext(tickStyle, axis.BindingContext);
- axis.MinorTickStyle.InitializeDynamicResource("MinorTickStyle");
tickStyle.PropertyChanged += axis.LineStyle_PropertyChanged;
tickStyle.Parent = axis.Parent;
}
diff --git a/maui/src/Charts/Axis/DateTimeCategoryAxis.cs b/maui/src/Charts/Axis/DateTimeCategoryAxis.cs
new file mode 100644
index 00000000..2378d854
--- /dev/null
+++ b/maui/src/Charts/Axis/DateTimeCategoryAxis.cs
@@ -0,0 +1,793 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace Syncfusion.Maui.Toolkit.Charts;
+
+///
+/// The DateTimeCategoryAxis is a specialized axis for plotting chronological data where the axis labels represent dates and times.
+///
+///
+///
+/// The DateTimeCategoryAxis is used only for the X(horizontal) axis in charts.
+///
+/// To render a DateTimeCategory axis, add its instance to the charts collection as shown in the following code sample.
+///
+/// # [MainPage.xaml](#tab/tabid-1)
+///
+///
+///
+///
+///
+///
+///
+/// ]]>
+///
+/// # [MainPage.xaml.cs](#tab/tabid-2)
+///
+///
+/// ***
+///
+/// The DateTimeCategoryAxis supports the following features. Refer to the corresponding APIs for more details and example codes.
+///
+/// Title - To render the title on the axis, refer to the property.
+/// Grid Lines - To show and customize grid lines, refer to and properties.
+/// Axis Line - Customize the axis line using the property.
+/// Labels Customization - Customize axis labels using the property.
+/// Inversed Axis - Invert the axis using the property.
+/// Axis Crossing - For axis crossing, refer to , , and properties.
+/// Interval - Define the interval between axis labels using the and properties.
+///
+public partial class DateTimeCategoryAxis : ChartAxis
+{
+ #region Bindable Properties
+
+ ///
+ /// Identifies the bindable property.
+ ///
+ ///
+ /// Defines the collection of plot bands for the DateTimeCategory axis.
+ ///
+ public static readonly BindableProperty PlotBandsProperty = BindableProperty.Create(nameof(PlotBands), typeof(NumericalPlotBandCollection), typeof(DateTimeCategoryAxis), null, BindingMode.Default, null, OnPlotBandsPropertyChanged);
+
+ ///
+ /// Identifies the bindable property.
+ ///
+ ///
+ /// The property represents the interval value for the DateTimeCategory axis.
+ ///
+ public static readonly BindableProperty IntervalProperty = BindableProperty.Create(nameof(Interval), typeof(double), typeof(DateTimeCategoryAxis), double.NaN, BindingMode.Default, null, OnIntervalPropertyChanged);
+
+ ///
+ /// Identifies the bindable property.
+ ///
+ ///
+ /// Defines the type of interval for the DateTimeCategory axis.
+ ///
+ public static readonly BindableProperty IntervalTypeProperty = BindableProperty.Create(nameof(IntervalType), typeof(DateTimeIntervalType), typeof(DateTimeCategoryAxis), DateTimeIntervalType.Auto, BindingMode.Default, null, OnIntervalTypePropertyChanged);
+
+ #endregion
+
+ #region Public Properties
+
+ ///
+ /// Gets or sets the collection of plot bands.
+ ///
+ /// It accepts and the default value is null.
+ ///
+ /// Plot bands are used to shade specific regions in the chart to improve data visualization.
+ ///
+ ///
+ /// # [MainPage.xaml](#tab/tabid-3)
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// ]]>
+ ///
+ /// # [MainPage.xaml.cs](#tab/tabid-4)
+ ///
+ ///
+ /// ***
+ ///
+ ///
+ public NumericalPlotBandCollection PlotBands
+ {
+ get { return (NumericalPlotBandCollection)GetValue(PlotBandsProperty); }
+ set { SetValue(PlotBandsProperty, value); }
+ }
+
+ ///
+ /// Gets or sets a value that can be used to change the interval between labels.
+ ///
+ /// It accepts double values and the default value is double.NaN.
+ ///
+ /// If this property is not set, the interval will be calculated automatically.
+ /// By default, the interval will be calculated based on the minimum and maximum values of the provided data.
+ ///
+ ///
+ /// # [MainPage.xaml](#tab/tabid-5)
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// ]]>
+ ///
+ /// # [MainPage.xaml.cs](#tab/tabid-6)
+ ///
+ ///
+ /// ***
+ ///
+ ///
+ ///
+ public double Interval
+ {
+ get { return (double)GetValue(IntervalProperty); }
+ set { SetValue(IntervalProperty, value); }
+ }
+
+ ///
+ /// Gets or sets the type of interval to be displayed in the axis.
+ ///
+ /// It accepts values and the default value is DateTimeIntervalType.Auto.
+ ///
+ /// The IntervalType property determines the unit of measurement for the axis interval.
+ /// When set to Auto, the interval type will be calculated automatically based on the data range.
+ ///
+ ///
+ /// # [MainPage.xaml](#tab/tabid-7)
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// ]]>
+ ///
+ /// # [MainPage.xaml.cs](#tab/tabid-8)
+ ///
+ ///
+ /// ***
+ ///
+ ///
+ ///
+ public DateTimeIntervalType IntervalType
+ {
+ get { return (DateTimeIntervalType)GetValue(IntervalTypeProperty); }
+ set { SetValue(IntervalTypeProperty, value); }
+ }
+
+ #endregion
+
+ #region Internal Property
+
+ internal DateTimeIntervalType ActualIntervalType { get; set; }
+
+ #endregion
+
+ #region Methods
+
+ #region Internal Override
+
+ ///
+ protected sealed override DoubleRange ApplyRangePadding(DoubleRange range, double interval)
+ {
+ return range;
+ }
+
+ ///
+ protected override double CalculateNiceInterval(DoubleRange actualRange, Size availableSize)
+ {
+ var dateTimeMin = DateTime.FromOADate(actualRange.Start);
+ var dateTimeMax = DateTime.FromOADate(actualRange.End);
+ var timeSpan = dateTimeMax.Subtract(dateTimeMin);
+ double interval = 0;
+
+ switch (IntervalType)
+ {
+ case DateTimeIntervalType.Years:
+ interval = base.CalculateNiceInterval(new DoubleRange(0, timeSpan.TotalDays / 365), availableSize);
+ break;
+ case DateTimeIntervalType.Months:
+ interval = base.CalculateNiceInterval(new DoubleRange(0, timeSpan.TotalDays / 30), availableSize);
+ break;
+ case DateTimeIntervalType.Days:
+ interval = base.CalculateNiceInterval(new DoubleRange(0, timeSpan.TotalDays), availableSize);
+ break;
+ case DateTimeIntervalType.Hours:
+ interval = base.CalculateNiceInterval(new DoubleRange(0, timeSpan.TotalHours), availableSize);
+ break;
+ case DateTimeIntervalType.Minutes:
+ interval = base.CalculateNiceInterval(new DoubleRange(0, timeSpan.TotalMinutes), availableSize);
+ break;
+ case DateTimeIntervalType.Seconds:
+ interval = base.CalculateNiceInterval(new DoubleRange(0, timeSpan.TotalSeconds), availableSize);
+ break;
+ case DateTimeIntervalType.Milliseconds:
+ interval = base.CalculateNiceInterval(new DoubleRange(0, timeSpan.TotalMilliseconds), availableSize);
+ break;
+ case DateTimeIntervalType.Auto:
+ interval = CalculateIntervalForAutoType(availableSize, timeSpan);
+ break;
+ }
+
+ return Math.Max(1d, interval);
+ }
+
+ ///
+ protected override double CalculateActualInterval(DoubleRange range, Size availableSize)
+ {
+ if (double.IsNaN(AxisInterval) || AxisInterval == 0)
+ {
+ return CalculateNiceInterval(range, availableSize);
+ }
+
+ return AxisInterval;
+ }
+
+ [RequiresUnreferencedCode("The GenerateVisibleLabels is not trim compatible")]
+ internal override void GenerateVisibleLabels()
+ {
+ if (VisibleRange.IsEmpty)
+ {
+ return;
+ }
+
+ _isOverriddenOnCreateLabelsMethod = ChartUtils.IsOverriddenMethod(this, "OnCreateLabels");
+
+ DoubleRange visibleRange = VisibleRange;
+ double actualInterval = ActualInterval;
+ double interval = (AxisInterval != 0 && !double.IsNaN(AxisInterval)) ? AxisInterval : ActualInterval;
+ double position = visibleRange.Start - (visibleRange.Start % actualInterval);
+ var actualSeries = GetActualSeries();
+
+ if (actualSeries == null)
+ {
+ return;
+ }
+
+ if (actualSeries.ActualXValues is List xValues)
+ {
+ switch (ActualIntervalType)
+ {
+ case DateTimeIntervalType.Years:
+ AddYearTypeLabels(xValues, position, interval, _isOverriddenOnCreateLabelsMethod);
+ break;
+ case DateTimeIntervalType.Months:
+ AddMonthTypeLabels(xValues, position, interval, _isOverriddenOnCreateLabelsMethod);
+ break;
+ case DateTimeIntervalType.Days:
+ AddDayTypeLabels(xValues, position, interval, _isOverriddenOnCreateLabelsMethod);
+ break;
+ case DateTimeIntervalType.Hours:
+ AddHourTypeLabels(xValues, position, interval, _isOverriddenOnCreateLabelsMethod);
+ break;
+ case DateTimeIntervalType.Minutes:
+ AddMinutesTypeLabels(xValues, position, interval, _isOverriddenOnCreateLabelsMethod);
+ break;
+ case DateTimeIntervalType.Seconds:
+ AddSecondTypeLabels(xValues, position, interval, _isOverriddenOnCreateLabelsMethod);
+ break;
+ case DateTimeIntervalType.Milliseconds:
+ AddMillisecondTypeLabels(xValues, position, interval, _isOverriddenOnCreateLabelsMethod);
+ break;
+ case DateTimeIntervalType.Auto:
+ AddAutoTypeLabels(xValues, position, interval, _isOverriddenOnCreateLabelsMethod);
+ break;
+ }
+ }
+
+ if (_isOverriddenOnCreateLabelsMethod)
+ {
+ OnCreateLabels();
+ AddVisibleLabels();
+ }
+ }
+
+ #endregion
+
+ #region Internal Methods
+
+ internal string GetLabelContent(double position, string labelFormat)
+ {
+ var actualSeries = GetActualSeries();
+ if (actualSeries != null)
+ {
+ labelFormat = LabelStyle.LabelFormat ?? GetSpecificFormattedLabel(ActualIntervalType);
+ if (actualSeries.ActualXValues is List xValues && position < xValues.Count && position >= 0)
+ {
+ double xDateTime = xValues[(int)position];
+ return GetFormattedAxisLabel(labelFormat, xDateTime);
+ }
+ }
+
+ return position.ToString();
+ }
+
+ #endregion
+
+ #region Callback Method
+
+ private static void OnIntervalPropertyChanged(BindableObject bindable, object oldValue, object newValue)
+ {
+ if (bindable is DateTimeCategoryAxis dateTimeCategoryAxis)
+ {
+ dateTimeCategoryAxis.UpdateAxisInterval((double)newValue);
+ dateTimeCategoryAxis.UpdateLayout();
+ }
+ }
+
+ private static void OnIntervalTypePropertyChanged(BindableObject bindable, object oldValue, object newValue)
+ {
+ if (bindable is DateTimeCategoryAxis dateTimeCategoryAxis)
+ {
+ dateTimeCategoryAxis.UpdateActualIntervalType((DateTimeIntervalType)newValue);
+ dateTimeCategoryAxis.UpdateLayout();
+ }
+ }
+
+ void UpdateActualIntervalType(DateTimeIntervalType intervalType)
+ {
+ ActualIntervalType = intervalType;
+ }
+
+ #endregion
+
+ #region Private Methods
+
+ private double CalculateIntervalForAutoType(SizeF availableSize, TimeSpan timeSpan)
+ {
+ var intervalTypes = new List<(double RangeDivision, DateTimeIntervalType IntervalType)>
+ {
+ (timeSpan.TotalDays / 365, DateTimeIntervalType.Years),
+ (timeSpan.TotalDays / 30, DateTimeIntervalType.Months),
+ (timeSpan.TotalDays, DateTimeIntervalType.Days),
+ (timeSpan.TotalHours, DateTimeIntervalType.Hours),
+ (timeSpan.TotalMinutes, DateTimeIntervalType.Minutes),
+ (timeSpan.TotalSeconds, DateTimeIntervalType.Seconds),
+ (timeSpan.TotalMilliseconds, DateTimeIntervalType.Milliseconds)
+ };
+
+ double interval = 0;
+
+ // Before the loop starts, set ActualIntervalType to the last item in the list.
+ // If none meet the condition interval >= 1, it remains as it is the last item.
+ ActualIntervalType = intervalTypes.Last().IntervalType;
+
+
+ foreach (var (rangeDivision, intervalType) in intervalTypes)
+ {
+ interval = base.CalculateNiceInterval(new DoubleRange(0, rangeDivision), availableSize);
+
+ //If any interval meets the condition interval >= 1, it will override the default.
+ if (interval >= 1)
+ {
+ ActualIntervalType = intervalType;
+ break;
+ }
+ }
+
+ return interval;
+ }
+
+ private void AddAutoTypeLabels(List xValues, double position, double interval, bool isOverriddenOnCreateLabelsMethod)
+ {
+ for (; position <= VisibleRange.End; position += interval)
+ {
+ if (VisibleRange.Inside(position) && position < xValues.Count && position > -1)
+ {
+ int pos = (int)Math.Round(position);
+ var value = xValues[pos];
+ AddVisibleLabels(value, pos, isOverriddenOnCreateLabelsMethod);
+ }
+ }
+ }
+
+ private void AddMillisecondTypeLabels(List xValues, double position, double interval, bool isOverriddenOnCreateLabelsMethod)
+ {
+ var xStartValue = DateTime.FromOADate(xValues[0]);
+ int hour = xStartValue.Hour,
+ mins = xStartValue.Minute,
+ secs = xStartValue.Second,
+ millisecs = xStartValue.Millisecond;
+ DateTime date = xStartValue.Date;
+
+ for (; position <= VisibleRange.End; position++)
+ {
+ int pos = (int)Math.Round(position);
+ if (VisibleRange.Inside(position) && pos > -1 && pos < xValues.Count)
+ {
+ var xValue = DateTime.FromOADate(xValues[pos]);
+ if (xValue.Date > date)
+ {
+ date = xValue.Date;
+ hour = xValue.Hour;
+ }
+
+ if (xValue.Date == date)
+ {
+ if (xValue.Hour > hour)
+ {
+ hour = xValue.Hour;
+ mins = xValue.Minute;
+ }
+
+ if (xValue.Hour == hour)
+ {
+ if (xValue.Minute > mins)
+ {
+ mins = xValue.Minute;
+ secs = xValue.Second;
+ }
+
+ if (xValue.Minute == mins)
+ {
+ if (xValue.Second > secs)
+ {
+ secs = xValue.Second;
+ millisecs = xValue.Millisecond;
+ }
+
+ if (xValue.Second == secs)
+ {
+ if (xValue.Millisecond > millisecs)
+ {
+ millisecs = xValue.Millisecond;
+ }
+
+ if (xValue.Millisecond == millisecs)
+ {
+ var value = xValues[pos];
+ AddVisibleLabels(value, pos, isOverriddenOnCreateLabelsMethod);
+ hour = xValue.AddMilliseconds((int)interval).Hour;
+ mins = xValue.AddMilliseconds((int)interval).Minute;
+ date = xValue.AddMilliseconds((int)interval).Date;
+ secs = xValue.AddMilliseconds((int)interval).Second;
+ millisecs = xValue.AddMilliseconds((int)interval).Millisecond;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void AddSecondTypeLabels(List xValues, double position, double interval, bool isOverriddenOnCreateLabelsMethod)
+ {
+ var xStartValue = DateTime.FromOADate(xValues[0]);
+ int hour = xStartValue.Hour,
+ mins = xStartValue.Minute,
+ secs = xStartValue.Second;
+ DateTime date = xStartValue.Date;
+
+ for (; position <= VisibleRange.End; position++)
+ {
+ int pos = (int)Math.Round(position);
+ if (VisibleRange.Inside(position) && pos > -1 && pos < xValues.Count)
+ {
+ var xValue = DateTime.FromOADate(xValues[pos]);
+ if (xValue.Date > date)
+ {
+ date = xValue.Date;
+ hour = xValue.Hour;
+ }
+
+ if (xValue.Date == date)
+ {
+ if (xValue.Hour > hour)
+ {
+ hour = xValue.Hour;
+ mins = xValue.Minute;
+ }
+
+ if (xValue.Hour == hour)
+ {
+ if (xValue.Minute > mins)
+ {
+ mins = xValue.Minute;
+ secs = xValue.Second;
+ }
+
+ if (xValue.Minute == mins)
+ {
+ if (xValue.Second > secs)
+ {
+ secs = xValue.Second;
+ }
+
+ if (xValue.Second == secs)
+ {
+ var value = xValues[pos];
+ AddVisibleLabels(value, pos, isOverriddenOnCreateLabelsMethod);
+ hour = xValue.AddSeconds((int)interval).Hour;
+ mins = xValue.AddSeconds((int)interval).Minute;
+ date = xValue.AddSeconds((int)interval).Date;
+ secs = xValue.AddSeconds((int)interval).Second;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void AddMinutesTypeLabels(List xValues, double position, double interval, bool isOverriddenOnCreateLabelsMethod)
+ {
+ var xStartValue = DateTime.FromOADate(xValues[0]);
+ int hour = xStartValue.Hour, mins = xStartValue.Minute;
+ DateTime date = xStartValue.Date;
+
+ for (; position <= VisibleRange.End; position++)
+ {
+ int pos = (int)Math.Round(position);
+
+ if (VisibleRange.Inside(position) && pos > -1 && pos < xValues.Count)
+ {
+ var xValue = DateTime.FromOADate(xValues[pos]);
+ if (xValue.Date > date)
+ {
+ date = xValue.Date;
+ hour = xValue.Hour;
+ }
+
+ if (xValue.Date == date)
+ {
+ if (xValue.Hour > hour)
+ {
+ hour = xValue.Hour;
+ mins = xValue.Minute;
+ }
+
+ if (xValue.Hour == hour)
+ {
+ if (xValue.Minute > mins)
+ {
+ mins = xValue.Minute;
+ }
+
+ if (xValue.Minute == mins)
+ {
+ var value = xValues[pos];
+ AddVisibleLabels(value, pos, isOverriddenOnCreateLabelsMethod);
+ hour = xValue.AddMinutes((int)interval).Hour;
+ mins = xValue.AddMinutes((int)interval).Minute;
+ date = xValue.AddMinutes((int)interval).Date;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void AddHourTypeLabels(List xValues, double position, double interval, bool isOverriddenOnCreateLabelsMethod)
+ {
+ var xStartValue = DateTime.FromOADate(xValues[0]);
+ int hour = xStartValue.Hour;
+ DateTime date = xStartValue.Date;
+
+ for (; position <= VisibleRange.End; position++)
+ {
+ int pos = (int)Math.Round(position);
+ if (VisibleRange.Inside(position) && pos > -1 && pos < xValues.Count)
+ {
+ var xValue = DateTime.FromOADate(xValues[pos]);
+ if (xValue.Date > date)
+ {
+ date = xValue.Date;
+ hour = xValue.Hour;
+ }
+
+ if (xValue.Date == date)
+ {
+ if (xValue.Hour > hour)
+ {
+ hour = xValue.Hour;
+ }
+
+ if (xValue.Hour == hour)
+ {
+ var value = xValues[pos];
+ AddVisibleLabels(value, pos, isOverriddenOnCreateLabelsMethod);
+ hour = xValue.AddHours((int)interval).Hour;
+ date = xValue.AddHours((int)interval).Date;
+ }
+ }
+ }
+ }
+ }
+
+ private void AddDayTypeLabels(List xValues, double position, double interval, bool isOverriddenOnCreateLabelsMethod)
+ {
+ var xStartValue = DateTime.FromOADate(xValues[0]);
+ DateTime date = xStartValue.Date;
+
+ for (; position <= VisibleRange.End; position++)
+ {
+ int pos = (int)Math.Round(position);
+ if (VisibleRange.Inside(position) && pos > -1 && pos < xValues.Count)
+ {
+ var xValue = DateTime.FromOADate(xValues[pos]);
+ if (xValue.Date > date)
+ {
+ date = xValue.Date;
+ }
+
+ if (xValue.Date == date)
+ {
+ var value = xValues[pos];
+ AddVisibleLabels(value, pos, isOverriddenOnCreateLabelsMethod);
+ date = xValue.AddDays((int)interval).Date;
+ }
+ }
+ }
+ }
+
+ private void AddMonthTypeLabels(List xValues, double position, double interval, bool isOverriddenOnCreateLabelsMethod)
+ {
+ var xStartValue = DateTime.FromOADate(xValues[0]);
+ int year = xStartValue.Year, month = xStartValue.Month;
+
+ for (; position <= VisibleRange.End; position++)
+ {
+ int pos = (int)Math.Round(position);
+ if (VisibleRange.Inside(position) && pos > -1 && pos < xValues.Count)
+ {
+ var xValue = DateTime.FromOADate(xValues[pos]);
+ if (xValue.Year > year)
+ {
+ year = xValue.Year;
+ month = xValue.Month;
+ }
+
+ if (xValue.Year == year)
+ {
+ if (xValue.Month > month)
+ {
+ month = xValue.Month;
+ }
+
+ if (xValue.Month == month)
+ {
+ var value = xValues[pos];
+ AddVisibleLabels(value, pos, isOverriddenOnCreateLabelsMethod);
+ month = xValue.AddMonths((int)interval).Month;
+ year = xValue.AddMonths((int)interval).Year;
+ }
+ }
+ }
+ }
+ }
+
+ private void AddYearTypeLabels(List xValues, double position, double interval, bool isOverriddenOnCreateLabelsMethod)
+ {
+ var xStartValue = DateTime.FromOADate(xValues[0]);
+ int year = xStartValue.Year;
+
+ for (; position <= VisibleRange.End; position++)
+ {
+ int pos = (int)Math.Round(position);
+ if (VisibleRange.Inside(position) && pos > -1 && pos < xValues.Count)
+ {
+ var xValue = DateTime.FromOADate(xValues[pos]);
+ if (xValue.Year > year)
+ {
+ year = xValue.Year;
+ }
+
+ if (xValue.Year == year)
+ {
+ var value = xValues[pos];
+ AddVisibleLabels(value, pos, _isOverriddenOnCreateLabelsMethod);
+ year = xValue.AddYears((int)interval).Year;
+ }
+ }
+ }
+ }
+
+ private void AddVisibleLabels(double value, int pos, bool isOverriddenOnCreateLabelsMethod)
+ {
+ var labelFormat = LabelStyle.LabelFormat ?? GetSpecificFormattedLabel(ActualIntervalType);
+ var labelContent = GetFormattedAxisLabel(labelFormat, value);
+ var axisLabel = new ChartAxisLabel(pos, labelContent);
+ VisibleLabels.Add(axisLabel);
+
+ if (!_isOverriddenOnCreateLabelsMethod)
+ {
+ TickPositions.Add(pos);
+ }
+ }
+
+ private ChartSeries? GetActualSeries()
+ {
+ var visibleSeries = GetVisibleSeries();
+ if (visibleSeries == null)
+ {
+ return null;
+ }
+
+ int dataCount = 0;
+ ChartSeries? selectedSeries = null;
+
+ if (IsPolarArea)
+ {
+ foreach (PolarSeries series in visibleSeries.Cast())
+ {
+ if (series != null && series.ActualXAxis == this && series.PointsCount > dataCount)
+ {
+ selectedSeries = series;
+ dataCount = series.PointsCount;
+ }
+ }
+ }
+ else
+ {
+
+ foreach (CartesianSeries series in visibleSeries.Cast())
+ {
+ if (series != null && series.ActualXAxis == this && series.PointsCount > dataCount)
+ {
+ selectedSeries = series;
+ dataCount = series.PointsCount;
+ }
+ }
+ }
+
+ return selectedSeries;
+ }
+
+ #endregion
+
+ #endregion
+}
diff --git a/maui/src/Charts/Behaviors/ChartTrackballBehavior.cs b/maui/src/Charts/Behaviors/ChartTrackballBehavior.cs
index 6fd504ea..87a4d8b6 100644
--- a/maui/src/Charts/Behaviors/ChartTrackballBehavior.cs
+++ b/maui/src/Charts/Behaviors/ChartTrackballBehavior.cs
@@ -2053,39 +2053,36 @@ static string GetAxisLabel(ChartAxis axis, double xValue, string labelFormat)
{
string label = string.Empty;
- if (axis is CategoryAxis categoryAxis)
+ switch (axis)
{
- var currSeries = categoryAxis.GetActualSeries();
- if (currSeries != null)
- {
- label = categoryAxis.GetLabelContent(currSeries, (int)Math.Round(xValue), labelFormat);
- }
- }
- else if (axis is NumericalAxis)
- {
- label = ((int)Math.Round(xValue)).ToString(labelFormat);
- }
- else if (axis is LogarithmicAxis)
- {
- label = ChartAxis.GetActualLabelContent(xValue, labelFormat).ToString();
- }
- else if (axis is DateTimeAxis datetimeAxis)
- {
- string format;
- if (labelFormat != null)
- {
- format = labelFormat;
- }
- else
- {
- format = ChartAxis.GetSpecificFormattedLabel(datetimeAxis.ActualIntervalType);
- }
+ case CategoryAxis categoryAxis:
+ var currSeries = categoryAxis.GetActualSeries();
+ if (currSeries != null)
+ {
+ label = categoryAxis.GetLabelContent(currSeries, (int)Math.Round(xValue), labelFormat);
+ }
+ break;
- label = ChartAxis.GetFormattedAxisLabel(format, xValue);
- }
- else
- {
- label = ChartAxis.GetActualLabelContent(xValue, labelFormat);
+ case DateTimeCategoryAxis dateTimeCategoryAxis:
+ label = dateTimeCategoryAxis.GetLabelContent(xValue, labelFormat);
+ break;
+
+ case NumericalAxis:
+ label = ((int)Math.Round(xValue)).ToString(labelFormat);
+ break;
+
+ case LogarithmicAxis:
+ label = ChartAxis.GetActualLabelContent(xValue, labelFormat).ToString();
+ break;
+
+ case DateTimeAxis datetimeAxis:
+ string format = labelFormat ?? ChartAxis.GetSpecificFormattedLabel(datetimeAxis.ActualIntervalType);
+ label = ChartAxis.GetFormattedAxisLabel(format, xValue);
+ break;
+
+ default:
+ label = ChartAxis.GetActualLabelContent(xValue, labelFormat);
+ break;
}
return label;
diff --git a/maui/src/Charts/Behaviors/DataPointSelectionBehavior.cs b/maui/src/Charts/Behaviors/DataPointSelectionBehavior.cs
index d4468dfe..7c15af40 100644
--- a/maui/src/Charts/Behaviors/DataPointSelectionBehavior.cs
+++ b/maui/src/Charts/Behaviors/DataPointSelectionBehavior.cs
@@ -15,22 +15,18 @@ public partial class DataPointSelectionBehavior : ChartSelectionBehavior
internal bool OnTapped(float pointX, float pointY)
{
- if (Source != null)
+ if (Source is ChartSeries series)
{
- RectF bounds = Source.AreaBounds;
- foreach (var segment in Source.Segments)
+ int index;
+
+ if (series.UpdateDataPointSelection(pointX, pointY, out index))
{
- if (segment.HitTest(pointX - bounds.Left, pointY - bounds.Top))
+ if (IsSelectionChangingInvoked(series, index))
{
- var index = segment.Index;
- if (IsSelectionChangingInvoked(Source, index))
- {
- UpdateSelectionChanging(index, true);
- InvokeSelectionChangedEvent(Source, index);
- }
-
- return true;
+ UpdateSelectionChanging(index, true);
+ InvokeSelectionChangedEvent(series, index);
}
+ return true;
}
}
diff --git a/maui/src/Charts/Behaviors/SeriesSelectionBehavior.cs b/maui/src/Charts/Behaviors/SeriesSelectionBehavior.cs
index ef593595..9dd10771 100644
--- a/maui/src/Charts/Behaviors/SeriesSelectionBehavior.cs
+++ b/maui/src/Charts/Behaviors/SeriesSelectionBehavior.cs
@@ -34,20 +34,17 @@ internal bool OnTapped(float pointX, float pointY)
{
foreach (var series in visibleSeries.Reverse())
{
- RectF bounds = series.AreaBounds;
- foreach (var segment in series._segments)
+ var index = visibleSeries.IndexOf(series);
+
+ if (series.UpdateSeriesSelection(pointX, pointY))
{
- if (segment.HitTest(pointX - bounds.Left, pointY - bounds.Top))
+ if (IsSelectionChangingInvoked(Chart, index))
{
- var index = visibleSeries.IndexOf(series);
- if (IsSelectionChangingInvoked(Chart, index))
- {
- UpdateSelectionChanging(index, true);
- InvokeSelectionChangedEvent(Chart, index);
- }
-
- return true;
+ UpdateSelectionChanging(index, true);
+ InvokeSelectionChangedEvent(Chart, index);
}
+
+ return true;
}
}
}
diff --git a/maui/src/Charts/Resources/SfCartesianChartResources.cs b/maui/src/Charts/Resources/SfCartesianChartResources.cs
index f486e59b..e5cb632b 100644
--- a/maui/src/Charts/Resources/SfCartesianChartResources.cs
+++ b/maui/src/Charts/Resources/SfCartesianChartResources.cs
@@ -1,92 +1,44 @@
using Syncfusion.Maui.Toolkit.Localization;
+using System.Globalization;
namespace Syncfusion.Maui.Toolkit.Charts
{
+
///
- /// Localization resource for .
+ /// Represents the localization resource accessor for the control.
+ /// This class is responsible for retrieving culture-specific localized strings based on the application's current UI culture settings.
///
public class SfCartesianChartResources : LocalizationResourceAccessor
{
- internal static string High
- {
- get
- {
- var high = GetString("High");
- return string.IsNullOrEmpty(high) ? "High" : high;
- }
- }
+ internal static CultureInfo CultureInfo => CultureInfo.CurrentUICulture;
- internal static string Low
+ private static string GetResourceString(string key, string defaultValue)
{
- get
+ string? value = string.Empty;
+ if (ResourceManager != null)
{
- var low = GetString("Low");
- return string.IsNullOrEmpty(low) ? "Low" : low;
+ Culture = CultureInfo;
+ value = GetString(key);
}
+ return string.IsNullOrEmpty(value) ? defaultValue : value;
}
- internal static string Open
- {
- get
- {
- var open = GetString("Open");
- return string.IsNullOrEmpty(open) ? "Open" : open;
- }
- }
+ internal static string High => GetResourceString("High", "High");
- internal static string Close
- {
- get
- {
- var close = GetString("Close");
- return string.IsNullOrEmpty(close) ? "Close" : close;
- }
- }
+ internal static string Low => GetResourceString("Low", "Low");
- internal static string Maximum
- {
- get
- {
- var maximum = GetString("Maximum");
- return string.IsNullOrEmpty(maximum) ? "Maximum" : maximum;
- }
- }
+ internal static string Open => GetResourceString("Open", "Open");
- internal static string Minimum
- {
- get
- {
- var minimum = GetString("Minimum");
- return string.IsNullOrEmpty(minimum) ? "Minimum" : minimum;
- }
- }
+ internal static string Close => GetResourceString("Close", "Close");
- internal static string Median
- {
- get
- {
- var median = GetString("Median");
- return string.IsNullOrEmpty(median) ? "Median" : median;
- }
- }
+ internal static string Maximum => GetResourceString("Maximum", "Maximum");
- internal static string Q3
- {
- get
- {
- var upperQuartile = GetString("Q3");
- return string.IsNullOrEmpty(upperQuartile) ? "Q3" : upperQuartile;
- }
- }
+ internal static string Minimum => GetResourceString("Minimum", "Minimum");
- internal static string Q1
- {
- get
- {
- var lowerQuartile = GetString("Q1");
- return string.IsNullOrEmpty(lowerQuartile) ? "Q1" : lowerQuartile;
- }
- }
+ internal static string Median => GetResourceString("Median", "Median");
+
+ internal static string Q3 => GetResourceString("Q3", "Q3");
+ internal static string Q1 => GetResourceString("Q1", "Q1");
}
-}
+}
\ No newline at end of file
diff --git a/maui/src/Charts/Resources/SfCircularChartResources.cs b/maui/src/Charts/Resources/SfCircularChartResources.cs
index 38e96a17..0418a01c 100644
--- a/maui/src/Charts/Resources/SfCircularChartResources.cs
+++ b/maui/src/Charts/Resources/SfCircularChartResources.cs
@@ -1,19 +1,29 @@
-using Syncfusion.Maui.Toolkit.Localization;
+using System.Globalization;
+using Syncfusion.Maui.Toolkit.Localization;
namespace Syncfusion.Maui.Toolkit.Charts
{
+
///
- /// Localization resource for .
+ /// Represents the localization resource accessor for the control.
+ /// This class is responsible for retrieving culture-specific localized strings based on the application's current UI culture settings.
///
public class SfCircularChartResources : LocalizationResourceAccessor
{
+ internal static CultureInfo CultureInfo => CultureInfo.CurrentUICulture;
+
internal static string Others
{
get
{
- var others = GetString("Others");
- return string.IsNullOrEmpty(others) ? "Others" : others;
+ string? value = string.Empty;
+ if (ResourceManager != null)
+ {
+ Culture = CultureInfo;
+ value = GetString("Others");
+ }
+ return string.IsNullOrEmpty(value) ? "Others" : value;
}
}
}
-}
+}
\ No newline at end of file
diff --git a/maui/src/Charts/Segment/CandleSegment.cs b/maui/src/Charts/Segment/CandleSegment.cs
index c7461726..66b986a5 100644
--- a/maui/src/Charts/Segment/CandleSegment.cs
+++ b/maui/src/Charts/Segment/CandleSegment.cs
@@ -33,7 +33,11 @@ internal override void SetData(double[] values, bool isFill, bool isBull)
XValue = values[7];
IsFill = isFill;
IsBull = isBull;
-
+ if (Open < Close)
+ {
+ (Open, Close) = (Close, Open);
+ }
+
series.XRange += DoubleRange.Union(XValue);
series.YRange += new DoubleRange(High, Low);
}
@@ -171,14 +175,13 @@ void Layout(CandleSeries series)
AnimationValuesCalculation(series);
}
- if (Left > Right)
+ if (series.ChartArea != null && series.ChartArea.SecondaryAxis != null)
{
- (Right, Left) = (Left, Right);
- }
- if (Top > Bottom)
- {
- (Bottom, Top) = (Top, Bottom);
+ if (Left > Right || series.ChartArea.SecondaryAxis.IsInversed)
+ {
+ (Right, Left) = (Left, Right);
+ }
}
}
else
diff --git a/maui/src/Charts/Segment/DoughnutSegment.cs b/maui/src/Charts/Segment/DoughnutSegment.cs
index 4b4f2bea..4a7ba175 100644
--- a/maui/src/Charts/Segment/DoughnutSegment.cs
+++ b/maui/src/Charts/Segment/DoughnutSegment.cs
@@ -7,13 +7,15 @@
public partial class DoughnutSegment : PieSegment
{
#region Fields
-
+
RectF _actualBounds, _currentBounds;
-
double _startAngle, _endAngle;
-
double _segmentRadius;
-
+ PointF _innerCurveStartPoint, _innerCurveStartMidpoint, _startCurveCeterPoint, _outerCurveStartMidPoint, _outerCurveStartPoint,
+ _innerCurveEndPoint, _innerCurveEndMidpoint, _outerCurveEndMidPoint, _outerCurveEndPoint, _endCurveCenterPoint;
+ float _explodeOffsetX, _explodeOffsetY;
+ bool _isExploded;
+
#endregion
#region Internal Properties
@@ -29,14 +31,14 @@ public partial class DoughnutSegment : PieSegment
///
protected internal override void OnLayout()
{
- if (Series is not DoughnutSeries || double.IsNaN(YValue))
+ if (Series is not DoughnutSeries series || double.IsNaN(YValue))
{
return;
}
//For calculating doughnut center angle.
MidAngle = (StartAngle + (EndAngle / 2)) * 0.0174532925f;
- UpdatePosition();
+ UpdatePosition(series);
}
///
@@ -66,36 +68,9 @@ protected internal override void Draw(ICanvas canvas)
}
}
- UpdatePosition();
+ UpdatePosition(series);
var endArcAngle = series._isClockWise ? drawStartAngle + drawEndAngle : drawEndAngle;
-
- PathF path = new PathF();
-
- //Drawing segment.
- path.AddArc(_actualBounds.Left, _actualBounds.Top, _actualBounds.Right, _actualBounds.Bottom, -drawStartAngle, -(endArcAngle), series._isClockWise);
- path.AddArc(_currentBounds.Left, _currentBounds.Top, _currentBounds.Right, _currentBounds.Bottom, -(endArcAngle), -drawStartAngle, !series._isClockWise);
- path.Close();
- canvas.SetFillPaint(Fill, path.Bounds);
- canvas.Alpha = Opacity;
- canvas.FillPath(path);
-
- //Drawing stroke.
- if (HasStroke)
- {
-#if WINDOWS
- //MAUI-582: Exception faced "Value not fall within expected range, due to path closed before stroke drawing"
- var radius = (float)series.InnerRadius * (Math.Min(_actualBounds.Width, _actualBounds.Height) / 2);
- var x = (float)(_currentBounds.X + (_currentBounds.Width / 2) + (radius * Math.Cos(drawStartAngle * (Math.PI / 180))));
- var y = (float)(_currentBounds.Y + (_currentBounds.Width / 2) + (radius * Math.Sin(drawStartAngle * (Math.PI / 180))));
- path.MoveTo(x, y);
-#endif
- path.AddArc(_actualBounds.Left, _actualBounds.Top, _actualBounds.Right, _actualBounds.Bottom, -drawStartAngle, -(endArcAngle), series._isClockWise);
- path.AddArc(_currentBounds.Left, _currentBounds.Top, _currentBounds.Right, _currentBounds.Bottom, -(endArcAngle), -drawStartAngle, !series._isClockWise);
- path.Close();
- canvas.StrokeColor = Stroke.ToColor();
- canvas.StrokeSize = (float)StrokeWidth;
- canvas.DrawPath(path);
- }
+ DrawSegment(canvas, series, drawStartAngle, endArcAngle);
}
#endregion
@@ -131,30 +106,46 @@ internal override int GetDataPointIndex(float x, float y)
#region private Methods
- void UpdatePosition()
+ void UpdatePosition(DoughnutSeries series)
{
- if (Series is not DoughnutSeries series)
- {
- return;
- }
-
var center = series.Center;
RectF seriesClipRect = series.AreaBounds;
double minScale = Math.Min(seriesClipRect.Width, seriesClipRect.Height) * series.Radius;
- _actualBounds = new RectF((float)((center.X * 2) - minScale) / 2, (float)((center.Y * 2) - minScale) / 2, (float)minScale, (float)minScale);
- _currentBounds = new RectF(_actualBounds.Left, _actualBounds.Top, _actualBounds.Width, _actualBounds.Height);
+
+ float halfMinScale = (float)minScale / 2;
+ float centerOffsetX = (float)(center.X - halfMinScale);
+ float centerOffsetY = (float)(center.Y - halfMinScale);
+
+ _actualBounds = new RectF(centerOffsetX, centerOffsetY, halfMinScale * 2, halfMinScale * 2);
+ _currentBounds = new RectF(_actualBounds.Location, _actualBounds.Size);
if (series.ExplodeIndex == Index || series.ExplodeAll)
{
+ if (!_isExploded)
+ {
+ _explodeOffsetX = 0;
+ _explodeOffsetY = 0;
+ }
+
float angle = series._isClockWise ? (float)((2f * (series.StartAngle + ((StartAngle - series.StartAngle) * series.AnimationValue)) * 0.0174532925f) + ((EndAngle * series.AnimationValue) * 0.0174532925f)) / 2f
- : (float)(((series.StartAngle + ((StartAngle - series.StartAngle) * series.AnimationValue)) * 0.0174532925f) +
- (EndAngle * series.AnimationValue * 0.0174532925f)) / 2;
- _actualBounds = _actualBounds.Offset((float)(series.ExplodeRadius * Math.Cos(angle)), (float)(series.ExplodeRadius * Math.Sin(angle)));
+ : (float)(((series.StartAngle + ((StartAngle - series.StartAngle) * series.AnimationValue)) * 0.0174532925f) + (EndAngle * series.AnimationValue * 0.0174532925f)) / 2;
+ _explodeOffsetX = (float)(series.ExplodeRadius * Math.Cos(angle));
+ _explodeOffsetY = (float)(series.ExplodeRadius * Math.Sin(angle));
+ _actualBounds = _actualBounds.Offset(_explodeOffsetX, _explodeOffsetY);
_currentBounds = _actualBounds;
+
+ _isExploded = true;
+ }
+ else if (_isExploded)
+ {
+ _explodeOffsetX = 0;
+ _explodeOffsetY = 0;
+ _isExploded = false;
}
InnerRadius = (float)series.InnerRadius * (Math.Min(_actualBounds.Width, _actualBounds.Height) / 2);
_currentBounds = new RectF(_currentBounds.X + (_currentBounds.Width / 2) - InnerRadius, _currentBounds.Y + (_currentBounds.Height / 2) - InnerRadius, 2 * InnerRadius, 2 * InnerRadius);
+
series.ActualRadius = (float)minScale / 2;
_segmentRadius = series.ActualRadius;
}
@@ -223,6 +214,218 @@ bool IsPointInDoughnutSegment(double radius, double x, double y)
return false;
}
+ void DrawSegment(ICanvas canvas, DoughnutSeries series, float drawStartAngle, float drawEndAngle)
+ {
+ PathF path = new PathF();
+ float outerRadius = (float)_segmentRadius;
+ float innerRadius = InnerRadius;
+ float midRadius = (float)(outerRadius + innerRadius) / 2;
+ float radius = (float)(outerRadius - innerRadius) / 2;
+ float deviationAngle = ChartUtils.CalculateAngleDeviation(midRadius, radius, 360);
+
+ if (series.CapStyle == CapStyle.BothFlat || series.VisibleSegmentCount == 1)
+ {
+ DrawFlatSegment(canvas, series, drawStartAngle, drawEndAngle, path);
+ }
+ else
+ {
+ float segmentStartAngle = drawStartAngle;
+ float segmentEndAngle = drawEndAngle;
+
+ if (series.CapStyle == CapStyle.StartCurve || series.CapStyle == CapStyle.BothCurve)
+ {
+ if ((drawStartAngle + deviationAngle) >= drawEndAngle && series.CapStyle == CapStyle.StartCurve)
+ {
+ deviationAngle = drawEndAngle - drawStartAngle;
+ }
+
+ if (series.CapStyle == CapStyle.BothCurve)
+ {
+ float segmentSweepAngle = drawEndAngle - drawStartAngle;
+ float maxDeviation = 2 * deviationAngle;
+
+ if (segmentSweepAngle < maxDeviation)
+ {
+ deviationAngle = segmentSweepAngle / 2;
+ }
+ }
+
+ segmentStartAngle += deviationAngle;
+ PointF[] startCurvePoints = CalculateCurvePoints(series, segmentStartAngle, drawStartAngle, innerRadius, outerRadius, midRadius);
+ _innerCurveStartPoint = startCurvePoints[0];
+ _innerCurveStartMidpoint = startCurvePoints[1];
+ _startCurveCeterPoint = startCurvePoints[2];
+ _outerCurveStartMidPoint = startCurvePoints[3];
+ _outerCurveStartPoint = startCurvePoints[4];
+
+ }
+
+ if (series.CapStyle == CapStyle.EndCurve || series.CapStyle == CapStyle.BothCurve)
+ {
+ if ((drawEndAngle - deviationAngle) <= drawStartAngle && series.CapStyle == CapStyle.EndCurve)
+ {
+ deviationAngle = drawEndAngle - drawStartAngle;
+ }
+
+ segmentEndAngle -= deviationAngle;
+ PointF[] endCurvePoints = CalculateCurvePoints(series, segmentEndAngle, drawEndAngle, innerRadius, outerRadius, midRadius);
+ _innerCurveEndPoint = endCurvePoints[0];
+ _innerCurveEndMidpoint = endCurvePoints[1];
+ _endCurveCenterPoint = endCurvePoints[2];
+ _outerCurveEndMidPoint = endCurvePoints[3];
+ _outerCurveEndPoint = endCurvePoints[4];
+ }
+
+ // To draw the start curve for the segment
+ if (series.CapStyle == CapStyle.StartCurve || series.CapStyle == CapStyle.BothCurve)
+ {
+ path.MoveTo(_innerCurveStartPoint);
+ path.CurveTo(_innerCurveStartPoint, _innerCurveStartMidpoint, _startCurveCeterPoint);
+ path.CurveTo(_startCurveCeterPoint, _outerCurveStartMidPoint, _outerCurveStartPoint);
+ }
+
+ if (NormalizeAngle(segmentStartAngle) != NormalizeAngle(segmentEndAngle))
+ {
+ // To draw the outer arc for the segment
+ path.AddArc(_actualBounds.Left, _actualBounds.Top, _actualBounds.Right, _actualBounds.Bottom, -segmentStartAngle, -(segmentEndAngle), series._isClockWise);
+
+ // To draw the inner arc for the segment
+ path.AddArc(_currentBounds.Left, _currentBounds.Top, _currentBounds.Right, _currentBounds.Bottom, -(segmentEndAngle), -segmentStartAngle, !series._isClockWise);
+ }
+
+ // To draw the end curve for the segment
+ if (series.CapStyle == CapStyle.EndCurve || series.CapStyle == CapStyle.BothCurve)
+ {
+ path.MoveTo(_innerCurveEndPoint);
+ path.CurveTo(_innerCurveEndPoint, _innerCurveEndMidpoint, _endCurveCenterPoint);
+ path.CurveTo(_endCurveCenterPoint, _outerCurveEndMidPoint, _outerCurveEndPoint);
+ }
+
+ canvas.SetFillPaint(Fill, path.Bounds);
+ canvas.Alpha = Opacity;
+ canvas.FillPath(path);
+ SegmentStrokePath(canvas, series, segmentStartAngle, segmentEndAngle, drawStartAngle);
+ }
+ }
+
+ void DrawFlatSegment(ICanvas canvas, DoughnutSeries series, float drawStartAngle, float drawEndAngle, PathF path)
+ {
+ var radius = (float)series.InnerRadius * (Math.Min(_actualBounds.Width, _actualBounds.Height) / 2);
+ var x = (float)(_currentBounds.X + (_currentBounds.Width / 2) + (radius * Math.Cos(drawStartAngle * (Math.PI / 180))));
+ var y = (float)(_currentBounds.Y + (_currentBounds.Width / 2) + (radius * Math.Sin(drawStartAngle * (Math.PI / 180))));
+
+ path.MoveTo(x, y);
+ path.AddArc(_actualBounds.Left, _actualBounds.Top, _actualBounds.Right, _actualBounds.Bottom, -drawStartAngle, -(drawEndAngle), series._isClockWise);
+ path.AddArc(_currentBounds.Left, _currentBounds.Top, _currentBounds.Right, _currentBounds.Bottom, -(drawEndAngle), -drawStartAngle, !series._isClockWise);
+ path.Close();
+ canvas.SetFillPaint(Fill, path.Bounds);
+ canvas.Alpha = Opacity;
+ canvas.FillPath(path);
+
+ if (HasStroke)
+ {
+ canvas.StrokeColor = Stroke.ToColor();
+ canvas.StrokeSize = (float)StrokeWidth;
+ canvas.DrawPath(path);
+ }
+ }
+
+ PointF[] CalculateCurvePoints(DoughnutSeries series, float segmentAngle, float arcAngle, float innerRadius, float outerRadius, float midRadius)
+ {
+ // Convert degrees to radians
+ const double DegreeToRadian = Math.PI / 180;
+ double angleRadius = segmentAngle * DegreeToRadian;
+ double arcRadius = arcAngle * DegreeToRadian;
+
+ var center = series.Center;
+
+ // Calculate points using a helper function for readability
+ PointF innerPoint = ComputePoint(center, innerRadius, angleRadius);
+ PointF outerPoint = ComputePoint(center, outerRadius, angleRadius);
+ PointF centerPoint = ComputePoint(center, midRadius, arcRadius);
+ PointF innerMidPoint = ComputePoint(center, innerRadius, arcRadius);
+ PointF outerMidPoint = ComputePoint(center, outerRadius, arcRadius);
+
+ return [innerPoint, innerMidPoint, centerPoint, outerMidPoint, outerPoint];
+ }
+
+ private PointF ComputePoint(PointF center, float radius, double angle)
+ {
+ return new PointF(
+ (float)(center.X + (radius * Math.Cos(angle)) + _explodeOffsetX),
+ (float)(center.Y + (radius * Math.Sin(angle)) + _explodeOffsetY)
+ );
+ }
+
+ void SegmentStrokePath(ICanvas canvas, DoughnutSeries series, float segmentStartAngle, float segmentEndAngle, float segmentAngle)
+ {
+ if (HasStroke)
+ {
+ PathF strokePath = new PathF();
+
+ // To draw the start curve for the segment stroke
+ if (series.CapStyle == CapStyle.BothCurve || series.CapStyle == CapStyle.StartCurve)
+ {
+ strokePath.MoveTo(_innerCurveStartPoint);
+ strokePath.CurveTo(_innerCurveStartPoint, _innerCurveStartMidpoint, _startCurveCeterPoint);
+ strokePath.CurveTo(_startCurveCeterPoint, _outerCurveStartMidPoint, _outerCurveStartPoint);
+ }
+
+ if (NormalizeAngle(segmentStartAngle) != NormalizeAngle(segmentEndAngle))
+ {
+ // To draw the outer arc for the segment stroke
+ strokePath.AddArc(_actualBounds.Left, _actualBounds.Top, _actualBounds.Right, _actualBounds.Bottom, -segmentStartAngle, -(segmentEndAngle), series._isClockWise);
+ }
+
+ // To draw the end curve for the segment stroke
+ if (series.CapStyle == CapStyle.EndCurve || series.CapStyle == CapStyle.BothCurve)
+ {
+ strokePath.MoveTo(_innerCurveEndPoint);
+ strokePath.CurveTo(_innerCurveEndPoint, _innerCurveEndMidpoint, _endCurveCenterPoint);
+ strokePath.CurveTo(_endCurveCenterPoint, _outerCurveEndMidPoint, _outerCurveEndPoint);
+ strokePath.MoveTo(_innerCurveEndPoint);
+ }
+
+ if (NormalizeAngle(segmentStartAngle) != NormalizeAngle(segmentEndAngle))
+ {
+ // To draw the inner arc for the segment stroke
+ strokePath.AddArc(_currentBounds.Left, _currentBounds.Top, _currentBounds.Right, _currentBounds.Bottom, -(segmentEndAngle), -segmentStartAngle, !series._isClockWise);
+ }
+
+ if (NormalizeAngle(segmentStartAngle) == NormalizeAngle(segmentEndAngle) && series.CapStyle == CapStyle.StartCurve)
+ {
+ strokePath.Close();
+ }
+
+ canvas.StrokeColor = Stroke.ToColor();
+ canvas.StrokeLineCap = LineCap.Round;
+ canvas.StrokeSize = (float)StrokeWidth;
+ canvas.DrawPath(strokePath);
+
+ if (series.CapStyle == CapStyle.EndCurve)
+ {
+ double angleRad = segmentAngle * (Math.PI / 180);
+ var innerPoint = new PointF((float)(series.Center.X + (InnerRadius * Math.Cos(angleRad)) + _explodeOffsetX), (float)(series.Center.Y + (InnerRadius * Math.Sin(angleRad)) + _explodeOffsetY));
+ var outerPoint = new PointF((float)(series.Center.X + (_segmentRadius * Math.Cos(angleRad)) + _explodeOffsetX), (float)(series.Center.Y + (_segmentRadius * Math.Sin(angleRad)) + _explodeOffsetY));
+
+ canvas.StrokeLineCap = LineCap.Round;
+
+ //To draw line for the segment stroke
+ canvas.DrawLine(innerPoint, outerPoint);
+ }
+ }
+ }
+
+ // Normalizes angle precision to avoid rendering artifacts specific to platform.
+ static float NormalizeAngle(float angle)
+ {
+#if IOS || MACCATALYST
+ return MathF.Round(angle, 4);
+#else
+ return MathF.Round(angle, 5);
+#endif
+ }
+
#endregion
#endregion
diff --git a/maui/src/Charts/Series/BoxAndWhiskerSeries.cs b/maui/src/Charts/Series/BoxAndWhiskerSeries.cs
index 3db4af97..ad2fbfbf 100644
--- a/maui/src/Charts/Series/BoxAndWhiskerSeries.cs
+++ b/maui/src/Charts/Series/BoxAndWhiskerSeries.cs
@@ -1099,31 +1099,17 @@ internal override void GenerateSegments(SeriesView seriesView)
actualMaximum = Math.Max(outliers.Max(), actualMaximum);
}
- if (IsIndexed && IsGrouped && xValues != null)
+ if (xValues != null)
{
+ var x = xValues[i];
+
if (i < _segments.Count && _segments[i] is BoxAndWhiskerSegment segment)
{
- segment.SetData([i + SbsInfo.Start, i + SbsInfo.End, actualMinimum, minimum, lowerQuartile, median, upperQuartile, maximum, actualMaximum, xValues[i] + SbsInfo.Median, average]);
+ segment.SetData([x + SbsInfo.Start, x + SbsInfo.End, actualMinimum, minimum, lowerQuartile, median, upperQuartile, maximum, actualMaximum, xValues[i] + SbsInfo.Median, average]);
}
else
{
- CreateSegment(seriesView, [i + SbsInfo.Start, i + SbsInfo.End, actualMinimum, minimum, lowerQuartile, median, upperQuartile, maximum, actualMaximum, xValues[i] + SbsInfo.Median, average], i, outliers);
- }
- }
- else
- {
- if (xValues != null)
- {
- var x = xValues[i];
-
- if (i < _segments.Count && _segments[i] is BoxAndWhiskerSegment segment)
- {
- segment.SetData([x + SbsInfo.Start, x + SbsInfo.End, actualMinimum, minimum, lowerQuartile, median, upperQuartile, maximum, actualMaximum, xValues[i] + SbsInfo.Median, average]);
- }
- else
- {
- CreateSegment(seriesView, [x + SbsInfo.Start, x + SbsInfo.End, actualMinimum, minimum, lowerQuartile, median, upperQuartile, maximum, actualMaximum, xValues[i] + SbsInfo.Median, average], i, outliers);
- }
+ CreateSegment(seriesView, [x + SbsInfo.Start, x + SbsInfo.End, actualMinimum, minimum, lowerQuartile, median, upperQuartile, maximum, actualMaximum, xValues[i] + SbsInfo.Median, average], i, outliers);
}
}
diff --git a/maui/src/Charts/Series/CartesianSeries.cs b/maui/src/Charts/Series/CartesianSeries.cs
index 42d676bd..5e1e23dc 100644
--- a/maui/src/Charts/Series/CartesianSeries.cs
+++ b/maui/src/Charts/Series/CartesianSeries.cs
@@ -28,20 +28,7 @@ public abstract class CartesianSeries : ChartSeries
internal bool IsIndexed
{
- get { return ActualXAxis is CategoryAxis; }
- }
-
- internal bool IsGrouped
- {
- get
- {
- if (ActualXValues is CategoryAxis category)
- {
- return category.ArrangeByIndex;
- }
-
- return false;
- }
+ get { return ActualXAxis is CategoryAxis || ActualXAxis is DateTimeCategoryAxis; }
}
internal DoubleRange SbsInfo { get; set; } = DoubleRange.Empty;
diff --git a/maui/src/Charts/Series/ChartSeries.cs b/maui/src/Charts/Series/ChartSeries.cs
index 496b7ac0..ffe8d428 100644
--- a/maui/src/Charts/Series/ChartSeries.cs
+++ b/maui/src/Charts/Series/ChartSeries.cs
@@ -1665,6 +1665,37 @@ internal virtual void UpdateLegendItemToggle()
{
}
+ internal virtual bool UpdateDataPointSelection(float pointX, float pointY, out int index)
+ {
+ RectF bounds = AreaBounds;
+ index = -1;
+
+ foreach (var segment in _segments)
+ {
+ if (segment.HitTest(pointX - bounds.Left, pointY - bounds.Top))
+ {
+ index = segment.Index;
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ internal virtual bool UpdateSeriesSelection(float pointX, float pointY)
+ {
+ RectF bounds = AreaBounds;
+ foreach (var segment in _segments)
+ {
+ if (segment.HitTest(pointX - bounds.Left, pointY - bounds.Top))
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
internal virtual void UpdateLegendIconColor(ChartSelectionBehavior sender, int index)
{
}
diff --git a/maui/src/Charts/Series/ColumnSeries.cs b/maui/src/Charts/Series/ColumnSeries.cs
index 0fd40813..f34e89b1 100644
--- a/maui/src/Charts/Series/ColumnSeries.cs
+++ b/maui/src/Charts/Series/ColumnSeries.cs
@@ -380,37 +380,19 @@ internal override void GenerateSegments(SeriesView seriesView)
double.IsNaN(axis.ActualCrossingValue) ? 0 : axis.ActualCrossingValue;
}
- if (IsGrouped && (IsIndexed || xValues == null))
+ for (var i = 0; i < PointsCount; i++)
{
- for (var i = 0; i < PointsCount; i++)
+ if (xValues != null)
{
+ var x = xValues[i];
+
if (i < _segments.Count && _segments[i] is ColumnSegment segment)
{
- segment.SetData([i + SbsInfo.Start, i + SbsInfo.End, YValues[i], bottomValue, i, YValues[i]]);
+ segment.SetData([x + SbsInfo.Start, x + SbsInfo.End, YValues[i], bottomValue, x, YValues[i]]);
}
else
{
- CreateSegment(seriesView, [i + SbsInfo.Start, i + SbsInfo.End, YValues[i], bottomValue, i, YValues[i]], i);
- }
- }
- }
- else
- {
- for (var i = 0; i < PointsCount; i++)
- {
- if (xValues != null)
-
- {
- var x = xValues[i];
-
- if (i < _segments.Count && _segments[i] is ColumnSegment segment)
- {
- segment.SetData([x + SbsInfo.Start, x + SbsInfo.End, YValues[i], bottomValue, x, YValues[i]]);
- }
- else
- {
- CreateSegment(seriesView, [x + SbsInfo.Start, x + SbsInfo.End, YValues[i], bottomValue, x, YValues[i]], i);
- }
+ CreateSegment(seriesView, [x + SbsInfo.Start, x + SbsInfo.End, YValues[i], bottomValue, x, YValues[i]], i);
}
}
}
diff --git a/maui/src/Charts/Series/DoughnutSeries.cs b/maui/src/Charts/Series/DoughnutSeries.cs
index a1906d8d..c669b4e4 100644
--- a/maui/src/Charts/Series/DoughnutSeries.cs
+++ b/maui/src/Charts/Series/DoughnutSeries.cs
@@ -71,6 +71,7 @@ public partial class DoughnutSeries : PieSeries
double _angleDifference;
float _yValue;
double _centerHoleSize = 1;
+ float _gapRadius;
#endregion
@@ -108,6 +109,38 @@ public partial class DoughnutSeries : PieSeries
null,
OnCenterViewChanged);
+ ///
+ /// Identifies the bindable property.
+ ///
+ ///
+ /// The property defines the space between segments
+ ///
+ public static readonly BindableProperty GapRatioProperty = BindableProperty.Create(
+ nameof(GapRatio),
+ typeof(double),
+ typeof(DoughnutSeries),
+ 0d,
+ BindingMode.Default,
+ null,
+ OnSpacingPropertyChanged,
+ null,
+ coerceValue: CoerceSpacing);
+
+ ///
+ /// Identifies the bindable property.
+ ///
+ ///
+ /// The property represents the shape of the start and end points of a doughnut segment.
+ ///
+ public static readonly BindableProperty CapStyleProperty = BindableProperty.Create(
+ nameof(CapStyle),
+ typeof(CapStyle),
+ typeof(DoughnutSeries),
+ CapStyle.BothFlat,
+ BindingMode.Default,
+ null,
+ OnCapStylePropertyChanged);
+
#endregion
#region Public Properties
@@ -222,6 +255,92 @@ public View CenterView
set { SetValue(CenterViewProperty, value); }
}
+ ///
+ /// Gets or sets a value to adjust spacing between segments
+ ///
+ /// It accepts double values, and the default value is 0. Here, the value is between 0 and 1.
+ ///
+ /// # [Xaml](#tab/tabid-8)
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// ]]>
+ /// # [C#](#tab/tabid-9)
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// ]]>
+ /// # [C#](#tab/tabid-11)
+ ///