Images WIP

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImageView.axaml

@@ -0,0 +1,24 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
+             xmlns:details="clr-namespace:Artemis.UI.Screens.Workshop.Entries.Details"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Artemis.UI.Screens.Workshop.Entries.Details.EntryImageView"
+             x:DataType="details:EntryImageViewModel">
+    <Border Classes="card" Padding="0" Width="300" ClipToBounds="True" Margin="0 5 0 0">
+        <Grid RowDefinitions="230,*">
+            <Rectangle Grid.Row="0" Fill="{DynamicResource CheckerboardBrush}" />
+            <Image Grid.Row="0"
+                   VerticalAlignment="Center"
+                   HorizontalAlignment="Center"
+                   RenderOptions.BitmapInterpolationMode="HighQuality"
+                   asyncImageLoader:ImageLoader.Source="{CompiledBinding ThumbnailUrl, Mode=OneWay}"  />
+            <StackPanel Grid.Row="1" Margin="12">
+                <TextBlock Text="{CompiledBinding Image.Name}" TextTrimming="CharacterEllipsis" />
+                <TextBlock Classes="subtitle" Text="{CompiledBinding Image.Description}" TextWrapping="Wrap" />
+            </StackPanel>
+        </Grid>
+    </Border>
+</UserControl>

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImageView.axaml.cs

@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Artemis.UI.Screens.Workshop.Entries.Details;
+
+public partial class EntryImageView : UserControl
+{
+    public EntryImageView()
+    {
+        InitializeComponent();
+    }
+}

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImageViewModel.cs

@@ -0,0 +1,17 @@
+using Artemis.WebClient.Workshop;
+
+namespace Artemis.UI.Screens.Workshop.Entries.Details;
+
+public class EntryImageViewModel
+{
+    public EntryImageViewModel(IImage image)
+    {
+        Image = image;
+        Url = $"{WorkshopConstants.WORKSHOP_URL}/images/{image.Id}.png";
+        ThumbnailUrl = $"{WorkshopConstants.WORKSHOP_URL}/images/{image.Id}-thumb.png";
+    }
+
+    public IImage Image { get; }
+    public string Url { get; }
+    public string ThumbnailUrl { get; }
+}

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesView.axaml

@@ -0,0 +1,28 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:system="clr-namespace:System;assembly=System.Runtime"
+             xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
+             xmlns:details="clr-namespace:Artemis.UI.Screens.Workshop.Entries.Details"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Artemis.UI.Screens.Workshop.Entries.Details.EntryImagesView"
+             x:DataType="details:EntryImagesViewModel">
+    <ItemsControl ItemsSource="{CompiledBinding Images}" Margin="0 -16 0 0">
+        <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+                <VirtualizingStackPanel />
+            </ItemsPanelTemplate>
+        </ItemsControl.ItemsPanel>
+        <ItemsControl.DataTemplates>
+            <DataTemplate x:DataType="details:EntryImageViewModel">
+                <Border CornerRadius="6"
+                        Margin="0 16 0 0"
+                        MaxWidth="300"
+                        ClipToBounds="True">
+                    <Image Stretch="UniformToFill" asyncImageLoader:ImageLoader.Source="{CompiledBinding ThumbnailUrl, Mode=OneWay}" />
+                </Border>
+            </DataTemplate>
+        </ItemsControl.DataTemplates>
+    </ItemsControl>
+</UserControl>

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesView.axaml.cs

@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Artemis.UI.Screens.Workshop.Entries.Details;
+
+public partial class EntryImagesView : UserControl
+{
+    public EntryImagesView()
+    {
+        InitializeComponent();
+    }
+}

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesViewModel.cs

@@ -0,0 +1,16 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using Artemis.UI.Shared;
+using Artemis.WebClient.Workshop;
+
+namespace Artemis.UI.Screens.Workshop.Entries.Details;
+
+public class EntryImagesViewModel : ViewModelBase
+{
+    public ObservableCollection<EntryImageViewModel> Images { get; }
+
+    public EntryImagesViewModel(IEntryDetails entryDetails)
+    {
+        Images = new ObservableCollection<EntryImageViewModel>(entryDetails.Images.Select(i => new EntryImageViewModel(i)));
+    }
+}

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoView.axaml

@@ -0,0 +1,83 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:details="clr-namespace:Artemis.UI.Screens.Workshop.Entries.Details"
+             xmlns:il="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
+             xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+             xmlns:converters="clr-namespace:Artemis.UI.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Artemis.UI.Screens.Workshop.Entries.Details.EntryInfoView"
+             x:DataType="details:EntryInfoViewModel">
+    <UserControl.Resources>
+        <converters:EntryIconUriConverter x:Key="EntryIconUriConverter" />
+        <converters:DateTimeConverter x:Key="DateTimeConverter" />
+    </UserControl.Resources>
+    <StackPanel>
+        <Panel>
+            <Border CornerRadius="6"
+                    HorizontalAlignment="Left"
+                    Margin="0 0 10 0"
+                    Width="80"
+                    Height="80"
+                    ClipToBounds="True">
+                <Image Stretch="UniformToFill" il:ImageLoader.Source="{CompiledBinding Entry.Id, Converter={StaticResource EntryIconUriConverter}, Mode=OneWay}" />
+            </Border>
+            <Button Classes="icon-button"
+                    VerticalAlignment="Top"
+                    HorizontalAlignment="Right"
+                    Command="{CompiledBinding CopyShareLink}"
+                    ToolTip.Tip="Copy share link">
+                <avalonia:MaterialIcon Kind="ShareVariant" />
+            </Button>
+        </Panel>
+
+
+        <TextBlock Theme="{StaticResource TitleTextBlockStyle}"
+                   MaxLines="3"
+                   TextTrimming="CharacterEllipsis"
+                   Text="{CompiledBinding Entry.Name, FallbackValue=Title }" />
+
+        <TextBlock Classes="subtitle" TextTrimming="CharacterEllipsis" Text="{CompiledBinding Entry.Author, FallbackValue=Author}" />
+
+        <TextBlock Margin="0 8" TextWrapping="Wrap" Text="{CompiledBinding Entry.Summary, FallbackValue=Summary}" />
+
+        <!-- Categories -->
+        <ItemsControl ItemsSource="{CompiledBinding Entry.Categories}" Margin="0 0 -8 0">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <WrapPanel Orientation="Horizontal"></WrapPanel>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal" Margin="0 0 8 0">
+                        <avalonia:MaterialIcon Kind="{CompiledBinding Icon}" Margin="0 0 3 0"></avalonia:MaterialIcon>
+                        <TextBlock Text="{CompiledBinding Name}" TextTrimming="CharacterEllipsis" />
+                    </StackPanel>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+        
+        <Border Classes="card-separator"></Border>
+        
+        <TextBlock Margin="0 0 0 8">
+            <avalonia:MaterialIcon Kind="Downloads" />
+            <Run Classes="h5" Text="{CompiledBinding Entry.Downloads, FallbackValue=0}" />
+            <Run>downloads</Run>
+        </TextBlock>
+        
+        <TextBlock Classes="subtitle"
+                   ToolTip.Tip="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}}">
+            <avalonia:MaterialIcon Kind="Calendar" />
+            <Run>Created</Run>
+            <Run Text="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
+        </TextBlock>
+        <TextBlock Classes="subtitle"
+                   ToolTip.Tip="{CompiledBinding UpdatedAt, Converter={StaticResource DateTimeConverter}}">
+            <avalonia:MaterialIcon Kind="Update" />
+            <Run>Updated</Run>
+            <Run Text="{CompiledBinding UpdatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
+        </TextBlock>
+    </StackPanel>
+</UserControl>

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoView.axaml.cs

