Core - Prevent double-shutdowns which can cause crashes

Storage - Make the DbContext factory thread safe Workshop - Replaced pagination with infinite scroll Workshop - Added supported platforms and admin requirements to plugin details page
2026-11-12 11:56:30 +00:00 · 2024-03-21 20:12:40 +01:00
1 parent 7e981a61d3
commit da3d47d7b8
@@ -24,9 +24,9 @@ public partial class EntriesViewModel : RoutableHostScreen<RoutableScreen>

        Tabs = new ObservableCollection<RouteViewModel>
        {
-            new("Profiles", "workshop/entries/profiles/1", "workshop/entries/profiles"),
-            new("Layouts", "workshop/entries/layouts/1", "workshop/entries/layouts"),
-            new("Plugins", "workshop/entries/plugins/1", "workshop/entries/plugins"),
+            new("Profiles", "workshop/entries/profiles", "workshop/entries/profiles"),
+            new("Layouts", "workshop/entries/layouts", "workshop/entries/layouts"),
+            new("Plugins", "workshop/entries/plugins", "workshop/entries/plugins"),
        };

        this.WhenActivated(d =>
@@ -2,8 +2,6 @@
             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: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.List.EntryListInputView"
@@ -25,15 +23,6 @@
                <ComboBoxItem>Download count</ComboBoxItem>
            </ComboBox>
        </StackPanel>
-        <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="5">
-            <TextBlock VerticalAlignment="Center">Show per page</TextBlock>
-            <ComboBox Width="65" SelectedItem="{CompiledBinding EntriesPerPage}">
-                <system:Int32>10</system:Int32>
-                <system:Int32>20</system:Int32>
-                <system:Int32>50</system:Int32>
-                <system:Int32>100</system:Int32>
-            </ComboBox>
-        </StackPanel>
        <TextBlock Grid.Column="3" VerticalAlignment="Center" Margin="5 0 0 0" MinWidth="75" TextAlignment="Right">
            <Run Text="{CompiledBinding TotalCount}"/>
            <Run Text="total"/>
@@ -9,7 +9,6 @@ namespace Artemis.UI.Screens.Workshop.Entries.List;
 public partial class EntryListInputViewModel : ViewModelBase
 {
    private static string? _lastSearch;
-    private readonly PluginSetting<int> _entriesPerPage;
    private readonly PluginSetting<int> _sortBy;
    private string? _search;
    [Notify] private string _searchWatermark = "Search";
@@ -18,9 +17,7 @@ public partial class EntryListInputViewModel : ViewModelBase
    public EntryListInputViewModel(ISettingsService settingsService)
    {
        _search = _lastSearch;
-        _entriesPerPage = settingsService.GetSetting("Workshop.EntriesPerPage", 10);
        _sortBy = settingsService.GetSetting("Workshop.SortBy", 10);
-        _entriesPerPage.AutoSave = true;
        _sortBy.AutoSave = true;
    }
    
@@ -33,17 +30,7 @@ public partial class EntryListInputViewModel : ViewModelBase
            _lastSearch = value;
        }
    }
