Fixing AOT things

Author: timunie

src/Avalonia.Samples/CompleteApps/AdvancedToDoList/AdvancedToDoList.Android/AdvancedToDoList.Android.csproj

@@ -10,6 +10,8 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <RunAOTCompilation>true</RunAOTCompilation>
+    <PublishTrimmed>true</PublishTrimmed>
   </PropertyGroup>
 
   <ItemGroup>

src/Avalonia.Samples/CompleteApps/AdvancedToDoList/AdvancedToDoList.Browser/AdvancedToDoList.Browser.csproj

@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia.Browser" />
-    <!-- Use WASM-safe SQLite provider/lib and exclude native e_sqlite3 -->
   </ItemGroup>
 
   <ItemGroup>

src/Avalonia.Samples/CompleteApps/AdvancedToDoList/AdvancedToDoList/Helper/DataBaseHelper.cs

@@ -1,25 +1,23 @@
+
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using AdvancedToDoList.Models;
 using AdvancedToDoList.Services;
 using Avalonia.Controls;
 using Dapper;
 using Microsoft.Data.Sqlite;
 
+[module: DapperAot]
+
 namespace AdvancedToDoList.Helper;
 
-[DapperAot]
 public static class DataBaseHelper
 {
-    static DataBaseHelper()
-    {
-        // Register a type handler to map between SQLite INTEGER (Int64) and our Priority enum
-        SqlMapper.AddTypeHandler(new PriorityTypeHandler());
-    }
-
     private static bool _initialized;
 
     internal static async Task<SqliteConnection> GetOpenConnection()
@@ -96,21 +94,25 @@ public static async Task<IEnumerable<ToDoItem>> GetToDoItemsAsync(bool loadAlsoC
         Console.WriteLine("GetToDoItemsAsync");
         await using var connection = await GetOpenConnection();
         const string sql = """
-                           SELECT t.*, c.*
-                           FROM ToDoItem t
-                           LEFT JOIN Category c ON t.CategoryId = c.Id
-                           WHERE t.Progress < 100 OR @loadAlsoCompletedItems;
+                           SELECT *
+                           FROM ToDoItem 
+                           WHERE Progress < 100 OR @loadAlsoCompletedItems;
                            """;
 
-        return await connection.QueryAsync<ToDoItem, Category, ToDoItem>(
+        var toDoItems = await connection.QueryAsync<ToDoItem>(
             sql,
-            (toDoItem, category) =>
-            {
-                toDoItem.Category = category;
-                return toDoItem;
-            },
-            splitOn: "Id", 
-            param: new {loadAlsoCompletedItems});
+            new {loadAlsoCompletedItems});
+        
+        var categories = await connection.QueryAsync<Category>("SELECT * FROM Category");
+        var categoriesDict = new Dictionary<int, Category>(
+            categories.Select(x => new KeyValuePair<int, Category>(x.Id ?? -1, x)));
+        
+        foreach (var item in toDoItems)
+        {
+            item.Category = categoriesDict.GetValueOrDefault(item.CategoryId ?? -1);
+        }
+        
+        return toDoItems;
     }
 
     private static async Task EnsureInitializedAsync(SqliteConnection connection)
@@ -184,29 +186,4 @@ INSERT INTO ToDoItem (Id, CategoryId, Title, Priority, Description, DueDate, Pro
             """
         );
     }
-}
-
-public class PriorityTypeHandler : SqlMapper.TypeHandler<Priority>
-{
-    public override void SetValue(IDbDataParameter parameter, Priority value)
-    {
-        // Store enum as integer value in SQLite
-        parameter.Value = (int)value;
-    }
-
-    public override Priority Parse(object value)
-    {
-        // SQLite returns INTEGER as Int64 by default; handle common representations robustly
-        return value switch
-        {
-            null => default,
-            DBNull => default,
-            long l => (Priority)(int)l,
-            int i => (Priority)i,
-            short s => (Priority)s,
-            byte b => (Priority)b,
-            string str when int.TryParse(str, out var parsed) => (Priority)parsed,
-            _ => default
-        };
-    }
 }

src/Avalonia.Samples/CompleteApps/AdvancedToDoList/AdvancedToDoList/Models/Category.cs

@@ -4,7 +4,6 @@
 
 namespace AdvancedToDoList.Models;
 
-[DapperAot]
 public record Category
 {
     /// <summary>

src/Avalonia.Samples/CompleteApps/AdvancedToDoList/AdvancedToDoList/Models/ToDoItem.cs

@@ -5,7 +5,6 @@
 
 namespace AdvancedToDoList.Models;
 
-[DapperAot]
 public class ToDoItem
 {
     /// <summary>
@@ -32,7 +31,7 @@ public class ToDoItem
     /// <summary>
     /// Gets or sets the Priority of the ToDoItem. The default value is Medium.
     /// </summary>
-    public Priority Priority { get; set; } = Priority.Medium;
+    public int Priority { get; set; } = (int)Models.Priority.Medium;
 
     /// <summary>
     /// Gets or sets the Description of the ToDoItem. This property is optional.

src/Avalonia.Samples/CompleteApps/AdvancedToDoList/AdvancedToDoList/ViewModels/ManageToDoItemsViewModel.cs

@@ -61,6 +61,7 @@ public ManageToDoItemsViewModel()
     private async Task LoadDataAsync()
     {
         var toDoItems = await DataBaseHelper.GetToDoItemsAsync(ShowAlsoCompletedItems);
+        
         _toDoItemsSourceCache.AddOrUpdate(toDoItems.Select(x => new ToDoItemViewModel(x)));
     }
 

src/Avalonia.Samples/CompleteApps/AdvancedToDoList/AdvancedToDoList/ViewModels/ToDoItemViewModel.cs

@@ -24,7 +24,7 @@ public ToDoItemViewModel(ToDoItem toDoItem)
             ? new CategoryViewModel(toDoItem.Category) 
             : CategoryViewModel.Empty;
         Title = toDoItem.Title;
-        Priority = toDoItem.Priority;
+        Priority = (Priority)toDoItem.Priority;
         Description = toDoItem.Description;
         DueDate = toDoItem.DueDate;
         Progress = toDoItem.Progress;
@@ -142,7 +142,7 @@ private async Task SetProgressAsync(int value)
         CategoryId = Category.Id,
         Category = Category.ToCategory(),
         Progress = Progress,
-        Priority = Priority,
+        Priority = (int)Priority,
         DueDate = DueDate,
         CreatedDate = CreatedDate,
         CompletedDate = CompletedDate,

src/Avalonia.Samples/CompleteApps/AdvancedToDoList/AdvancedToDoList/ViewModels/_DesignData.cs

@@ -7,10 +7,10 @@ public static class _DesignData
 {
     static _DesignData()
     {
-        var categories = DataBaseHelper.GetCategoriesAsync().Result.ToArray();
+        var categories = DataBaseHelper.GetCategoriesAsync().Result;
         EditCategoryViewModel = new EditCategoryViewModel(new CategoryViewModel(categories.First()));
 
-        var toDoItems = DataBaseHelper.GetToDoItemsAsync().Result.ToArray();
+        var toDoItems = DataBaseHelper.GetToDoItemsAsync().Result;
         EditToDoItemViewModel = new EditToDoItemViewModel(new ToDoItemViewModel(toDoItems.First()), categories.Select(x => new CategoryViewModel(x)).ToList());
     }