AOT compatibility for winui3 package (#554)

CommunityToolkit · Apr 10, 2024 · e37426d · e37426d
1 parent 0443b1e
commit e37426d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/Lottie-Windows/Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj b/Lottie-Windows/Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0-windows10.0.18362.0</TargetFramework>
+    <IsAotCompatible>true</IsAotCompatible>
     <OutputType>Library</OutputType>
 
     <PackageId>CommunityToolkit.WinUI.Lottie</PackageId>

diff --git a/source/UIData/Tools/Properties.cs b/source/UIData/Tools/Properties.cs
@@ -13,18 +13,38 @@ namespace CommunityToolkit.WinUI.Lottie.UIData.Tools
 {
     static class Properties
     {
-        static IReadOnlyDictionary<string, PropertyId>? s_propertyIdFromNameMap;
+        static IReadOnlyDictionary<string, PropertyId> s_propertyIdFromNameMap = new Dictionary<string, PropertyId>
+        {
+            { "BorderMode", PropertyId.BorderMode},
+            { "CenterPoint", PropertyId.CenterPoint},
+            { "Children", PropertyId.Children},
+            { "Clip", PropertyId.Clip},
+            { "Color", PropertyId.Color},
+            { "Comment", PropertyId.Comment},
+            { "IsVisible", PropertyId.IsVisible},
+            { "Offset", PropertyId.Offset},
+            { "Opacity", PropertyId.Opacity},
+            { "Path", PropertyId.Path},
+            { "Position", PropertyId.Position},
+            { "Progress", PropertyId.Progress},
+            { "Properties", PropertyId.Properties},
+            { "RotationAngleInDegrees", PropertyId.RotationAngleInDegrees},
+            { "RotationAxis", PropertyId.RotationAxis},
+            { "Scale", PropertyId.Scale},
+            { "Size", PropertyId.Size},
+            { "StrokeEndCap", PropertyId.StrokeEndCap},
+            { "StrokeDashCap", PropertyId.StrokeDashCap},
+            { "StrokeLineJoin", PropertyId.StrokeLineJoin},
+            { "StrokeMiterLimit", PropertyId.StrokeMiterLimit},
+            { "StrokeStartCap", PropertyId.StrokeStartCap},
+            { "TransformMatrix", PropertyId.TransformMatrix},
+            { "TrimEnd", PropertyId.TrimEnd},
+            { "TrimOffset", PropertyId.TrimOffset},
+            { "TrimStart", PropertyId.TrimStart},
+        };
 
         internal static PropertyId PropertyIdFromName(string value)
         {
-            if (s_propertyIdFromNameMap is null)
-            {
-                s_propertyIdFromNameMap =
-                    Enum.GetValues(typeof(PropertyId)).Cast<PropertyId>()
-                        .Where(p => p != PropertyId.None)
-                        .ToDictionary(p => Enum.GetName(typeof(PropertyId), p)!);
-            }
-
             return s_propertyIdFromNameMap.TryGetValue(value, out var result)
                 ? result
                 : PropertyId.None;

diff --git a/source/UIData/Tools/PropertyId.cs b/source/UIData/Tools/PropertyId.cs
@@ -39,5 +39,8 @@ enum PropertyId
         TrimEnd = TransformMatrix << 1,
         TrimOffset = TrimEnd << 1,
         TrimStart = TrimOffset << 1,
+
+        // Any new value should also be added to UIData/Tools/Properties.cs
+        // This is needed to omit Enum.GetValues usage to be AOT compatible.
     }
 }