-
-    public int EntriesPerPage
-    {
-        get => _entriesPerPage.Value;
-        set
-        {
-            _entriesPerPage.Value = value;
-            this.RaisePropertyChanged();
-        }
-    }
-
+    
    public int SortBy
    {
        get => _sortBy.Value;
@@ -1,17 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Artemis.UI.Screens.Workshop.Categories;
-using Artemis.UI.Screens.Workshop.Parameters;
 using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
 using Artemis.WebClient.Workshop;
-using Avalonia.Threading;
 using DynamicData;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
@@ -19,21 +18,20 @@ using StrawberryShake;

 namespace Artemis.UI.Screens.Workshop.Entries.List;

-public abstract partial class EntryListViewModel : RoutableScreen<WorkshopListParameters>
+public abstract partial class EntryListViewModel : RoutableHostScreen<RoutableScreen>
 {
    private readonly SourceList<IEntrySummary> _entries = new();
-    private readonly ObservableAsPropertyHelper<bool> _isLoading;
    private readonly INotificationService _notificationService;
-    private readonly string _route;
-    private readonly ObservableAsPropertyHelper<bool> _showPagination;
    private readonly IWorkshopClient _workshopClient;
-    [Notify] private int _page;
-    [Notify] private int _loadedPage = -1;
-    [Notify] private int _totalPages = 1;
+    private readonly string _route;
+    private IGetEntriesv2_EntriesV2_PageInfo? _currentPageInfo;
+
+    [Notify] private bool _initializing = true;
+    [Notify] private bool _fetchingMore;
+    [Notify] private int _entriesPerFetch;

    protected EntryListViewModel(string route,
        IWorkshopClient workshopClient,
-        IRouter router,
        CategoriesViewModel categoriesViewModel,
        EntryListInputViewModel entryListInputViewModel,
        INotificationService notificationService,
@@ -42,46 +40,37 @@ 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);

        CategoriesViewModel = categoriesViewModel;
        InputViewModel = entryListInputViewModel;

        _entries.Connect()
-            .ObserveOn(new AvaloniaSynchronizationContext(DispatcherPriority.SystemIdle))
            .Transform(getEntryListViewModel)
            .Bind(out ReadOnlyObservableCollection<EntryListItemViewModel> entries)
            .Subscribe();
        Entries = entries;

-        // Respond to page changes
-        this.WhenAnyValue<EntryListViewModel, int>(vm => vm.Page).Skip(1).Subscribe(p => Task.Run(() => router.Navigate($"{_route}/{p}")));
-
        this.WhenActivated(d =>
        {
            // Respond to filter query input changes
-            InputViewModel.WhenAnyValue(vm => vm.Search).Skip(1).Throttle(TimeSpan.FromMilliseconds(200)).Subscribe(_ => RefreshToStart()).DisposeWith(d);
-            InputViewModel.WhenAnyValue(vm => vm.SortBy, vm => vm.EntriesPerPage).Skip(1).Subscribe(_ => RefreshToStart()).DisposeWith(d);
-            CategoriesViewModel.WhenAnyValue(vm => vm.CategoryFilters).Skip(1).Subscribe(_ => RefreshToStart()).DisposeWith(d);
+            InputViewModel.WhenAnyValue(vm => vm.Search).Skip(1).Throttle(TimeSpan.FromMilliseconds(200)).Subscribe(_ => Reset()).DisposeWith(d);
+            CategoriesViewModel.WhenAnyValue(vm => vm.CategoryFilters).Skip(1).Subscribe(_ => Reset()).DisposeWith(d);
        });
    }

-    public bool ShowPagination => _showPagination.Value;
-    public bool IsLoading => _isLoading.Value;
-
    public CategoriesViewModel CategoriesViewModel { get; }
    public EntryListInputViewModel InputViewModel { get; }

    public ReadOnlyObservableCollection<EntryListItemViewModel> Entries { get; }
-    
-    public override async Task OnNavigating(WorkshopListParameters parameters, NavigationArguments args, CancellationToken cancellationToken)
-    {
-        Page = Math.Max(1, parameters.Page);

-        await Task.Delay(200, cancellationToken);
-        if (!cancellationToken.IsCancellationRequested)
-            await Query(cancellationToken);
+    public override async Task OnNavigating(NavigationArguments args, CancellationToken cancellationToken)
+    {
+        if (_entries.Count == 0)
+        {
+            await Task.Delay(250, cancellationToken);
+            await FetchMore(cancellationToken);
+            Initializing = false;
+        }
    }

    public override Task OnClosing(NavigationArguments args)
@@ -92,6 +81,43 @@ public abstract partial class EntryListViewModel : RoutableScreen<WorkshopListPa
        return base.OnClosing(args);
    }

+    public async Task FetchMore(CancellationToken cancellationToken)
+    {
+        if (FetchingMore || _currentPageInfo != null && !_currentPageInfo.HasNextPage)
+            return;
+
+        FetchingMore = true;
+
+        int entriesPerFetch = _entries.Count == 0 ? _entriesPerFetch * 2 : _entriesPerFetch;
+        string? search = string.IsNullOrWhiteSpace(InputViewModel.Search) ? null : InputViewModel.Search;
+        EntryFilterInput filter = GetFilter();
+        IReadOnlyList<EntrySortInput> sort = GetSort();
+
+        try
+        {
+            IOperationResult<IGetEntriesv2Result> entries = await _workshopClient.GetEntriesv2.ExecuteAsync(search, filter, sort, entriesPerFetch, _currentPageInfo?.EndCursor, cancellationToken);
+            entries.EnsureNoErrors();
+
+            _currentPageInfo = entries.Data?.EntriesV2?.PageInfo;
+            if (entries.Data?.EntriesV2?.Edges != null)
+                _entries.Edit(e => e.AddRange(entries.Data.EntriesV2.Edges.Select(edge => edge.Node)));
+
+            InputViewModel.TotalCount = entries.Data?.EntriesV2?.TotalCount ?? 0;
+        }
+        catch (Exception e)
+        {
+            _notificationService.CreateNotification()
+                .WithTitle("Failed to load entries")
+                .WithMessage(e.Message)
+                .WithSeverity(NotificationSeverity.Error)
+                .Show();
+        }
+
+        finally
+        {
+            FetchingMore = false;
+        }
+    }

    protected virtual EntryFilterInput GetFilter()
    {
@@ -117,59 +143,10 @@ public abstract partial class EntryListViewModel : RoutableScreen<WorkshopListPa
        };
    }

-    private void RefreshToStart()
+    private void Reset()
    {
-        // Reset to page one, will trigger a query
-        if (Page != 1)
-            Page = 1;
-        // If already at page one, force a query
-        else
-            Task.Run(() => Query(CancellationToken.None));
-    }
-
-    private async Task Query(CancellationToken cancellationToken)
-    {
-        try
-        {
-            string? search = string.IsNullOrWhiteSpace(InputViewModel.Search) ? null : InputViewModel.Search;
-            EntryFilterInput filter = GetFilter();
-            IReadOnlyList<EntrySortInput> sort = GetSort();
-            IOperationResult<IGetEntriesResult> entries = await _workshopClient.GetEntries.ExecuteAsync(
-                search,
-                filter,
-                InputViewModel.EntriesPerPage * (Page - 1),
-                InputViewModel.EntriesPerPage,
-                sort,
-                cancellationToken
-            );
-            entries.EnsureNoErrors();
-
-            if (entries.Data?.Entries?.Items != null)
-            {
-                TotalPages = (int) Math.Ceiling(entries.Data.Entries.TotalCount / (double) InputViewModel.EntriesPerPage);
-                InputViewModel.TotalCount = entries.Data.Entries.TotalCount;
-                _entries.Edit(e =>
-                {
-                    e.Clear();
-                    e.AddRange(entries.Data.Entries.Items);
-                });
-            }
-            else
-            {
-                TotalPages = 1;
-            }
-        }
-        catch (Exception e)
-        {
-            _notificationService.CreateNotification()
-                .WithTitle("Failed to load entries")
-                .WithMessage(e.Message)
-                .WithSeverity(NotificationSeverity.Error)
-                .Show();
-        }
-        finally
-        {
-            LoadedPage = Page;
-        }
+        _entries.Clear();
+        _currentPageInfo = null;
+        Task.Run(() => FetchMore(CancellationToken.None));
    }
 }
