Skip to content

Commit 27abb71

Browse files
PaulAndersonSPaulAndersonS
authored
Merge pull request #102 from syncfusion/AOTTrimmingChanges
Provide AOT trimming support for Maui toolkit
2 parents 4aad444 + d527893 commit 27abb71

File tree

54 files changed

+492
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+492
-157
lines changed

‎maui/samples/Gallery/Samples/Calendar/AppearanceCustomization/ViewModel/AppearanceViewModel.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Microsoft.Maui.Controls.Shapes;
2+
using Syncfusion.Maui.Toolkit.Calendar;
23
using System.ComponentModel;
34
using System.Globalization;
45
using System.Xml;
@@ -50,7 +51,10 @@ public AppearanceViewModel()
5051
border.Stroke = _isLightTheme ? Color.FromRgba("#6750A4") : Color.FromRgba("#D0BCFF");
5152

5253
Label label = new Label();
53-
label.SetBinding(Label.TextProperty, "Date.Day");
54+
label.SetBinding(Label.TextProperty, BindingHelper.CreateBinding(
55+
propertyName: "Date.Day",
56+
getter: static (CalendarCellDetails context) => context.Date.Day));
57+
5458
label.HorizontalOptions = LayoutOptions.Center;
5559
label.VerticalOptions = LayoutOptions.Center;
5660
label.Padding = new Thickness(2);
@@ -77,7 +81,10 @@ public AppearanceViewModel()
7781
border.Stroke = _isLightTheme ? Color.FromRgba("#6750A4") : Color.FromRgba("#D0BCFF");
7882

7983
Label label = new Label();
80-
label.SetBinding(Label.TextProperty, "Date.Day");
84+
label.SetBinding(Label.TextProperty, BindingHelper.CreateBinding(
85+
propertyName: "Date.Day",
86+
getter: static (CalendarCellDetails context) => context.Date.Day));
87+
8188
label.HorizontalOptions = LayoutOptions.Center;
8289
label.VerticalOptions = LayoutOptions.Center;
8390
border.Content = label;

‎maui/src/BindingHelper/BindingHelper.cs

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
using Microsoft.Maui.Controls.Internals;
2+
3+
/// <summary>
4+
/// Helper class for creating bindings in .NET MAUI applications.
5+
/// </summary>
6+
public static class BindingHelper
7+
{
8+
/// <summary>
9+
/// Creates a typed binding for a given source and its properties.
10+
/// </summary>
11+
/// <typeparam name="TSource">The type of the binding source.</typeparam>
12+
/// <typeparam name="TProperty">The type of the property to bind.</typeparam>
13+
/// <param name="propertyName">The name of the property to bind to.</param>
14+
/// <param name="getter">A function to get the value of the property from the source.</param>
15+
/// <param name="setter">An optional action to set the value of the property on the source.</param>
16+
/// <param name="mode">The binding mode that determines the data flow direction.</param>
17+
/// <param name="converter">An optional value converter for the binding.</param>
18+
/// <param name="converterParameter">An optional parameter used by the converter.</param>
19+
/// <param name="source">The source object for binding.</param>
20+
/// <returns>A <see cref="BindingBase"/> representing the created binding.</returns>
21+
public static BindingBase CreateBinding<TSource, TProperty>(
22+
string propertyName,
23+
Func<TSource, TProperty> getter,
24+
Action<TSource, TProperty>? setter = null,
25+
BindingMode mode = BindingMode.Default,
26+
IValueConverter? converter = null,
27+
object? converterParameter = null,
28+
object? source = null)
29+
{
30+
return new TypedBinding<TSource, TProperty>(
31+
getter: source => (getter(source), true),
32+
setter,
33+
handlers:
34+
[
35+
new(static source => source, propertyName),
36+
])
37+
{
38+
Converter = converter,
39+
ConverterParameter = converterParameter,
40+
Mode = mode,
41+
Source = source,
42+
};
43+
}
44+
}

‎maui/src/Calendar/Helper/CalendarViewHelper.cs

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1619,23 +1619,43 @@ internal static string GetLanguage(string calendarIdentifier)
16191619
/// <returns>A calendar instance.</returns>
16201620
internal static Globalization.Calendar GetCalendar(string calendarIdentifier)
16211621
{
1622-
var type = Type.GetType("System.Globalization." + calendarIdentifier + "Calendar");
1623-
if (type != null)
1622+
switch (calendarIdentifier)
16241623
{
1625-
var calendar = Activator.CreateInstance(type) as Globalization.Calendar;
1626-
if (calendar != null)
1627-
{
1628-
return calendar;
1629-
}
1630-
else
1631-
{
1624+
1625+
case "Gregorian":
1626+
1627+
return new GregorianCalendar();
1628+
1629+
case "Hijri":
1630+
1631+
return new HijriCalendar();
1632+
1633+
case "Persian":
1634+
1635+
return new PersianCalendar();
1636+
1637+
case "ThaiBuddhist":
1638+
1639+
return new ThaiBuddhistCalendar();
1640+
1641+
case "Taiwan":
1642+
1643+
return new TaiwanCalendar();
1644+
1645+
case "UmAlQura":
1646+
1647+
return new UmAlQuraCalendar();
1648+
1649+
case "Korean":
1650+
1651+
return new KoreanCalendar();
1652+
1653+
default:
1654+
1655+
// If calendar identifier is specified wrongly, then default calendar will be used.
1656+
16321657
return CultureInfo.CurrentUICulture.DateTimeFormat.Calendar;
1633-
}
1634-
}
1635-
else
1636-
{
1637-
// If calendar identifier is specified wrongly, then default calendar will be used.
1638-
return CultureInfo.CurrentUICulture.DateTimeFormat.Calendar;
1658+
16391659
}
16401660
}
16411661