@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Artemis.UI.Screens.Workshop.Entries.Details;
+
+public partial class EntryInfoView : UserControl
+{
+    public EntryInfoView()
+    {
+        InitializeComponent();
+    }
+}

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoViewModel.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Threading.Tasks;
+using Artemis.Core;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
+using Artemis.WebClient.Workshop;
+
+namespace Artemis.UI.Screens.Workshop.Entries.Details;
+
+public class EntryInfoViewModel : ViewModelBase
+{
+    private readonly INotificationService _notificationService;
+    public IGetEntryById_Entry Entry { get; }
+    public DateTimeOffset? UpdatedAt { get; }
+    
+    public EntryInfoViewModel(IGetEntryById_Entry entry, INotificationService notificationService)
+    {
+        _notificationService = notificationService;
+        Entry = entry;
+        UpdatedAt = Entry.LatestRelease?.CreatedAt ?? Entry.CreatedAt;
+    }
+
+    public async Task CopyShareLink()
+    {
+        await Shared.UI.Clipboard.SetTextAsync($"{WorkshopConstants.WORKSHOP_URL}/entries/{Entry.Id}/{StringUtilities.UrlFriendly(Entry.Name)}");
+        _notificationService.CreateNotification().WithTitle("Copied share link to clipboard.").Show();
+    }
+}

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryReleasesView.axaml

@@ -0,0 +1,52 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:details="clr-namespace:Artemis.UI.Screens.Workshop.Entries.Details"
+             xmlns:converters="clr-namespace:Artemis.UI.Converters"
+             xmlns:sharedConverters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
+             xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Artemis.UI.Screens.Workshop.Entries.Details.EntryReleasesView"
+             x:DataType="details:EntryReleasesViewModel">
+    <UserControl.Resources>
+        <converters:DateTimeConverter x:Key="DateTimeConverter" />
+        <sharedConverters:BytesToStringConverter x:Key="BytesToStringConverter" />
+    </UserControl.Resources>
+    <StackPanel>
+        <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Latest release</TextBlock>
+        <Border Classes="card-separator" />
+        <Button HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Stretch"
+                Command="{CompiledBinding DownloadLatestRelease}">
+            <Grid ColumnDefinitions="Auto,*">
+                <!-- Icon -->
+                <Border Grid.Column="0"
+                        CornerRadius="4"
+                        Background="{StaticResource SystemAccentColor}"
+                        VerticalAlignment="Center"
+                        Margin="0 6"
+                        Width="50"
+                        Height="50"
+                        ClipToBounds="True">
+                    <avalonia:MaterialIcon Kind="Download"></avalonia:MaterialIcon>
+                </Border>
+
+                <!-- Body -->
+                <StackPanel Grid.Column="1" Margin="10 0" VerticalAlignment="Center">
+                    <TextBlock Text="{CompiledBinding Entry.LatestRelease.Version, FallbackValue=Version}"></TextBlock>
+                    <TextBlock Classes="subtitle">
+                        <avalonia:MaterialIcon Kind="BoxOutline" />
+                        <Run Text="{CompiledBinding Entry.LatestRelease.DownloadSize, Converter={StaticResource BytesToStringConverter}, Mode=OneWay}"></Run>
+                    </TextBlock>
+                    <TextBlock Classes="subtitle"
+                               ToolTip.Tip="{CompiledBinding Entry.LatestRelease.CreatedAt, Converter={StaticResource DateTimeConverter}}">
+                        <avalonia:MaterialIcon Kind="Calendar" />
+                        <Run>Created</Run>
+                        <Run Text="{CompiledBinding Entry.LatestRelease.CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
+                    </TextBlock>
+                </StackPanel>
+            </Grid>
+        </Button>
+    </StackPanel>
+</UserControl>

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryReleasesView.axaml.cs

@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Artemis.UI.Screens.Workshop.Entries.Details;
+
+public partial class EntryReleasesView : UserControl
+{
+    public EntryReleasesView()
+    {
+        InitializeComponent();
+    }
+}

src/Artemis.UI/Screens/Workshop/Entries/Details/EntryReleasesViewModel.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Reactive;
+using System.Threading;
+using System.Threading.Tasks;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
+using Artemis.UI.Shared.Services.Builders;
+using Artemis.UI.Shared.Utilities;
+using Artemis.WebClient.Workshop;
+using Artemis.WebClient.Workshop.Handlers.InstallationHandlers;
+using Humanizer;
+using ReactiveUI;
+
+namespace Artemis.UI.Screens.Workshop.Entries.Details;
+
+public class EntryReleasesViewModel : ViewModelBase
+{
+    private readonly EntryInstallationHandlerFactory _factory;
+    private readonly IWindowService _windowService;
+    private readonly INotificationService _notificationService;
+
+    public EntryReleasesViewModel(IGetEntryById_Entry entry, EntryInstallationHandlerFactory factory, IWindowService windowService, INotificationService notificationService)
+    {
+        _factory = factory;
+        _windowService = windowService;
+        _notificationService = notificationService;
+
+        Entry = entry;
+        DownloadLatestRelease = ReactiveCommand.CreateFromTask(ExecuteDownloadLatestRelease);
+    }
+
+    public IGetEntryById_Entry Entry { get; }
+    public ReactiveCommand<Unit, Unit> DownloadLatestRelease { get; }
+
+    private async Task ExecuteDownloadLatestRelease(CancellationToken cancellationToken)
+    {
+        if (Entry.LatestRelease == null)
+            return;
+        
+        bool confirm = await _windowService.ShowConfirmContentDialog(
+            "Install latest release",
+            $"Are you sure you want to download and install version {Entry.LatestRelease.Version} of {Entry.Name}?"
+        );
+        if (!confirm)
+            return;
+
+        IEntryInstallationHandler installationHandler = _factory.CreateHandler(Entry.EntryType);
+        EntryInstallResult result = await installationHandler.InstallAsync(Entry, Entry.LatestRelease.Id, new Progress<StreamProgress>(), cancellationToken);
+        if (result.IsSuccess)
+            _notificationService.CreateNotification().WithTitle($"{Entry.EntryType.Humanize(LetterCasing.Sentence)} installed").WithSeverity(NotificationSeverity.Success).Show();
+        else
+        {
+            _notificationService.CreateNotification()
+                .WithTitle($"Failed to install {Entry.EntryType.Humanize(LetterCasing.LowerCase)}")
+                .WithMessage(result.Message)
+                .WithSeverity(NotificationSeverity.Error).Show();
+        }
+    }
+}

src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsView.axaml

@@ -9,9 +9,10 @@
              xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit"
              xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+             xmlns:details="clr-namespace:Artemis.UI.Screens.Workshop.Entries.Details"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
-             x:Class="Artemis.UI.Screens.Workshop.Entries.EntrySpecificationsView"
-             x:DataType="entries:EntrySpecificationsViewModel">
+             x:Class="Artemis.UI.Screens.Workshop.Entries.Details.EntrySpecificationsView"
+             x:DataType="details:EntrySpecificationsViewModel">
     <Grid RowDefinitions="Auto,Auto,*,Auto">
         <StackPanel>
             <StackPanel.Styles>

src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsView.axaml.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using Artemis.UI.Shared.Extensions;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
@@ -8,8 +7,9 @@ using Avalonia.ReactiveUI;
 using AvaloniaEdit.TextMate;
 using ReactiveUI;
 using TextMateSharp.Grammars;
+using VisualExtensions = Artemis.UI.Shared.Extensions.VisualExtensions;
 