@@ -2,8 +2,9 @@
             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:pagination="clr-namespace:Artemis.UI.Shared.Pagination;assembly=Artemis.UI.Shared"
             xmlns:tabs="clr-namespace:Artemis.UI.Screens.Workshop.Entries.Tabs"
+             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+             xmlns:ui="clr-namespace:Artemis.UI"
             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
             x:Class="Artemis.UI.Screens.Workshop.Entries.Tabs.LayoutListView"
             x:DataType="tabs:LayoutListViewModel">
@@ -15,51 +16,52 @@
            </Style>
        </Styles>
    </UserControl.Styles>
-    <Grid ColumnDefinitions="300,*" RowDefinitions="Auto,*,Auto">
-        <StackPanel Grid.Column="0" Grid.RowSpan="3" Margin="0 0 10 0" VerticalAlignment="Top">
-            <Border Classes="card" VerticalAlignment="Stretch">
-                <StackPanel>
-                    <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Categories</TextBlock>
-                    <Border Classes="card-separator" />
-                    <ContentControl Content="{CompiledBinding CategoriesViewModel}"></ContentControl>
-                </StackPanel>
-            </Border>
-        </StackPanel>

-        <ProgressBar Grid.Column="1" Grid.Row="0" VerticalAlignment="Top" Margin="0 0 20 0" IsVisible="{CompiledBinding IsLoading}" IsIndeterminate="True" />
-        <ContentControl Grid.Column="1" Grid.Row="0" Margin="0 0 20 8" Content="{CompiledBinding InputViewModel}"/>
-       
-        <ScrollViewer Grid.Column="1" Grid.Row="1">
-            <ItemsControl ItemsSource="{CompiledBinding Entries}" Margin="0 0 20 0">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <ContentControl Content="{CompiledBinding}" Margin="0 0 0 5"></ContentControl>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </ScrollViewer>
-        
-        <Panel Grid.Column="1" Grid.Row="1" IsVisible="{CompiledBinding !IsLoading}">
-            <StackPanel IsVisible="{CompiledBinding !Entries.Count}" Margin="0 50 0 0" Classes="empty-state">
-                <TextBlock Theme="{StaticResource TitleTextBlockStyle}">Looks like your current filters gave no results</TextBlock>
-                <TextBlock>
-                    <Run>Modify or clear your filters to view other device layouts</Run>
-                </TextBlock>
-                <Lottie Path="/Assets/Animations/empty.json" RepeatCount="1" Width="350" Height="350"></Lottie>
+    <Panel>
+        <Grid ColumnDefinitions="300,*" RowDefinitions="Auto,*,Auto" IsVisible="{CompiledBinding Screen, Converter={x:Static ObjectConverters.IsNull}}">
+            <StackPanel Grid.Column="0" Grid.RowSpan="3" Margin="0 0 10 0" VerticalAlignment="Top">
+                <Border Classes="card" VerticalAlignment="Stretch">
+                    <StackPanel>
+                        <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Categories</TextBlock>
+                        <Border Classes="card-separator" />
+                        <ContentControl Content="{CompiledBinding CategoriesViewModel}"></ContentControl>
+                    </StackPanel>
+                </Border>
            </StackPanel>
-        </Panel>

-        <pagination:Pagination Grid.Column="1"
-                               Grid.Row="2"
-                               Margin="0 20 0 10"
-                               IsVisible="{CompiledBinding ShowPagination}"
-                               Value="{CompiledBinding Page}"
-                               Maximum="{CompiledBinding TotalPages}"
-                               HorizontalAlignment="Center" />
-    </Grid>
+            <ProgressBar Grid.Column="1" Grid.Row="0" VerticalAlignment="Top" Margin="0 0 20 0" IsVisible="{CompiledBinding FetchingMore}" IsIndeterminate="True" />
+            <ContentControl Grid.Column="1" Grid.Row="0" Margin="0 0 20 8" Content="{CompiledBinding InputViewModel}" />
+
+            <ScrollViewer Name="EntriesScrollViewer" Grid.Column="1" Grid.Row="1" ScrollChanged="ScrollViewer_OnScrollChanged">
+                <ItemsControl ItemsSource="{CompiledBinding Entries}" Margin="0 0 20 0">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <ContentControl Content="{CompiledBinding}" Margin="0 0 0 5"></ContentControl>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+
+            <Panel Grid.Column="1" Grid.Row="1" IsVisible="{CompiledBinding !Initializing}">
+                <StackPanel IsVisible="{CompiledBinding !Entries.Count}" Margin="0 50 0 0" Classes="empty-state">
+                    <TextBlock Theme="{StaticResource TitleTextBlockStyle}">Looks like your current filters gave no results</TextBlock>
+                    <TextBlock>
+                        <Run>Modify or clear your filters to view other device layouts</Run>
+                    </TextBlock>
+                    <Lottie Path="/Assets/Animations/empty.json" RepeatCount="1" Width="350" Height="350"></Lottie>
+                </StackPanel>
+            </Panel>
+        </Grid>
+        
+        <controls:Frame Name="RouterFrame" IsNavigationStackEnabled="False" CacheSize="0" IsVisible="{CompiledBinding Screen, Converter={x:Static ObjectConverters.IsNotNull}}">
+            <controls:Frame.NavigationPageFactory>
+                <ui:PageFactory />
+            </controls:Frame.NavigationPageFactory>
+        </controls:Frame>
+    </Panel>
 </UserControl>