‎maui/src/Calendar/Resources/SfCalendar.en-US.resx

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="OK" xml:space="preserve">
121+
<value>OK</value>
122+
<comment>Text for disabled item</comment>
123+
</data>
124+
<data name="Cancel" xml:space="preserve">
125+
<value>Cancel</value>
126+
<comment>Text for selected item</comment>
127+
</data>
128+
<data name="Today" xml:space="preserve">
129+
<value>Today</value>
130+
</data>
131+
<data name="Special Date" xml:space="preserve">
132+
<value>Special Date</value>
133+
</data>
134+
<data name="Blackout Date" xml:space="preserve">
135+
<value>Blackout Date</value>
136+
</data>
137+
<data name="Disabled Date" xml:space="preserve">
138+
<value>Disabled Date</value>
139+
</data>
140+
<data name="Week" xml:space="preserve">
141+
<value>Week</value>
142+
</data>
143+
<data name="Disabled Cell" xml:space="preserve">
144+
<value>Disabled Cell</value>
145+
</data>
146+
<data name="To" xml:space="preserve">
147+
<value>To</value>
148+
</data>
149+
<data name="Forward" xml:space="preserve">
150+
<value>Forward</value>
151+
</data>
152+
<data name="Backward" xml:space="preserve">
153+
<value>Backward</value>
154+
</data>
155+
</root>

‎maui/src/Calendar/SfCalendar.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public partial class SfCalendar : SfView, ICalendar, IHeader, IFooterView, IPare
106106
/// </summary>
107107
public SfCalendar()
108108
{
109+
SfCalendarResources.InitializeDefaultResource("Syncfusion.Maui.Toolkit.Calendar.Resources.SfCalendar", typeof(SfCalendar));
109110
ThemeElement.InitializeThemeResources(this, "SfCalendarTheme");
110111
_proxy = new(this);
111112
DrawingOrder = DrawingOrder.AboveContent;

‎maui/src/Charts/Axis/CategoryAxis.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections;
2+
using System.Diagnostics.CodeAnalysis;
23

34
namespace Syncfusion.Maui.Toolkit.Charts
45
{
@@ -84,6 +85,7 @@ internal void GroupData()
8485
}
8586
}
8687

88+
[UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
8789
internal override void GenerateVisibleLabels()
8890
{
8991
if (VisibleRange.IsEmpty)

‎maui/src/Charts/Axis/DateTimeAxis.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Diagnostics.CodeAnalysis;
23
using Microsoft.Maui.Graphics;
34

45
namespace Syncfusion.Maui.Toolkit.Charts
@@ -182,6 +183,7 @@ internal void OnMinMaxChanged()
182183
}
183184
}
184185

186+
[UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
185187
internal override void GenerateVisibleLabels()
186188
{
187189
SmallTickPoints.Clear();

‎maui/src/Charts/Axis/LogarithmicAxis.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace Syncfusion.Maui.Toolkit.Charts
1+
using System.Diagnostics.CodeAnalysis;
2+
3+
namespace Syncfusion.Maui.Toolkit.Charts
24
{
35
public partial class LogarithmicAxis : RangeAxisBase
46
{
@@ -125,6 +127,7 @@ internal override DoubleRange AddDefaultRange(double start)
125127
return new DoubleRange(start, start + 1);
126128
}
127129

130+
[UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
128131
internal override void GenerateVisibleLabels()
129132
{
130133
if (VisibleRange.IsEmpty)

‎maui/src/Charts/Axis/NumericalAxis.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace Syncfusion.Maui.Toolkit.Charts
1+
using System.Diagnostics.CodeAnalysis;
2+
3+
namespace Syncfusion.Maui.Toolkit.Charts
24
{
35
public partial class NumericalAxis : RangeAxisBase
46
{
@@ -110,6 +112,7 @@ internal override void RaiseCallBackActualRangeChanged()
110112
#endregion
111113

112114
#region Internal Methods
115+
[UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
113116
internal override void GenerateVisibleLabels()
114117
{
115118
var actualLabels = VisibleLabels;

‎maui/src/Charts/Behaviors/ChartTooltipBehavior.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,8 @@ void GenerateTooltip(IChart chart, float x, float y, bool canAnimate)
694694
tooltip.BindingContext = tooltipInfo;
695695
tooltip.Duration = Duration;
696696
tooltip.Position = tooltipInfo.Position;
697-
tooltip.SetBinding(SfTooltip.BackgroundProperty, nameof(TooltipInfo.Background));
697+
tooltip.SetBinding(SfTooltip.BackgroundProperty,
698+
BindingHelper.CreateBinding(nameof(TooltipInfo.Background), getter: static(TooltipInfo tooltipInfo1) => tooltipInfo1.Background));
698699
tooltip.Content = GetTooltipTemplate(tooltipInfo);
699700
tooltip.Show(seriesBounds, tooltipInfo.TargetRect, canAnimate);
700701
}

0 commit comments

Comments
 (0)