-namespace Artemis.UI.Screens.Workshop.Entries;
+namespace Artemis.UI.Screens.Workshop.Entries.Details;
 
 public partial class EntrySpecificationsView : ReactiveUserControl<EntrySpecificationsViewModel>
 {
@@ -23,7 +23,7 @@ public partial class EntrySpecificationsView : ReactiveUserControl<EntrySpecific
 
         DescriptionEditor.Options.AllowScrollBelowDocument = false;
         RegistryOptions options = new(ThemeName.Dark);
-        TextMate.Installation? install = DescriptionEditor.InstallTextMate(options);
+        TextMate.Installation? install = TextMate.InstallTextMate(DescriptionEditor, options);
 
         install.SetGrammar(options.GetScopeByExtension(".md"));
 
@@ -45,8 +45,8 @@ public partial class EntrySpecificationsView : ReactiveUserControl<EntrySpecific
         if (_previewScrollViewer != null)
             _previewScrollViewer.PropertyChanged -= PreviewScrollViewerOnPropertyChanged;
 
-        _editorScrollViewer = DescriptionEditor.GetVisualChildrenOfType<ScrollViewer>().FirstOrDefault();
-        _previewScrollViewer = DescriptionPreview.GetVisualChildrenOfType<ScrollViewer>().FirstOrDefault();
+        _editorScrollViewer = VisualExtensions.GetVisualChildrenOfType<ScrollViewer>(DescriptionEditor).FirstOrDefault();
+        _previewScrollViewer = VisualExtensions.GetVisualChildrenOfType<ScrollViewer>(DescriptionPreview).FirstOrDefault();
 
         if (_editorScrollViewer != null)
             _editorScrollViewer.PropertyChanged += EditorScrollViewerOnPropertyChanged;

src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsViewModel.cs

@@ -22,7 +22,7 @@ using ReactiveUI.Validation.Extensions;
 using ReactiveUI.Validation.Helpers;
 using StrawberryShake;
 
-namespace Artemis.UI.Screens.Workshop.Entries;
+namespace Artemis.UI.Screens.Workshop.Entries.Details;
 
 public partial class EntrySpecificationsViewModel : ValidatableViewModelBase
 {
@@ -52,12 +52,12 @@ public partial class EntrySpecificationsViewModel : ValidatableViewModelBase
             .Subscribe();
         SelectedCategories = selectedCategories;
 
-        this.ValidationRule(vm => vm.Name, s => !string.IsNullOrWhiteSpace(s), "Name is required");
-        this.ValidationRule(vm => vm.Summary, s => !string.IsNullOrWhiteSpace(s), "Summary is required");
-        ValidationHelper descriptionRule = this.ValidationRule(vm => vm.Description, s => !string.IsNullOrWhiteSpace(s), "Description is required");
+        this.ValidationRule<EntrySpecificationsViewModel, string>(vm => vm.Name, s => !string.IsNullOrWhiteSpace(s), "Name is required");
+        this.ValidationRule<EntrySpecificationsViewModel, string>(vm => vm.Summary, s => !string.IsNullOrWhiteSpace(s), "Summary is required");
+        ValidationHelper descriptionRule = this.ValidationRule<EntrySpecificationsViewModel, string>(vm => vm.Description, s => !string.IsNullOrWhiteSpace(s), "Description is required");
 
         // These don't use inputs that support validation messages, do so manually
-        ValidationHelper iconRule = this.ValidationRule(vm => vm.IconBitmap, s => s != null, "Icon required");
+        ValidationHelper iconRule = this.ValidationRule<EntrySpecificationsViewModel, Bitmap>(vm => vm.IconBitmap, s => s != null, "Icon required");
         ValidationHelper categoriesRule = this.ValidationRule(vm => vm.Categories, Categories.ToObservableChangeSet().AutoRefresh(c => c.IsSelected).Filter(c => c.IsSelected).IsNotEmpty(),
             "At least one category must be selected"
         );

src/Artemis.UI/Screens/Workshop/Entries/EntryInstallationDialogView.axaml

@@ -1,8 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Workshop.Entries.EntryInstallationDialogView">
-    Welcome to Avalonia!
-</UserControl>

src/Artemis.UI/Screens/Workshop/Entries/EntryInstallationDialogView.axaml.cs

@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Artemis.UI.Screens.Workshop.Entries;
-
-public partial class EntryInstallationDialogView : UserControl
-{
-    public EntryInstallationDialogView()
-    {
-        InitializeComponent();
-    }
-}

src/Artemis.UI/Screens/Workshop/Entries/EntryInstallationDialogViewModel.cs

@@ -1,8 +0,0 @@
-using Artemis.UI.Shared;
-
-namespace Artemis.UI.Screens.Workshop.Entries;
-
-public class EntryInstallationDialogViewModel : ContentDialogViewModelBase
-{
-    
-}

src/Artemis.UI/Screens/Workshop/Entries/List/EntryListInputView.axaml

@@ -4,9 +4,10 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:entries="clr-namespace:Artemis.UI.Screens.Workshop.Entries"
              xmlns:system="clr-namespace:System;assembly=System.Runtime"
+             xmlns:list="clr-namespace:Artemis.UI.Screens.Workshop.Entries.List"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Workshop.Entries.EntryListInputView"
-             x:DataType="entries:EntryListInputViewModel">
+             x:Class="Artemis.UI.Screens.Workshop.Entries.List.EntryListInputView"
+             x:DataType="list:EntryListInputViewModel">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" MaxWidth="500" />

src/Artemis.UI/Screens/Workshop/Entries/List/EntryListInputView.axaml.cs

@@ -1,8 +1,6 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
-namespace Artemis.UI.Screens.Workshop.Entries;
+namespace Artemis.UI.Screens.Workshop.Entries.List;
 
 public partial class EntryListInputView : UserControl
 {

src/Artemis.UI/Screens/Workshop/Entries/List/EntryListInputViewModel.cs

@@ -4,7 +4,7 @@ using Artemis.UI.Shared;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Workshop.Entries;
+namespace Artemis.UI.Screens.Workshop.Entries.List;
 
 public partial class EntryListInputViewModel : ViewModelBase
 {

src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemView.axaml

@@ -6,9 +6,10 @@
              xmlns:entries1="clr-namespace:Artemis.UI.Screens.Workshop.Entries"
              xmlns:il="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
+             xmlns:list="clr-namespace:Artemis.UI.Screens.Workshop.Entries.List"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="110"
-             x:Class="Artemis.UI.Screens.Workshop.Entries.EntryListItemView"
-             x:DataType="entries1:EntryListItemViewModel">
+             x:Class="Artemis.UI.Screens.Workshop.Entries.List.EntryListItemView"
+             x:DataType="list:EntryListItemViewModel">
     <UserControl.Resources>
         <converters:EntryIconUriConverter x:Key="EntryIconUriConverter" />
         <converters:DateTimeConverter x:Key="DateTimeConverter" />

src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemView.axaml.cs

@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Workshop.Entries;
+namespace Artemis.UI.Screens.Workshop.Entries.List;
 
 public partial class EntryListItemView : ReactiveUserControl<EntryListItemViewModel>
 {

src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemViewModel.cs

@@ -1,17 +1,12 @@
 using System;
 using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Routing;
 using Artemis.WebClient.Workshop;
-using Artemis.WebClient.Workshop.Services;
-using Avalonia.Media.Imaging;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Workshop.Entries;
+namespace Artemis.UI.Screens.Workshop.Entries.List;
 
 public class EntryListItemViewModel : ActivatableViewModelBase
 {

src/Artemis.UI/Screens/Workshop/Entries/List/EntryListViewModel.cs

@@ -17,7 +17,7 @@ using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 using StrawberryShake;
 
-namespace Artemis.UI.Screens.Workshop.Entries;
+namespace Artemis.UI.Screens.Workshop.Entries.List;
 
 public abstract partial class EntryListViewModel : RoutableScreen<WorkshopListParameters>
 {
@@ -42,8 +42,8 @@ public abstract partial class EntryListViewModel : RoutableScreen<WorkshopListPa
         _route = route;
         _workshopClient = workshopClient;
         _notificationService = notificationService;
-        _showPagination = this.WhenAnyValue(vm => vm.TotalPages).Select(t => t > 1).ToProperty(this, vm => vm.ShowPagination);
-        _isLoading = this.WhenAnyValue(vm => vm.Page, vm => vm.LoadedPage, (p, c) => p != c).ToProperty(this, vm => vm.IsLoading);
+        _showPagination = this.WhenAnyValue<EntryListViewModel, int>(vm => vm.TotalPages).Select(t => t > 1).ToProperty(this, vm => vm.ShowPagination);
+        _isLoading = this.WhenAnyValue<EntryListViewModel, bool, int, int>(vm => vm.Page, vm => vm.LoadedPage, (p, c) => p != c).ToProperty(this, vm => vm.IsLoading);
 
         CategoriesViewModel = categoriesViewModel;
         InputViewModel = entryListInputViewModel;
@@ -56,7 +56,7 @@ public abstract partial class EntryListViewModel : RoutableScreen<WorkshopListPa
         Entries = entries;
 
         // Respond to page changes
-        this.WhenAnyValue(vm => vm.Page).Skip(1).Subscribe(p => Task.Run(() => router.Navigate($"{_route}/{p}")));
+        this.WhenAnyValue<EntryListViewModel, int>(vm => vm.Page).Skip(1).Subscribe(p => Task.Run(() => router.Navigate($"{_route}/{p}")));
 
         this.WhenActivated(d =>
         {

src/Artemis.UI/Screens/Workshop/Entries/Tabs/LayoutListViewModel.cs

@@ -1,17 +1,18 @@
 using System;
 using Artemis.UI.Screens.Workshop.Categories;
+using Artemis.UI.Screens.Workshop.Entries.List;
 using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
 
 namespace Artemis.UI.Screens.Workshop.Entries.Tabs;
 
-public class LayoutListViewModel : EntryListViewModel
+public class LayoutListViewModel : List.EntryListViewModel
 {
     public LayoutListViewModel(IWorkshopClient workshopClient,
         IRouter router,
         CategoriesViewModel categoriesViewModel,
-        EntryListInputViewModel entryListInputViewModel,
+        List.EntryListInputViewModel entryListInputViewModel,
         INotificationService notificationService,
         Func<IGetEntries_Entries_Items, EntryListItemViewModel> getEntryListViewModel)
         : base("workshop/entries/layout", workshopClient, router, categoriesViewModel, entryListInputViewModel, notificationService, getEntryListViewModel)

src/Artemis.UI/Screens/Workshop/Entries/Tabs/ProfileListViewModel.cs

@@ -1,17 +1,18 @@
 using System;
 using Artemis.UI.Screens.Workshop.Categories;
+using Artemis.UI.Screens.Workshop.Entries.List;
 using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
 
 namespace Artemis.UI.Screens.Workshop.Entries.Tabs;
 
-public class ProfileListViewModel : EntryListViewModel
+public class ProfileListViewModel : List.EntryListViewModel
 {
     public ProfileListViewModel(IWorkshopClient workshopClient,
         IRouter router,
         CategoriesViewModel categoriesViewModel,
-        EntryListInputViewModel entryListInputViewModel,
+        List.EntryListInputViewModel entryListInputViewModel,
         INotificationService notificationService,
         Func<IGetEntries_Entries_Items, EntryListItemViewModel> getEntryListViewModel)
         : base("workshop/entries/profiles", workshopClient, router, categoriesViewModel, entryListInputViewModel, notificationService, getEntryListViewModel)

src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionView.axaml

@@ -13,29 +13,34 @@
     </UserControl.Resources>
     <Border Classes="card" Padding="0" Width="300" ClipToBounds="True" Margin="5">
         <Grid RowDefinitions="230,*">
-            <Rectangle Grid.Row="0" Fill="{DynamicResource CheckerboardBrush}"/>
-            <Image Grid.Row="0" 
+            <Rectangle Grid.Row="0" Fill="{DynamicResource CheckerboardBrush}" />
+            <Image Grid.Row="0"
                    VerticalAlignment="Center"
                    HorizontalAlignment="Center"
                    RenderOptions.BitmapInterpolationMode="HighQuality"
-                   Source="{CompiledBinding Bitmap}"/>
+                   Source="{CompiledBinding Bitmap}" />
             <StackPanel Grid.Row="1" Margin="12">
-                <TextBlock Text="{CompiledBinding FileName, FallbackValue=Unnamed image}" TextTrimming="CharacterEllipsis" />
-                <StackPanel>
-                    <TextBlock TextWrapping="Wrap" Classes="subtitle" Text="{CompiledBinding ImageDimensions, Mode=OneWay}" />
-                    <TextBlock TextWrapping="Wrap" Classes="subtitle" Text="{CompiledBinding FileSize, Converter={StaticResource BytesToStringConverter}, Mode=OneWay}" />
-                </StackPanel>
+                <TextBlock Text="{CompiledBinding Name, FallbackValue=Unnamed image}" TextTrimming="CharacterEllipsis" />
+                <TextBlock TextWrapping="Wrap" Classes="subtitle" Text="{CompiledBinding Description}" />
+                <Separator Margin="-4 10" />
+                <TextBlock TextWrapping="Wrap" Classes="subtitle">
+                    <Run Text="{CompiledBinding ImageDimensions}" /> - <Run Text="{CompiledBinding FileSize, Converter={StaticResource BytesToStringConverter}, Mode=OneWay}" />
+                </TextBlock>
             </StackPanel>
-            
-            <Button Grid.Row="1"
-                    VerticalAlignment="Bottom"
-                    HorizontalAlignment="Right"
-                    Margin="6"
-                    Classes="icon-button"
-                    Command="{CompiledBinding Remove}"
-                    ToolTip.Tip="Remove">
-                <avalonia:MaterialIcon Kind="Trash" />
-            </Button>
+
+            <StackPanel Grid.Row="1" Spacing="5" Margin="6" VerticalAlignment="Bottom" HorizontalAlignment="Right">
+                <Button Classes="icon-button"
+                        Command="{CompiledBinding Remove}"
+                        ToolTip.Tip="Edit">
+                    <avalonia:MaterialIcon Kind="Edit" />
+                </Button>
+                <Button Classes="icon-button"
+                        Command="{CompiledBinding Remove}"
+                        ToolTip.Tip="Remove">
+                    <avalonia:MaterialIcon Kind="Trash" />
+                </Button>
+            </StackPanel>
+
         </Grid>
     </Border>
-</UserControl>
+</UserControl>

src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionViewModel.cs

@@ -2,39 +2,43 @@ using System.IO;
 using System.Reactive.Disposables;
 using System.Windows.Input;
 using Artemis.UI.Shared;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
+using ReactiveUI.Validation.Extensions;
 
 namespace Artemis.UI.Screens.Workshop.Image;
 
-public partial class ImageSubmissionViewModel : ActivatableViewModelBase
+public partial class ImageSubmissionViewModel : ValidatableViewModelBase
 {
     [Notify(Setter.Private)] private Bitmap? _bitmap;
-    [Notify(Setter.Private)] private string? _fileName;
     [Notify(Setter.Private)] private string? _imageDimensions;
     [Notify(Setter.Private)] private long _fileSize;
+    [Notify] private string? _name;
+    [Notify] private string? _description;
     [Notify] private ICommand? _remove;
 
-    public ImageSubmissionViewModel(Stream imageStream)
+    public ImageSubmissionViewModel(ImageUploadRequest image)
     {
         this.WhenActivated(d =>
         {
             Dispatcher.UIThread.Invoke(() =>
             {
-                imageStream.Seek(0, SeekOrigin.Begin);
-                Bitmap = new Bitmap(imageStream);
-                FileSize = imageStream.Length;
+                image.File.Seek(0, SeekOrigin.Begin);
+                Bitmap = new Bitmap(image.File);
+                FileSize = image.File.Length;
                 ImageDimensions = Bitmap.Size.Width + "x" + Bitmap.Size.Height;
-
-                if (imageStream is FileStream fileStream)
-                    FileName = Path.GetFileName(fileStream.Name);
-                else
-                    FileName = "Unnamed image";
+                Name = image.Name;
+                Description = image.Description;
 
                 Bitmap.DisposeWith(d);
             }, DispatcherPriority.Background);
         });
+        
+        this.ValidationRule(vm => vm.Name, input => !string.IsNullOrWhiteSpace(input), "Name is required");
+        this.ValidationRule(vm => vm.Name, input => input?.Length <= 50, "Name can be a maximum of 50 characters");
+        this.ValidationRule(vm => vm.Description, input => input?.Length <= 150, "Description can be a maximum of 150 characters");
     }
 }

src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml

@@ -2,132 +2,31 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:Layout="clr-namespace:Artemis.UI.Screens.Workshop.Layout"
-             xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:il="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
-             xmlns:converters="clr-namespace:Artemis.UI.Converters"
+             xmlns:layout="clr-namespace:Artemis.UI.Screens.Workshop.Layout"
              xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
-             xmlns:mdsvg="https://github.com/whistyun/Markdown.Avalonia.Svg"
-             xmlns:ui="clr-namespace:Artemis.UI"
-             xmlns:converters1="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
              x:Class="Artemis.UI.Screens.Workshop.Layout.LayoutDetailsView"
-             x:DataType="Layout:LayoutDetailsViewModel">
-    <UserControl.Resources>
-        <converters:EntryIconUriConverter x:Key="EntryIconUriConverter" />
-        <converters:DateTimeConverter x:Key="DateTimeConverter" />
-        <converters1:BytesToStringConverter x:Key="BytesToStringConverter" />
-    </UserControl.Resources>
-    <Grid ColumnDefinitions="300,*" RowDefinitions="Auto,*">
+             x:DataType="layout:LayoutDetailsViewModel">
+    <Grid ColumnDefinitions="300,*, 300" RowDefinitions="Auto,*">
         <StackPanel Grid.Row="1" Grid.Column="0" Margin="0 0 10 0" Spacing="10">
             <Border Classes="card" VerticalAlignment="Top">
-                <StackPanel>
-                    <Border CornerRadius="6"
-                            HorizontalAlignment="Left"
-                            Margin="0 0 10 0"
-                            Width="80"
-                            Height="80"
-                            ClipToBounds="True">
-                        <Image Stretch="UniformToFill" il:ImageLoader.Source="{CompiledBinding Entry.Id, Converter={StaticResource EntryIconUriConverter}, Mode=OneWay}" />
-                    </Border>
-
-                    <TextBlock Theme="{StaticResource TitleTextBlockStyle}"
-                               MaxLines="3"
-                               TextTrimming="CharacterEllipsis"
-                               Text="{CompiledBinding Entry.Name, FallbackValue=Title }" />
-
-                    <TextBlock Classes="subtitle" TextTrimming="CharacterEllipsis" Text="{CompiledBinding Entry.Author, FallbackValue=Author}" />
-
-                    <TextBlock Margin="0 8" TextWrapping="Wrap" Text="{CompiledBinding Entry.Summary, FallbackValue=Summary}" />
-
-                    <!-- Categories -->
-                    <ItemsControl ItemsSource="{CompiledBinding Entry.Categories}" Margin="0 0 -8 0">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <WrapPanel Orientation="Horizontal"></WrapPanel>
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal" Margin="0 0 8 0">
-                                    <avalonia:MaterialIcon Kind="{CompiledBinding Icon}" Margin="0 0 3 0"></avalonia:MaterialIcon>
-                                    <TextBlock Text="{CompiledBinding Name}" TextTrimming="CharacterEllipsis" />
-                                </StackPanel>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-
-                    <Border Classes="card-separator"></Border>
-
-                    <TextBlock Margin="0 0 0 8">
-                        <avalonia:MaterialIcon Kind="Downloads" />
-                        <Run Classes="h5" Text="{CompiledBinding Entry.Downloads, FallbackValue=0}" />
-                        <Run>downloads</Run>
-                    </TextBlock>
-
-                    <TextBlock Classes="subtitle"
-                               ToolTip.Tip="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}}">
-                        <avalonia:MaterialIcon Kind="Calendar" />
-                        <Run>Created</Run>
-                        <Run Text="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
-                    </TextBlock>
-                    <TextBlock Classes="subtitle"
-                               ToolTip.Tip="{CompiledBinding UpdatedAt, Converter={StaticResource DateTimeConverter}}">
-                        <avalonia:MaterialIcon Kind="Update" />
-                        <Run>Updated</Run>
-                        <Run Text="{CompiledBinding UpdatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
-                    </TextBlock>
-                </StackPanel>
+                <ContentControl Content="{CompiledBinding EntryInfoViewModel}" />
             </Border>
-
             <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.LatestRelease, Converter={x:Static ObjectConverters.IsNotNull}}">
-                <StackPanel>
-                    <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Latest release</TextBlock>
-                    <Border Classes="card-separator" />
-                    <Button HorizontalAlignment="Stretch"
-                            HorizontalContentAlignment="Stretch"
-                            Command="{CompiledBinding DownloadLatestRelease}">
-                        <Grid ColumnDefinitions="Auto,*">
-                            <!-- Icon -->
-                            <Border Grid.Column="0"
-                                    CornerRadius="4"
-                                    Background="{StaticResource SystemAccentColor}"
-                                    VerticalAlignment="Center"
-                                    Margin="0 6"
-                                    Width="50"
-                                    Height="50"
-                                    ClipToBounds="True">
-                                <avalonia:MaterialIcon Kind="Download"></avalonia:MaterialIcon>
-                            </Border>
-
-                            <!-- Body -->
-                            <StackPanel Grid.Column="1" Margin="10 0" VerticalAlignment="Center">
-                                <TextBlock Text="{CompiledBinding Entry.LatestRelease.Version, FallbackValue=Version}"></TextBlock>
-                                <TextBlock Classes="subtitle">
-                                    <avalonia:MaterialIcon Kind="BoxOutline" />
-                                    <Run Text="{CompiledBinding Entry.LatestRelease.DownloadSize, Converter={StaticResource BytesToStringConverter}, Mode=OneWay}"></Run>
-                                </TextBlock>
-                                <TextBlock Classes="subtitle"
-                                           ToolTip.Tip="{CompiledBinding Entry.LatestRelease.CreatedAt, Converter={StaticResource DateTimeConverter}}">
-                                    <avalonia:MaterialIcon Kind="Calendar" />
-                                    <Run>Created</Run>
-                                    <Run Text="{CompiledBinding Entry.LatestRelease.CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
-                                </TextBlock>
-                            </StackPanel>
-                        </Grid>
-                    </Button>
-                </StackPanel>
+                <ContentControl Content="{CompiledBinding EntryReleasesViewModel}" />
             </Border>
         </StackPanel>
 
-
         <Border Classes="card" Grid.Row="1" Grid.Column="1">
             <mdxaml:MarkdownScrollViewer Markdown="{CompiledBinding Entry.Description}" MarkdownStyleName="FluentAvalonia">
                 <mdxaml:MarkdownScrollViewer.Styles>
                     <StyleInclude Source="/Styles/Markdown.axaml" />
                 </mdxaml:MarkdownScrollViewer.Styles>
             </mdxaml:MarkdownScrollViewer>
-
         </Border>
+
+        <StackPanel Grid.Row="1" Grid.Column="2" IsVisible="{CompiledBinding Entry.Images.Count}">
+            <ContentControl Content="{CompiledBinding EntryImagesViewModel}" />
+        </StackPanel>
     </Grid>
 </UserControl>

src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs

@@ -1,17 +1,11 @@
 using System;
-using System.Reactive;
-using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Artemis.Core;
+using Artemis.UI.Screens.Workshop.Entries.Details;
 using Artemis.UI.Screens.Workshop.Parameters;
 using Artemis.UI.Shared.Routing;
-using Artemis.UI.Shared.Services;
-using Artemis.UI.Shared.Services.Builders;
-using Artemis.UI.Shared.Utilities;
 using Artemis.WebClient.Workshop;
 using PropertyChanged.SourceGenerator;
-using ReactiveUI;
 using StrawberryShake;
 
 namespace Artemis.UI.Screens.Workshop.Layout;
@@ -19,25 +13,25 @@ namespace Artemis.UI.Screens.Workshop.Layout;
 public partial class LayoutDetailsViewModel : RoutableScreen<WorkshopDetailParameters>
 {
     private readonly IWorkshopClient _client;
-    private readonly INotificationService _notificationService;
-    private readonly IWindowService _windowService;
-    private readonly ObservableAsPropertyHelper<DateTimeOffset?> _updatedAt;
-    [Notify(Setter.Private)] private IGetEntryById_Entry? _entry;
+    private readonly Func<IGetEntryById_Entry, EntryInfoViewModel> _getEntryInfoViewModel;
+    private readonly Func<IGetEntryById_Entry, EntryReleasesViewModel> _getEntryReleasesViewModel;
+    private readonly Func<IGetEntryById_Entry, EntryImagesViewModel> _getEntryImagesViewModel;
+    [Notify] private IGetEntryById_Entry? _entry;
+    [Notify] private EntryInfoViewModel? _entryInfoViewModel;
+    [Notify] private EntryReleasesViewModel? _entryReleasesViewModel;
+    [Notify] private EntryImagesViewModel? _entryImagesViewModel;
 
-    public LayoutDetailsViewModel(IWorkshopClient client, INotificationService notificationService, IWindowService windowService)
+    public LayoutDetailsViewModel(IWorkshopClient client,
+        Func<IGetEntryById_Entry, EntryInfoViewModel> getEntryInfoViewModel,
+        Func<IGetEntryById_Entry, EntryReleasesViewModel> getEntryReleasesViewModel,
+        Func<IGetEntryById_Entry, EntryImagesViewModel> getEntryImagesViewModel)
     {
         _client = client;
-        _notificationService = notificationService;
-        _windowService = windowService;
-        _updatedAt = this.WhenAnyValue(vm => vm.Entry).Select(e => e?.LatestRelease?.CreatedAt ?? e?.CreatedAt).ToProperty(this, vm => vm.UpdatedAt);
-
-        DownloadLatestRelease = ReactiveCommand.CreateFromTask(ExecuteDownloadLatestRelease);
+        _getEntryInfoViewModel = getEntryInfoViewModel;
+        _getEntryReleasesViewModel = getEntryReleasesViewModel;
+        _getEntryImagesViewModel = getEntryImagesViewModel;
     }
 
-    public ReactiveCommand<Unit, Unit> DownloadLatestRelease { get; }
-
-    public DateTimeOffset? UpdatedAt => _updatedAt.Value;
-
     public override async Task OnNavigating(WorkshopDetailParameters parameters, NavigationArguments args, CancellationToken cancellationToken)
     {
         await GetEntry(parameters.EntryId, cancellationToken);
@@ -50,10 +44,16 @@ public partial class LayoutDetailsViewModel : RoutableScreen<WorkshopDetailParam
             return;
 
         Entry = result.Data?.Entry;
-    }
-
-    private Task ExecuteDownloadLatestRelease(CancellationToken cancellationToken)
-    {
-        return Task.CompletedTask;
+        if (Entry == null)
+        {
+            EntryInfoViewModel = null;
+            EntryReleasesViewModel = null;
+        }
+        else
+        {
+            EntryInfoViewModel = _getEntryInfoViewModel(Entry);
+            EntryReleasesViewModel = _getEntryReleasesViewModel(Entry);
+            EntryImagesViewModel = _getEntryImagesViewModel(Entry);
+        }
     }
 }

src/Artemis.UI/Screens/Workshop/Layout/LayoutInfoView.axaml

@@ -26,8 +26,9 @@
         <Button Grid.Row="1"
                 Grid.Column="0"
                 Grid.ColumnSpan="2"
+                Margin="0 25 0 0"
                 HorizontalAlignment="Right"
-                VerticalAlignment="Bottom"
+                VerticalAlignment="Top"
                 Classes="AppBarButton"
                 Command="{CompiledBinding BrowseDeviceProvider}"
                 ToolTip.Tip="Browse">

src/Artemis.UI/Screens/Workshop/Layout/LayoutInfoViewModel.cs

@@ -51,6 +51,7 @@ public partial class LayoutInfoViewModel : ValidatableViewModelBase
         this.ValidationRule(vm => vm.Vendor, input => !string.IsNullOrWhiteSpace(input), "Device vendor is required");
         this.ValidationRule(vm => vm.DeviceProviderIdInput, input => Guid.TryParse(input, out _), "Must be a valid GUID formatted as: 00000000-0000-0000-0000-000000000000");
         this.ValidationRule(vm => vm.DeviceProviderIdInput, input => !string.IsNullOrWhiteSpace(input), "Device provider ID is required");
+        this.ValidationRule(vm => vm.DeviceProviderIdInput, input => input != "00000000-0000-0000-0000-000000000000", "Device provider ID is required");
     }
 
     public string? DeviceProviders => _deviceProviders.Value;

src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailViewModel.cs

@@ -21,6 +21,7 @@ using Avalonia.Media.Imaging;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 using StrawberryShake;
+using EntrySpecificationsViewModel = Artemis.UI.Screens.Workshop.Entries.Details.EntrySpecificationsViewModel;
 
 namespace Artemis.UI.Screens.Workshop.Library;
 

src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml

@@ -3,141 +3,30 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:profile="clr-namespace:Artemis.UI.Screens.Workshop.Profile"
-             xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:il="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
-             xmlns:converters="clr-namespace:Artemis.UI.Converters"
              xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
-             xmlns:mdsvg="https://github.com/whistyun/Markdown.Avalonia.Svg"
-             xmlns:ui="clr-namespace:Artemis.UI"
-             xmlns:converters1="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
              x:Class="Artemis.UI.Screens.Workshop.Profile.ProfileDetailsView"
              x:DataType="profile:ProfileDetailsViewModel">
-    <UserControl.Resources>
-        <converters:EntryIconUriConverter x:Key="EntryIconUriConverter" />
-        <converters:DateTimeConverter x:Key="DateTimeConverter" />
-        <converters1:BytesToStringConverter x:Key="BytesToStringConverter" />
-    </UserControl.Resources>
-    <Grid ColumnDefinitions="300,*" RowDefinitions="Auto,*">
+    <Grid ColumnDefinitions="300,*, 300" RowDefinitions="Auto,*">
         <StackPanel Grid.Row="1" Grid.Column="0" Margin="0 0 10 0" Spacing="10">
             <Border Classes="card" VerticalAlignment="Top">
-                <StackPanel>
-                    <Panel>
-                        <Border CornerRadius="6"
-                                HorizontalAlignment="Left"
-                                Margin="0 0 10 0"
-                                Width="80"
-                                Height="80"
-                                ClipToBounds="True">
-                            <Image Stretch="UniformToFill" il:ImageLoader.Source="{CompiledBinding Entry.Id, Converter={StaticResource EntryIconUriConverter}, Mode=OneWay}" />
-                        </Border>
-                        <Button Classes="icon-button" 
-                                VerticalAlignment="Top" 
-                                HorizontalAlignment="Right"
-                                Command="{CompiledBinding CopyShareLink}"
-                                ToolTip.Tip="Copy share link">
-                            <avalonia:MaterialIcon Kind="ShareVariant"/>
-                        </Button>
-                    </Panel>
-                    
-
-                    <TextBlock Theme="{StaticResource TitleTextBlockStyle}"
-                               MaxLines="3"
-                               TextTrimming="CharacterEllipsis"
-                               Text="{CompiledBinding Entry.Name, FallbackValue=Title }" />
-
-                    <TextBlock Classes="subtitle" TextTrimming="CharacterEllipsis" Text="{CompiledBinding Entry.Author, FallbackValue=Author}" />
-
-                    <TextBlock Margin="0 8" TextWrapping="Wrap" Text="{CompiledBinding Entry.Summary, FallbackValue=Summary}" />
-
-                    <!-- Categories -->
-                    <ItemsControl ItemsSource="{CompiledBinding Entry.Categories}" Margin="0 0 -8 0">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <WrapPanel Orientation="Horizontal"></WrapPanel>
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal" Margin="0 0 8 0">
-                                    <avalonia:MaterialIcon Kind="{CompiledBinding Icon}" Margin="0 0 3 0"></avalonia:MaterialIcon>
-                                    <TextBlock Text="{CompiledBinding Name}" TextTrimming="CharacterEllipsis" />
-                                </StackPanel>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-
-                    <Border Classes="card-separator"></Border>
-
-                    <TextBlock Margin="0 0 0 8">
-                        <avalonia:MaterialIcon Kind="Downloads" />
-                        <Run Classes="h5" Text="{CompiledBinding Entry.Downloads, FallbackValue=0}" />
-                        <Run>downloads</Run>
-                    </TextBlock>
-
-                    <TextBlock Classes="subtitle"
-                               ToolTip.Tip="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}}">
-                        <avalonia:MaterialIcon Kind="Calendar" />
-                        <Run>Created</Run>
-                        <Run Text="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
-                    </TextBlock>
-                    <TextBlock Classes="subtitle"
-                               ToolTip.Tip="{CompiledBinding UpdatedAt, Converter={StaticResource DateTimeConverter}}">
-                        <avalonia:MaterialIcon Kind="Update" />
-                        <Run>Updated</Run>
-                        <Run Text="{CompiledBinding UpdatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
-                    </TextBlock>
-                </StackPanel>
+                <ContentControl Content="{CompiledBinding EntryInfoViewModel}" />
             </Border>
-
             <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.LatestRelease, Converter={x:Static ObjectConverters.IsNotNull}}">
-                <StackPanel>
-                    <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Latest release</TextBlock>
-                    <Border Classes="card-separator" />
-                    <Button HorizontalAlignment="Stretch"
-                            HorizontalContentAlignment="Stretch"
-                            Command="{CompiledBinding DownloadLatestRelease}">
-                        <Grid ColumnDefinitions="Auto,*">
-                            <!-- Icon -->
-                            <Border Grid.Column="0"
-                                    CornerRadius="4"
-                                    Background="{StaticResource SystemAccentColor}"
-                                    VerticalAlignment="Center"
-                                    Margin="0 6"
-                                    Width="50"
-                                    Height="50"
-                                    ClipToBounds="True">
-                                <avalonia:MaterialIcon Kind="Download"></avalonia:MaterialIcon>
-                            </Border>
-
-                            <!-- Body -->
-                            <StackPanel Grid.Column="1" Margin="10 0" VerticalAlignment="Center">
-                                <TextBlock Text="{CompiledBinding Entry.LatestRelease.Version, FallbackValue=Version}"></TextBlock>
-                                <TextBlock Classes="subtitle">
-                                    <avalonia:MaterialIcon Kind="BoxOutline" />
-                                    <Run Text="{CompiledBinding Entry.LatestRelease.DownloadSize, Converter={StaticResource BytesToStringConverter}, Mode=OneWay}"></Run>
-                                </TextBlock>
-                                <TextBlock Classes="subtitle"
-                                           ToolTip.Tip="{CompiledBinding Entry.LatestRelease.CreatedAt, Converter={StaticResource DateTimeConverter}}">
-                                    <avalonia:MaterialIcon Kind="Calendar" />
-                                    <Run>Created</Run>
-                                    <Run Text="{CompiledBinding Entry.LatestRelease.CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
-                                </TextBlock>
-                            </StackPanel>
-                        </Grid>
-                    </Button>
-                </StackPanel>
+                <ContentControl Content="{CompiledBinding EntryReleasesViewModel}" />
             </Border>
         </StackPanel>
 
-
         <Border Classes="card" Grid.Row="1" Grid.Column="1">
             <mdxaml:MarkdownScrollViewer Markdown="{CompiledBinding Entry.Description}" MarkdownStyleName="FluentAvalonia">
                 <mdxaml:MarkdownScrollViewer.Styles>
                     <StyleInclude Source="/Styles/Markdown.axaml" />
                 </mdxaml:MarkdownScrollViewer.Styles>
             </mdxaml:MarkdownScrollViewer>
-
         </Border>
+
+        <StackPanel Grid.Row="1" Grid.Column="2" IsVisible="{CompiledBinding Entry.Images.Count}">
+            <ContentControl Content="{CompiledBinding EntryImagesViewModel}" />
+        </StackPanel>
     </Grid>
 </UserControl>

src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsViewModel.cs

@@ -1,18 +1,11 @@
 using System;
-using System.Reactive;
-using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Artemis.Core;
+using Artemis.UI.Screens.Workshop.Entries.Details;
 using Artemis.UI.Screens.Workshop.Parameters;
 using Artemis.UI.Shared.Routing;
-using Artemis.UI.Shared.Services;
-using Artemis.UI.Shared.Services.Builders;
-using Artemis.UI.Shared.Utilities;
 using Artemis.WebClient.Workshop;
-using Artemis.WebClient.Workshop.Handlers.InstallationHandlers;
 using PropertyChanged.SourceGenerator;
-using ReactiveUI;
 using StrawberryShake;
 
 namespace Artemis.UI.Screens.Workshop.Profile;
@@ -20,30 +13,25 @@ namespace Artemis.UI.Screens.Workshop.Profile;
 public partial class ProfileDetailsViewModel : RoutableScreen<WorkshopDetailParameters>
 {
     private readonly IWorkshopClient _client;
-    private readonly ProfileEntryInstallationHandler _installationHandler;
-    private readonly INotificationService _notificationService;
-    private readonly ObservableAsPropertyHelper<DateTimeOffset?> _updatedAt;
-    private readonly IWindowService _windowService;
-    [Notify(Setter.Private)] private IGetEntryById_Entry? _entry;
+    private readonly Func<IGetEntryById_Entry, EntryInfoViewModel> _getEntryInfoViewModel;
+    private readonly Func<IGetEntryById_Entry, EntryReleasesViewModel> _getEntryReleasesViewModel;
+    private readonly Func<IGetEntryById_Entry, EntryImagesViewModel> _getEntryImagesViewModel;
+    [Notify] private IGetEntryById_Entry? _entry;
+    [Notify] private EntryInfoViewModel? _entryInfoViewModel;
+    [Notify] private EntryReleasesViewModel? _entryReleasesViewModel;
+    [Notify] private EntryImagesViewModel? _entryImagesViewModel;
 
-    public ProfileDetailsViewModel(IWorkshopClient client, ProfileEntryInstallationHandler installationHandler, INotificationService notificationService, IWindowService windowService)
+    public ProfileDetailsViewModel(IWorkshopClient client,
+        Func<IGetEntryById_Entry, EntryInfoViewModel> getEntryInfoViewModel,
+        Func<IGetEntryById_Entry, EntryReleasesViewModel> getEntryReleasesViewModel,
+        Func<IGetEntryById_Entry, EntryImagesViewModel> getEntryImagesViewModel)
     {
         _client = client;
-        _installationHandler = installationHandler;
-        _notificationService = notificationService;
-        _windowService = windowService;
-        _updatedAt = this.WhenAnyValue(vm => vm.Entry).Select(e => e?.LatestRelease?.CreatedAt ?? e?.CreatedAt).ToProperty(this, vm => vm.UpdatedAt);
-
-        DownloadLatestRelease = ReactiveCommand.CreateFromTask(ExecuteDownloadLatestRelease);
-        CopyShareLink = ReactiveCommand.CreateFromTask(ExecuteCopyShareLink);
+        _getEntryInfoViewModel = getEntryInfoViewModel;
+        _getEntryReleasesViewModel = getEntryReleasesViewModel;
+        _getEntryImagesViewModel = getEntryImagesViewModel;
     }
 
-    public ReactiveCommand<Unit, Unit> CopyShareLink { get; set; }
-
-    public ReactiveCommand<Unit, Unit> DownloadLatestRelease { get; }
-
-    public DateTimeOffset? UpdatedAt => _updatedAt.Value;
-    
     public override async Task OnNavigating(WorkshopDetailParameters parameters, NavigationArguments args, CancellationToken cancellationToken)
     {
         await GetEntry(parameters.EntryId, cancellationToken);
@@ -56,30 +44,16 @@ public partial class ProfileDetailsViewModel : RoutableScreen<WorkshopDetailPara
             return;
 
         Entry = result.Data?.Entry;
-    }
-
-    private async Task ExecuteDownloadLatestRelease(CancellationToken cancellationToken)
-    {
-        if (Entry?.LatestRelease == null)
-            return;
-
-        bool confirm = await _windowService.ShowConfirmContentDialog("Install profile?", "The profile will be downloaded and added to your sidebar automatically.");
-        if (!confirm)
-            return;
-
-        EntryInstallResult result = await _installationHandler.InstallAsync(Entry, Entry.LatestRelease.Id, new Progress<StreamProgress>(), cancellationToken);
-        if (result.IsSuccess)
-            _notificationService.CreateNotification().WithTitle("Profile installed").WithSeverity(NotificationSeverity.Success).Show();
-        else
-            _notificationService.CreateNotification().WithTitle("Failed to install profile").WithMessage(result.Message).WithSeverity(NotificationSeverity.Error).Show();
-    }
-
-    private async Task ExecuteCopyShareLink(CancellationToken arg)
-    {
         if (Entry == null)
-            return;
-
-        await Shared.UI.Clipboard.SetTextAsync($"{WorkshopConstants.WORKSHOP_URL}/entries/{Entry.Id}/{StringUtilities.UrlFriendly(Entry.Name)}");
-        _notificationService.CreateNotification().WithTitle("Copied share link to clipboard.").Show();
+        {
+            EntryInfoViewModel = null;
+            EntryReleasesViewModel = null;
+        }
+        else
+        {
+            EntryInfoViewModel = _getEntryInfoViewModel(Entry);
+            EntryReleasesViewModel = _getEntryReleasesViewModel(Entry);
+            EntryImagesViewModel = _getEntryImagesViewModel(Entry);
+        }
     }
 }

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Models/SubmissionWizardState.cs

@@ -33,7 +33,7 @@ public class SubmissionWizardState : IDisposable
 
     public List<long> Categories { get; set; } = new();
     public List<string> Tags { get; set; } = new();
-    public List<Stream> Images { get; set; } = new();
+    public List<ImageUploadRequest> Images { get; set; } = new();
 
     public IEntrySource? EntrySource { get; set; }
 
@@ -67,7 +67,7 @@ public class SubmissionWizardState : IDisposable
     public void Dispose()
     {
         Icon?.Dispose();
-        foreach (Stream stream in Images)
-            stream.Dispose();
+        foreach (ImageUploadRequest image in Images)
+            image.File.Dispose();
     }
 }

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ImagesStepViewModel.cs

@@ -7,6 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Artemis.UI.Screens.Workshop.Image;
 using Artemis.UI.Shared.Services;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 using DynamicData;
 using ReactiveUI;
 
@@ -16,37 +17,39 @@ public class ImagesStepViewModel : SubmissionViewModel
 {
     private const long MAX_FILE_SIZE = 10 * 1024 * 1024; // 10 MB
     private readonly IWindowService _windowService;
-    private readonly SourceList<Stream> _imageStreams;
+    private readonly Func<ImageUploadRequest, ImageSubmissionViewModel> _getImageSubmissionViewModel;
+    private readonly SourceList<ImageUploadRequest> _stateImages;
 
-    public ImagesStepViewModel(IWindowService windowService, Func<Stream, ImageSubmissionViewModel> imageSubmissionViewModel)
+    public ImagesStepViewModel(IWindowService windowService, Func<ImageUploadRequest, ImageSubmissionViewModel> getImageSubmissionViewModel)
     {
         _windowService = windowService;
+        _getImageSubmissionViewModel = getImageSubmissionViewModel;
 
         Continue = ReactiveCommand.Create(() => State.ChangeScreen<UploadStepViewModel>());
         GoBack = ReactiveCommand.Create(() => State.ChangeScreen<SpecificationsStepViewModel>());
         Secondary = ReactiveCommand.CreateFromTask(ExecuteAddImage);
         SecondaryText = "Add image";
 
-        _imageStreams = new SourceList<Stream>();
-        _imageStreams.Connect()
-            .Transform(p => CreateImageSubmissionViewModel(imageSubmissionViewModel, p))
+        _stateImages = new SourceList<ImageUploadRequest>();
+        _stateImages.Connect()
+            .Transform(p => CreateImageSubmissionViewModel(p))
             .Bind(out ReadOnlyObservableCollection<ImageSubmissionViewModel> images)
             .Subscribe();
         Images = images;
 
         this.WhenActivated((CompositeDisposable d) =>
         {
-            _imageStreams.Clear();
-            _imageStreams.AddRange(State.Images);
+            _stateImages.Clear();
+            _stateImages.AddRange(State.Images);
         });
     }
 
     public ReadOnlyObservableCollection<ImageSubmissionViewModel> Images { get; }
 
-    private ImageSubmissionViewModel CreateImageSubmissionViewModel(Func<Stream, ImageSubmissionViewModel> imageSubmissionViewModel, Stream stream)
+    private ImageSubmissionViewModel CreateImageSubmissionViewModel(ImageUploadRequest image)
     {
-        ImageSubmissionViewModel viewModel = imageSubmissionViewModel(stream);
-        viewModel.Remove = ReactiveCommand.Create(() => _imageStreams.Remove(stream));
+        ImageSubmissionViewModel viewModel = _getImageSubmissionViewModel(image);
+        viewModel.Remove = ReactiveCommand.Create(() => _stateImages.Remove(image));
         return viewModel;
     }
 
@@ -58,7 +61,7 @@ public class ImagesStepViewModel : SubmissionViewModel
 
         foreach (string path in result)
         {
-            if (_imageStreams.Items.Any(i => i is FileStream fs && fs.Name == path))
+            if (_stateImages.Items.Any(i => i.File is FileStream fs && fs.Name == path))
                 continue;
 
             FileStream stream = new(path, FileMode.Open, FileAccess.Read);
@@ -69,8 +72,9 @@ public class ImagesStepViewModel : SubmissionViewModel
                 continue;
             }
 
-            _imageStreams.Add(stream);
-            State.Images.Add(stream);
+            ImageUploadRequest request = new(stream, Path.GetFileName(path), string.Empty);
+            _stateImages.Add(request);
+            State.Images.Add(request);
         }
     }
 }

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutSelectionStepViewModel.cs

@@ -166,14 +166,14 @@ public partial class LayoutSelectionStepViewModel : SubmissionViewModel
         }
 
         State.Icon?.Dispose();
-        foreach (Stream stateImage in State.Images)
-            stateImage.Dispose();
+        foreach (ImageUploadRequest stateImage in State.Images)
+            stateImage.File.Dispose();
         State.Images.Clear();
 
         // Go through the hassle of resizing the image to 128x128 without losing aspect ratio, padding is added for this
         State.Icon = ResizeImage(deviceWithoutLeds, 128);
-        State.Images.Add(deviceWithoutLeds);
-        State.Images.Add(deviceWithLeds);
+        State.Images.Add(new ImageUploadRequest(deviceWithoutLeds, "Layout preview (no LEDs)", "A preview of the device without its LEDs"));
+        State.Images.Add(new ImageUploadRequest(deviceWithLeds, "Layout preview (with LEDs)", "A preview of the device with its LEDs"));
     }
 
     private Stream ResizeImage(Stream image, int size)

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepViewModel.cs

@@ -11,6 +11,7 @@ using Artemis.WebClient.Workshop;
 using DynamicData;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
+using EntrySpecificationsViewModel = Artemis.UI.Screens.Workshop.Entries.Details.EntrySpecificationsViewModel;
 
 namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps;
 

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs

@@ -133,12 +133,12 @@ public partial class UploadStepViewModel : SubmissionViewModel
             return null;
         }
         
-        foreach (Stream image in State.Images.ToList())
+        foreach (ImageUploadRequest image in State.Images.ToList())
         {
             // Upload image
             try
             {
-                ImageUploadResult imageUploadResult = await _workshopService.UploadEntryImage(entryId.Value, _progress, image, cancellationToken);
+                ImageUploadResult imageUploadResult = await _workshopService.UploadEntryImage(entryId.Value, image, _progress, cancellationToken);
                 if (!imageUploadResult.IsSuccess)
                     throw new ArtemisWorkshopException(imageUploadResult.Message);
                 State.Images.Remove(image);