@@ -1,4 +1,11 @@
+using System;
+using System.Reactive.Disposables;
+using System.Threading;
+using Artemis.UI.Shared.Routing;
+using Avalonia.Controls;
 using Avalonia.ReactiveUI;
+using Avalonia.Threading;
+using ReactiveUI;

 namespace Artemis.UI.Screens.Workshop.Entries.Tabs;

@@ -7,5 +14,30 @@ public partial class LayoutListView : ReactiveUserControl<LayoutListViewModel>
    public LayoutListView()
    {
        InitializeComponent();
+        EntriesScrollViewer.SizeChanged += (_, _) => UpdateEntriesPerFetch();
+
+        this.WhenActivated(d =>
+        {
+            UpdateEntriesPerFetch();
+            ViewModel.WhenAnyValue(vm => vm.Screen).WhereNotNull().Subscribe(Navigate).DisposeWith(d);
+        });
+    }
+
+    private void ScrollViewer_OnScrollChanged(object? sender, ScrollChangedEventArgs e)
+    {
+        // When near the bottom of EntriesScrollViewer, call FetchMore on the view model
+        if (EntriesScrollViewer.Offset.Y != 0 && EntriesScrollViewer.Extent.Height - (EntriesScrollViewer.Viewport.Height + EntriesScrollViewer.Offset.Y) < 100)
+            ViewModel?.FetchMore(CancellationToken.None);
+    }
+
+    private void Navigate(RoutableScreen viewModel)
+    {
+        Dispatcher.UIThread.Invoke(() => RouterFrame.NavigateFromObject(viewModel), DispatcherPriority.ApplicationIdle);
+    }
+
+    private void UpdateEntriesPerFetch()
+    {
+        if (ViewModel != null)
+            ViewModel.EntriesPerFetch = (int) (EntriesScrollViewer.Viewport.Height / 120);
    }
 }
