Temp fix

Waiting for AvaloniaUI/Avalonia.Controls.TreeDataGrid#304
erri120 · Sep 4, 2024 · 308ee40 · 308ee40
1 parent 3b6e6cf
commit 308ee40
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/NexusMods.App.UI/Pages/LibraryPage/LibraryItemModel.cs b/src/NexusMods.App.UI/Pages/LibraryPage/LibraryItemModel.cs
@@ -19,7 +19,10 @@ public class LibraryItemModel : TreeDataGridItemModel<LibraryItemModel, EntityId
 {
     public required string Name { get; init; }
     public required DateTime CreatedAt { get; init; }
-    public BindableReactiveProperty<Size> ItemSize { get; } = new(Size.Zero);
+
+    // TODO: turn this back into a `Size`
+    // NOTE(erri120): requires https://github.com/AvaloniaUI/Avalonia.Controls.TreeDataGrid/pull/304
+    public BindableReactiveProperty<string> ItemSize { get; } = new(Size.Zero.ToString());
     public BindableReactiveProperty<string> Version { get; set; } = new("-");
 
     public IObservable<IChangeSet<LibraryLinkedLoadoutItem.ReadOnly, EntityId>> LinkedLoadoutItemsObservable { get; init; } = System.Reactive.Linq.Observable.Empty<IChangeSet<LibraryLinkedLoadoutItem.ReadOnly, EntityId>>();
@@ -158,13 +161,13 @@ public static IColumn<LibraryItemModel> CreateVersionColumn()
 
     public static IColumn<LibraryItemModel> CreateSizeColumn()
     {
-        return new CustomTextColumn<LibraryItemModel, Size>(
+        return new CustomTextColumn<LibraryItemModel, string>(
             header: "SIZE",
             getter: model => model.ItemSize.Value,
             options: new TextColumnOptions<LibraryItemModel>
             {
-                CompareAscending = static (a, b) => a is null ? -1 : a.ItemSize.Value.CompareTo(b?.ItemSize.Value ?? Size.Zero),
-                CompareDescending = static (a, b) => b is null ? -1 : b.ItemSize.Value.CompareTo(a?.ItemSize.Value ?? Size.Zero),
+                CompareAscending = static (a, b) => a is null ? -1 : a.ItemSize.Value.CompareTo(b?.ItemSize.Value ?? "0 B"),
+                CompareDescending = static (a, b) => b is null ? -1 : b.ItemSize.Value.CompareTo(a?.ItemSize.Value ?? "0 B"),
                 IsTextSearchEnabled = false,
                 CanUserResizeColumn = true,
                 CanUserSortColumn = true,

diff --git a/src/NexusMods.App.UI/Pages/LibraryPage/NexusModsModPageLibraryItemModel.cs b/src/NexusMods.App.UI/Pages/LibraryPage/NexusModsModPageLibraryItemModel.cs
@@ -21,12 +21,12 @@ public NexusModsModPageLibraryItemModel() : base(default(LibraryItemId))
                     // TODO: different selection, need to check with design
                     if (model.LibraryItems.TryGetFirst(static x => x.ToLibraryFile().ToDownloadedFile().ToNexusModsLibraryFile().IsValid(), out var libraryItem))
                     {
-                        model.ItemSize.Value = libraryItem.ToLibraryFile().Size;
+                        model.ItemSize.Value = libraryItem.ToLibraryFile().Size.ToString();
                         model.Version.Value = libraryItem.ToLibraryFile().ToDownloadedFile().ToNexusModsLibraryFile().FileMetadata.Version;
                     }
                     else
                     {
-                        model.ItemSize.Value = Size.Zero;
+                        model.ItemSize.Value = Size.Zero.ToString();
                         model.Version.Value = "-";
                     }
                 })

diff --git a/src/NexusMods.App.UI/Pages/LocalFileDataProvider.cs b/src/NexusMods.App.UI/Pages/LocalFileDataProvider.cs
@@ -54,7 +54,7 @@ private LibraryItemModel ToLibraryItemModel(LibraryFile.ReadOnly libraryFile)
             LinkedLoadoutItemsObservable = linkedLoadoutItemsObservable,
         };
 
-        model.ItemSize.Value = libraryFile.Size;
+        model.ItemSize.Value = libraryFile.Size.ToString();
         return model;
     }
 
@@ -96,7 +96,7 @@ public IObservable<IChangeSet<LibraryItemModel, EntityId>> ObserveNestedLibraryI
                     LibraryItemsObservable = UIObservableExtensions.ReturnFactory(() => new ChangeSet<LibraryItem.ReadOnly, EntityId>([new Change<LibraryItem.ReadOnly, EntityId>(ChangeReason.Add, entityId, LibraryItem.Load(_connection.Db, entityId))])),
                 };
 
-                model.ItemSize.Value = libraryFile.Size;
+                model.ItemSize.Value = libraryFile.Size.ToString();
                 return (LibraryItemModel)model;
             });
     }

diff --git a/src/NexusMods.App.UI/Pages/NexusModsDataProvider.cs b/src/NexusMods.App.UI/Pages/NexusModsDataProvider.cs
@@ -62,7 +62,7 @@ private LibraryItemModel ToLibraryItemModel(NexusModsLibraryFile.ReadOnly nexusM
             LinkedLoadoutItemsObservable = linkedLoadoutItemsObservable,
         };
 
-        model.ItemSize.Value = nexusModsLibraryFile.AsDownloadedFile().AsLibraryFile().Size;
+        model.ItemSize.Value = nexusModsLibraryFile.AsDownloadedFile().AsLibraryFile().Size.ToString();
         model.Version.Value = nexusModsLibraryFile.FileMetadata.Version;
 
         return model;