@@ -10,12 +10,11 @@ namespace Artemis.UI.Screens.Workshop.Entries.Tabs;
 public class LayoutListViewModel : List.EntryListViewModel
 {
    public LayoutListViewModel(IWorkshopClient workshopClient,
-        IRouter router,
        CategoriesViewModel categoriesViewModel,
        EntryListInputViewModel entryListInputViewModel,
        INotificationService notificationService,
        Func<IEntrySummary, EntryListItemViewModel> getEntryListViewModel)
-        : base("workshop/entries/layouts", workshopClient, router, categoriesViewModel, entryListInputViewModel, notificationService, getEntryListViewModel)
+        : base("workshop/entries/layouts", workshopClient, categoriesViewModel, entryListInputViewModel, notificationService, getEntryListViewModel)
    {
        entryListInputViewModel.SearchWatermark = "Search layouts";
    }
@@ -3,11 +3,12 @@
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:tabs="clr-namespace:Artemis.UI.Screens.Workshop.Entries.Tabs"
-             xmlns:pagination="clr-namespace:Artemis.UI.Shared.Pagination;assembly=Artemis.UI.Shared"
+             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+             xmlns:ui="clr-namespace:Artemis.UI"
             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
             x:Class="Artemis.UI.Screens.Workshop.Entries.Tabs.PluginListView"
             x:DataType="tabs:PluginListViewModel">
-     <UserControl.Styles>
+    <UserControl.Styles>
        <Styles>
            <Style Selector="StackPanel.empty-state > TextBlock">
                <Setter Property="TextAlignment" Value="Center"></Setter>
@@ -15,51 +16,52 @@
            </Style>
        </Styles>
    </UserControl.Styles>
-    <Grid ColumnDefinitions="300,*" RowDefinitions="Auto,*,Auto">
-        <StackPanel Grid.Column="0" Grid.RowSpan="3" Margin="0 0 10 0" VerticalAlignment="Top">
-            <Border Classes="card" VerticalAlignment="Stretch">
-                <StackPanel>
-                    <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Categories</TextBlock>
-                    <Border Classes="card-separator" />
-                    <ContentControl Content="{CompiledBinding CategoriesViewModel}"></ContentControl>
-                </StackPanel>
-            </Border>
-        </StackPanel>
-
-        <ProgressBar Grid.Column="1" Grid.Row="0" VerticalAlignment="Top" Margin="0 0 20 0" IsVisible="{CompiledBinding IsLoading}" IsIndeterminate="True" />
-        <ContentControl Grid.Column="1" Grid.Row="0" Margin="0 0 20 8" Content="{CompiledBinding InputViewModel}"/>
-       
-        <ScrollViewer Grid.Column="1" Grid.Row="1">
-            <ItemsControl ItemsSource="{CompiledBinding Entries}" Margin="0 0 20 0">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <ContentControl Content="{CompiledBinding}" Margin="0 0 0 5"></ContentControl>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </ScrollViewer>
-        
-        <Panel Grid.Column="1" Grid.Row="1" IsVisible="{CompiledBinding !IsLoading}">
-            <StackPanel IsVisible="{CompiledBinding !Entries.Count}" Margin="0 50 0 0" Classes="empty-state">
-                <TextBlock Theme="{StaticResource TitleTextBlockStyle}">Looks like your current filters gave no results</TextBlock>
-                <TextBlock>
-                    <Run>Modify or clear your filters to view other plugins</Run>
-                </TextBlock>
-                <Lottie Path="/Assets/Animations/empty.json" RepeatCount="1" Width="350" Height="350"></Lottie>
+    
+    <Panel>
+        <Grid ColumnDefinitions="300,*" RowDefinitions="Auto,*,Auto" IsVisible="{CompiledBinding Screen, Converter={x:Static ObjectConverters.IsNull}}">
+            <StackPanel Grid.Column="0" Grid.RowSpan="3" Margin="0 0 10 0" VerticalAlignment="Top">
+                <Border Classes="card" VerticalAlignment="Stretch">
+                    <StackPanel>
+                        <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Categories</TextBlock>
+                        <Border Classes="card-separator" />
+                        <ContentControl Content="{CompiledBinding CategoriesViewModel}"></ContentControl>
+                    </StackPanel>
+                </Border>
            </StackPanel>
-        </Panel>

-        <pagination:Pagination Grid.Column="1"
-                               Grid.Row="2"
-                               Margin="0 20 0 10"
-                               IsVisible="{CompiledBinding ShowPagination}"
-                               Value="{CompiledBinding Page}"
-                               Maximum="{CompiledBinding TotalPages}"
-                               HorizontalAlignment="Center" />
-    </Grid>
-</UserControl>
+            <ProgressBar Grid.Column="1" Grid.Row="0" VerticalAlignment="Top" Margin="0 0 20 0" IsVisible="{CompiledBinding FetchingMore}" IsIndeterminate="True" />
+            <ContentControl Grid.Column="1" Grid.Row="0" Margin="0 0 20 8" Content="{CompiledBinding InputViewModel}" />
+
+            <ScrollViewer Name="EntriesScrollViewer" Grid.Column="1" Grid.Row="1" ScrollChanged="ScrollViewer_OnScrollChanged">
+                <ItemsControl ItemsSource="{CompiledBinding Entries}" Margin="0 0 20 0">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <ContentControl Content="{CompiledBinding}" Margin="0 0 0 5"></ContentControl>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+
+            <Panel Grid.Column="1" Grid.Row="1" IsVisible="{CompiledBinding !Initializing}">
+                <StackPanel IsVisible="{CompiledBinding !Entries.Count}" Margin="0 50 0 0" Classes="empty-state">
+                    <TextBlock Theme="{StaticResource TitleTextBlockStyle}">Looks like your current filters gave no results</TextBlock>
+                    <TextBlock>
+                        <Run>Modify or clear your filters to view other plugins</Run>
+                    </TextBlock>
+                    <Lottie Path="/Assets/Animations/empty.json" RepeatCount="1" Width="350" Height="350"></Lottie>
+                </StackPanel>
+            </Panel>
+        </Grid>
+        
+        <controls:Frame Name="RouterFrame" IsNavigationStackEnabled="False" CacheSize="0" IsVisible="{CompiledBinding Screen, Converter={x:Static ObjectConverters.IsNotNull}}">
+            <controls:Frame.NavigationPageFactory>
+                <ui:PageFactory />
+            </controls:Frame.NavigationPageFactory>
+        </controls:Frame>
+    </Panel>
+</UserControl>
@@ -1,7 +1,11 @@
-using Avalonia;
+using System;
+using System.Reactive.Disposables;
+using System.Threading;
+using Artemis.UI.Shared.Routing;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
+using Avalonia.Threading;
+using ReactiveUI;

 namespace Artemis.UI.Screens.Workshop.Entries.Tabs;

@@ -10,5 +14,30 @@ public partial class PluginListView : ReactiveUserControl<PluginListViewModel>
    public PluginListView()
    {
        InitializeComponent();
+        EntriesScrollViewer.SizeChanged += (_, _) => UpdateEntriesPerFetch();
+
+        this.WhenActivated(d =>
+        {
+            UpdateEntriesPerFetch();
+            ViewModel.WhenAnyValue(vm => vm.Screen).WhereNotNull().Subscribe(Navigate).DisposeWith(d); 
+        });
+    }
+
+    private void ScrollViewer_OnScrollChanged(object? sender, ScrollChangedEventArgs e)
+    {
+        // When near the bottom of EntriesScrollViewer, call FetchMore on the view model
+        if (EntriesScrollViewer.Offset.Y != 0 && EntriesScrollViewer.Extent.Height - (EntriesScrollViewer.Viewport.Height + EntriesScrollViewer.Offset.Y) < 100)
+            ViewModel?.FetchMore(CancellationToken.None);
+    }
+
+    private void Navigate(RoutableScreen viewModel)
+    {
+        Dispatcher.UIThread.Invoke(() => RouterFrame.NavigateFromObject(viewModel), DispatcherPriority.ApplicationIdle);
+    }
+
+    private void UpdateEntriesPerFetch()
+    {
+        if (ViewModel != null)
+            ViewModel.EntriesPerFetch = (int) (EntriesScrollViewer.Viewport.Height / 120);
    }
 }
@@ -10,12 +10,11 @@ namespace Artemis.UI.Screens.Workshop.Entries.Tabs;
 public class PluginListViewModel : EntryListViewModel
 {
    public PluginListViewModel(IWorkshopClient workshopClient,
-        IRouter router,
        CategoriesViewModel categoriesViewModel,
        EntryListInputViewModel entryListInputViewModel,
        INotificationService notificationService,
        Func<IEntrySummary, EntryListItemViewModel> getEntryListViewModel)
-        : base("workshop/entries/plugins", workshopClient, router, categoriesViewModel, entryListInputViewModel, notificationService, getEntryListViewModel)
+        : base("workshop/entries/plugins", workshopClient, categoriesViewModel, entryListInputViewModel, notificationService, getEntryListViewModel)
    {
        entryListInputViewModel.SearchWatermark = "Search plugins";
    }
@@ -2,9 +2,10 @@
             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:pagination="clr-namespace:Artemis.UI.Shared.Pagination;assembly=Artemis.UI.Shared"
             xmlns:tabs="clr-namespace:Artemis.UI.Screens.Workshop.Entries.Tabs"
-             mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="450"
+             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+             xmlns:ui="clr-namespace:Artemis.UI"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
             x:Class="Artemis.UI.Screens.Workshop.Entries.Tabs.ProfileListView"
             x:DataType="tabs:ProfileListViewModel">
    <UserControl.Styles>
@@ -15,51 +16,52 @@
            </Style>
        </Styles>
    </UserControl.Styles>
-    <Grid ColumnDefinitions="300,*" RowDefinitions="Auto,*,Auto">
-        <StackPanel Grid.Column="0" Grid.RowSpan="3" Margin="0 0 10 0" VerticalAlignment="Top">
-            <Border Classes="card" VerticalAlignment="Stretch">
-                <StackPanel>
-                    <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Categories</TextBlock>
-                    <Border Classes="card-separator" />
-                    <ContentControl Content="{CompiledBinding CategoriesViewModel}"></ContentControl>
-                </StackPanel>
-            </Border>
-        </StackPanel>

-        <ProgressBar Grid.Column="1" Grid.Row="0" VerticalAlignment="Top" Margin="0 0 20 0" IsVisible="{CompiledBinding IsLoading}" IsIndeterminate="True" />
-        <ContentControl Grid.Column="1" Grid.Row="0" Margin="0 0 20 8" Content="{CompiledBinding InputViewModel}"/>
-       
-        <ScrollViewer Grid.Column="1" Grid.Row="1">
-            <ItemsControl ItemsSource="{CompiledBinding Entries}" Margin="0 0 20 0">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <ContentControl Content="{CompiledBinding}" Margin="0 0 0 5"></ContentControl>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </ScrollViewer>
-        
-        <Panel Grid.Column="1" Grid.Row="1" IsVisible="{CompiledBinding !IsLoading}">
-            <StackPanel IsVisible="{CompiledBinding !Entries.Count}" Margin="0 50 0 0" Classes="empty-state">
-                <TextBlock Theme="{StaticResource TitleTextBlockStyle}">Looks like your current filters gave no results</TextBlock>
-                <TextBlock>
-                    <Run>Modify or clear your filters to view some awesome profiles</Run>
-                </TextBlock>
-                <Lottie Path="/Assets/Animations/empty.json" RepeatCount="1" Width="350" Height="350"></Lottie>
+    <Panel>
+        <Grid ColumnDefinitions="300,*" RowDefinitions="Auto,*,Auto" IsVisible="{CompiledBinding Screen, Converter={x:Static ObjectConverters.IsNull}}">
+            <StackPanel Grid.Column="0" Grid.RowSpan="3" Margin="0 0 10 0" VerticalAlignment="Top">
+                <Border Classes="card" VerticalAlignment="Stretch">
+                    <StackPanel>
+                        <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Categories</TextBlock>
+                        <Border Classes="card-separator" />
+                        <ContentControl Content="{CompiledBinding CategoriesViewModel}"></ContentControl>
+                    </StackPanel>
+                </Border>
            </StackPanel>
-        </Panel>

-        <pagination:Pagination Grid.Column="1"
-                               Grid.Row="2"
-                               Margin="0 20 0 10"
-                               IsVisible="{CompiledBinding ShowPagination}"
-                               Value="{CompiledBinding Page}"
-                               Maximum="{CompiledBinding TotalPages}"
-                               HorizontalAlignment="Center" />
-    </Grid>
+            <ProgressBar Grid.Column="1" Grid.Row="0" VerticalAlignment="Top" Margin="0 0 20 0" IsVisible="{CompiledBinding FetchingMore}" IsIndeterminate="True" />
+            <ContentControl Grid.Column="1" Grid.Row="0" Margin="0 0 20 8" Content="{CompiledBinding InputViewModel}" />
+
+            <ScrollViewer Name="EntriesScrollViewer" Grid.Column="1" Grid.Row="1" ScrollChanged="ScrollViewer_OnScrollChanged">
+                <ItemsControl ItemsSource="{CompiledBinding Entries}" Margin="0 0 20 0">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <ContentControl Content="{CompiledBinding}" Margin="0 0 0 5"></ContentControl>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+
+            <Panel Grid.Column="1" Grid.Row="1" IsVisible="{CompiledBinding !Initializing}">
+                <StackPanel IsVisible="{CompiledBinding !Entries.Count}" Margin="0 50 0 0" Classes="empty-state">
+                    <TextBlock Theme="{StaticResource TitleTextBlockStyle}">Looks like your current filters gave no results</TextBlock>
+                    <TextBlock>
+                        <Run>Modify or clear your filters to view some awesome profiles</Run>
+                    </TextBlock>
+                    <Lottie Path="/Assets/Animations/empty.json" RepeatCount="1" Width="350" Height="350"></Lottie>
+                </StackPanel>
+            </Panel>
+        </Grid>
+        
+        <controls:Frame Name="RouterFrame" IsNavigationStackEnabled="False" CacheSize="0" IsVisible="{CompiledBinding Screen, Converter={x:Static ObjectConverters.IsNotNull}}">
+            <controls:Frame.NavigationPageFactory>
+                <ui:PageFactory />
+            </controls:Frame.NavigationPageFactory>
+        </controls:Frame>
+    </Panel>
 </UserControl>
@@ -1,4 +1,11 @@
+using System;
+using System.Reactive.Disposables;
+using System.Threading;
+using Artemis.UI.Shared.Routing;
+using Avalonia.Controls;
 using Avalonia.ReactiveUI;
+using Avalonia.Threading;
+using ReactiveUI;

 namespace Artemis.UI.Screens.Workshop.Entries.Tabs;

@@ -7,5 +14,30 @@ public partial class ProfileListView : ReactiveUserControl<ProfileListViewModel>
    public ProfileListView()
    {
        InitializeComponent();
+        EntriesScrollViewer.SizeChanged += (_, _) => UpdateEntriesPerFetch();
+
+        this.WhenActivated(d =>
+        {
+            UpdateEntriesPerFetch();
+            ViewModel.WhenAnyValue(vm => vm.Screen).WhereNotNull().Subscribe(Navigate).DisposeWith(d);
+        });
+    }
+
+    private void ScrollViewer_OnScrollChanged(object? sender, ScrollChangedEventArgs e)
+    {
+        // When near the bottom of EntriesScrollViewer, call FetchMore on the view model
+        if (EntriesScrollViewer.Offset.Y != 0 && EntriesScrollViewer.Extent.Height - (EntriesScrollViewer.Viewport.Height + EntriesScrollViewer.Offset.Y) < 100)
+            ViewModel?.FetchMore(CancellationToken.None);
+    }
+
+    private void Navigate(RoutableScreen viewModel)
+    {
+        Dispatcher.UIThread.Invoke(() => RouterFrame.NavigateFromObject(viewModel), DispatcherPriority.ApplicationIdle);
+    }
+
+    private void UpdateEntriesPerFetch()
+    {
+        if (ViewModel != null)
+            ViewModel.EntriesPerFetch = (int) (EntriesScrollViewer.Viewport.Height / 120);
    }
 }
@@ -10,12 +10,11 @@ namespace Artemis.UI.Screens.Workshop.Entries.Tabs;
 public class ProfileListViewModel : List.EntryListViewModel
 {
    public ProfileListViewModel(IWorkshopClient workshopClient,
-        IRouter router,
        CategoriesViewModel categoriesViewModel,
        EntryListInputViewModel entryListInputViewModel,
        INotificationService notificationService,
        Func<IEntrySummary, EntryListItemViewModel> getEntryListViewModel)
-        : base("workshop/entries/profiles", workshopClient, router, categoriesViewModel, entryListInputViewModel, notificationService, getEntryListViewModel)
+        : base("workshop/entries/profiles", workshopClient, categoriesViewModel, entryListInputViewModel, notificationService, getEntryListViewModel)
    {
        entryListInputViewModel.SearchWatermark = "Search profiles";
    }
@@ -41,7 +41,7 @@
            
            <StackPanel Margin="30 -75 30 0" Grid.Row="1">
                <StackPanel Spacing="10" Orientation="Horizontal" VerticalAlignment="Top">
-                    <Button Width="150" Height="180" Command="{CompiledBinding Navigate}" CommandParameter="workshop/entries/profiles/1" VerticalContentAlignment="Top">
+                    <Button Width="150" Height="180" Command="{CompiledBinding Navigate}" CommandParameter="workshop/entries/profiles" VerticalContentAlignment="Top">
                        <StackPanel>
                            <avalonia:MaterialIcon Kind="FolderVideo" HorizontalAlignment="Left" Width="60" Height="60" Margin="0 5" />
                            <TextBlock TextWrapping="Wrap" FontSize="16" Margin="0 5">Profiles</TextBlock>
@@ -49,7 +49,7 @@
                        </StackPanel>
                    </Button>

-                    <Button Width="150" Height="180" Command="{CompiledBinding Navigate}" CommandParameter="workshop/entries/layouts/1" VerticalContentAlignment="Top">
+                    <Button Width="150" Height="180" Command="{CompiledBinding Navigate}" CommandParameter="workshop/entries/layouts" VerticalContentAlignment="Top">
                        <StackPanel>
                            <avalonia:MaterialIcon Kind="KeyboardVariant" HorizontalAlignment="Left" Width="60" Height="60" Margin="0 5" />
                            <TextBlock TextWrapping="Wrap" FontSize="16" Margin="0 5">Layouts</TextBlock>
@@ -57,7 +57,7 @@
                        </StackPanel>
                    </Button>
                    
-                    <Button Width="150" Height="180" Command="{CompiledBinding Navigate}" CommandParameter="workshop/entries/plugins/1" VerticalContentAlignment="Top">
+                    <Button Width="150" Height="180" Command="{CompiledBinding Navigate}" CommandParameter="workshop/entries/plugins" VerticalContentAlignment="Top">
                        <StackPanel>
                            <avalonia:MaterialIcon Kind="Connection" HorizontalAlignment="Left" Width="60" Height="60" Margin="0 5" />
                            <TextBlock TextWrapping="Wrap" FontSize="16" Margin="0 5">Plugins</TextBlock>
@@ -1,6 +0,0 @@
-namespace Artemis.UI.Screens.Workshop.Parameters;
-
-public class WorkshopListParameters
-{
-    public int Page { get; set; }
-}
@@ -4,6 +4,7 @@
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
             xmlns:plugins="clr-namespace:Artemis.UI.Screens.Workshop.Plugins"
+             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.Plugins.PluginDetailsView"
             x:DataType="plugins:PluginDetailsViewModel">
@@ -12,13 +13,29 @@
            <Border Classes="card" VerticalAlignment="Top">
                <ContentControl Content="{CompiledBinding EntryInfoViewModel}" />
            </Border>
+
+            <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.PluginInfo, Converter={x:Static ObjectConverters.IsNotNull}}">
+                <StackPanel>
+                    <TextBlock>Admin required</TextBlock>
+                    <TextBlock Text="Yes" IsVisible="{CompiledBinding Entry.PluginInfo.RequiresAdmin}" />
+                    <TextBlock Text="No" IsVisible="{CompiledBinding !Entry.PluginInfo.RequiresAdmin}" />
+
+                    <TextBlock Margin="0 15 0 5">Supported platforms</TextBlock>
+                    <StackPanel Orientation="Horizontal" Spacing="10">
+                        <avalonia:MaterialIcon Kind="MicrosoftWindows" IsVisible="{CompiledBinding Entry.PluginInfo.SupportsWindows}" />
+                        <avalonia:MaterialIcon Kind="Linux" IsVisible="{CompiledBinding Entry.PluginInfo.SupportsLinux}" />
+                        <avalonia:MaterialIcon Kind="Apple" IsVisible="{CompiledBinding Entry.PluginInfo.SupportsOSX}" />
+                    </StackPanel>
+                </StackPanel>
+            </Border>
+
            <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.LatestRelease, Converter={x:Static ObjectConverters.IsNotNull}}">
                <ContentControl Content="{CompiledBinding EntryReleasesViewModel}" />
            </Border>
        </StackPanel>

        <ScrollViewer Grid.Row="1" Grid.Column="1">
-            <StackPanel  Margin="10 0" Spacing="10">
+            <StackPanel Margin="10 0" Spacing="10">
                <Border Classes="card">
                    <mdxaml:MarkdownScrollViewer Markdown="{CompiledBinding Entry.Description}" MarkdownStyleName="FluentAvalonia">
                        <mdxaml:MarkdownScrollViewer.Styles>
@@ -41,4 +58,4 @@

        <ContentControl Grid.Row="1" Grid.Column="2" IsVisible="{CompiledBinding Entry.Images.Count}" Content="{CompiledBinding EntryImagesViewModel}" />
    </Grid>
-</UserControl>
+</UserControl>
@@ -28,7 +28,7 @@ public partial class PluginDetailsViewModel : RoutableScreen<WorkshopDetailParam
    private readonly Func<IEntryDetails, EntryReleasesViewModel> _getEntryReleasesViewModel;
    private readonly Func<IEntryDetails, EntryImagesViewModel> _getEntryImagesViewModel;
    private readonly Func<IEntrySummary, EntryListItemViewModel> _getEntryListViewModel;
-    [Notify] private IEntryDetails? _entry;
+    [Notify] private IGetPluginEntryById_Entry? _entry;
    [Notify] private EntryInfoViewModel? _entryInfoViewModel;
    [Notify] private EntryReleasesViewModel? _entryReleasesViewModel;
    [Notify] private EntryImagesViewModel? _entryImagesViewModel;
@@ -58,7 +58,7 @@ public partial class PluginDetailsViewModel : RoutableScreen<WorkshopDetailParam

    private async Task GetEntry(long entryId, CancellationToken cancellationToken)
    {
-        IOperationResult<IGetEntryByIdResult> result = await _client.GetEntryById.ExecuteAsync(entryId, cancellationToken);
+        IOperationResult<IGetPluginEntryByIdResult> result = await _client.GetPluginEntryById.ExecuteAsync(entryId, cancellationToken);
        if (result.IsErrorResult())
            return;