Router - Require routable VMs to implement new RoutableScreen

src/Artemis.UI/Screens/Home/HomeViewModel.cs

@@ -1,12 +1,13 @@
 using Artemis.Core.Services;
 using Artemis.UI.Screens.StartupWizard;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Avalonia.Threading;
 
 namespace Artemis.UI.Screens.Home;
 
-public class HomeViewModel : ViewModelBase, IMainScreenViewModel
+public class HomeViewModel : RoutableScreen, IMainScreenViewModel
 {
     public HomeViewModel(ISettingsService settingsService, IWindowService windowService)
     {

src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs

@@ -17,14 +17,13 @@ using Artemis.UI.Shared;
 using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services.MainWindow;
 using Artemis.UI.Shared.Services.ProfileEditor;
-using Avalonia.Threading;
 using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.ProfileEditor;
 
-public class ProfileEditorViewModel : RoutableScreen<object, ProfileEditorViewModelParameters>, IMainScreenViewModel
+public class ProfileEditorViewModel : RoutableScreen<ProfileEditorViewModelParameters>, IMainScreenViewModel
 {
     private readonly IProfileEditorService _profileEditorService;
     private readonly IProfileService _profileService;

src/Artemis.UI/Screens/Root/BlankViewModel.cs

@@ -1,8 +1,9 @@
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Routing;
 
 namespace Artemis.UI.Screens.Root;
 
-public class BlankViewModel : ViewModelBase, IMainScreenViewModel
+public class BlankViewModel : RoutableScreen, IMainScreenViewModel
 {
     /// <inheritdoc />
     public ViewModelBase? TitleBarViewModel => null;

src/Artemis.UI/Screens/Root/RootView.axaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Reactive.Disposables;
+using Artemis.UI.Shared.Routing;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using ReactiveUI;
@@ -14,7 +15,7 @@ public partial class RootView : ReactiveUserControl<RootViewModel>
         this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Screen).Subscribe(Navigate).DisposeWith(d));
     }
 
-    private void Navigate(IMainScreenViewModel viewModel)
+    private void Navigate(RoutableScreen viewModel)
     {
         try
         {

src/Artemis.UI/Screens/Root/RootViewModel.cs

@@ -18,7 +18,7 @@ using ReactiveUI;
 
 namespace Artemis.UI.Screens.Root;
 
-public class RootViewModel : RoutableScreen<IMainScreenViewModel>, IMainWindowProvider
+public class RootViewModel : RoutableHostScreen<RoutableScreen>, IMainWindowProvider
 {
     private readonly ICoreService _coreService;
     private readonly IDebugService _debugService;
@@ -100,12 +100,10 @@ public class RootViewModel : RoutableScreen<IMainScreenViewModel>, IMainWindowPr
         _router.GoForward();
     }
 
-    private void UpdateTitleBarViewModel(IMainScreenViewModel? viewModel)
+    private void UpdateTitleBarViewModel(RoutableScreen? viewModel)
     {
-        if (viewModel?.TitleBarViewModel != null)
-            TitleBarViewModel = viewModel.TitleBarViewModel;
-        else
-            TitleBarViewModel = _defaultTitleBarViewModel;
+        IMainScreenViewModel? mainScreenViewModel = viewModel as IMainScreenViewModel;
+        TitleBarViewModel = mainScreenViewModel?.TitleBarViewModel ?? _defaultTitleBarViewModel;
     }
 
     private void CurrentMainWindowOnClosing(object? sender, EventArgs e)

src/Artemis.UI/Screens/Settings/SettingsViewModel.cs

@@ -11,7 +11,7 @@ using ReactiveUI;
 
 namespace Artemis.UI.Screens.Settings;
 
-public class SettingsViewModel : RoutableScreen<ActivatableViewModelBase>, IMainScreenViewModel
+public class SettingsViewModel : RoutableHostScreen<RoutableScreen>, IMainScreenViewModel
 {
     private readonly IRouter _router;
     private RouteViewModel? _selectedTab;

src/Artemis.UI/Screens/Settings/Tabs/AboutTabViewModel.cs

@@ -1,9 +1,9 @@
 using Artemis.Core;
-using Artemis.UI.Shared;
+using Artemis.UI.Shared.Routing;
 
 namespace Artemis.UI.Screens.Settings;
 
-public class AboutTabViewModel : ActivatableViewModelBase
+public class AboutTabViewModel : RoutableScreen
 {
     public AboutTabViewModel()
     {

src/Artemis.UI/Screens/Settings/Tabs/DevicesTabViewModel.cs

@@ -8,7 +8,7 @@ using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.Device;
-using Artemis.UI.Shared;
+using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Avalonia.Threading;
 using DynamicData;
@@ -16,7 +16,7 @@ using ReactiveUI;
 
 namespace Artemis.UI.Screens.Settings;
 
-public class DevicesTabViewModel : ActivatableViewModelBase
+public class DevicesTabViewModel : RoutableScreen
 {
     private readonly IDeviceVmFactory _deviceVmFactory;
     private readonly IRgbService _rgbService;

src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs

@@ -13,8 +13,8 @@ using Artemis.Core.Services;
 using Artemis.UI.Screens.StartupWizard;
 using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Services.Updating;
-using Artemis.UI.Shared;
 using Artemis.UI.Shared.Providers;
+using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
 using Avalonia.Threading;
@@ -26,7 +26,7 @@ using Serilog.Events;
 
 namespace Artemis.UI.Screens.Settings;
 
-public class GeneralTabViewModel : ActivatableViewModelBase
+public class GeneralTabViewModel : RoutableScreen
 {
     private readonly IAutoRunProvider? _autoRunProvider;
     private readonly IDebugService _debugService;

src/Artemis.UI/Screens/Settings/Tabs/PluginsTabViewModel.cs

@@ -9,18 +9,17 @@ using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.Plugins;
-using Artemis.UI.Shared;
+using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
 using Avalonia.ReactiveUI;
-using Avalonia.Threading;
 using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.Settings;
 
-public class PluginsTabViewModel : ActivatableViewModelBase
+public class PluginsTabViewModel : RoutableScreen
 {
     private readonly INotificationService _notificationService;
     private readonly IPluginManagementService _pluginManagementService;

src/Artemis.UI/Screens/Settings/Tabs/ReleasesTabViewModel.cs

@@ -22,7 +22,7 @@ using StrawberryShake;
 
 namespace Artemis.UI.Screens.Settings;
 
-public class ReleasesTabViewModel : RoutableScreen<ReleaseDetailsViewModel>
+public class ReleasesTabViewModel : RoutableHostScreen<ReleaseDetailsViewModel>
 {
     private readonly ILogger _logger;
     private readonly IUpdateService _updateService;

src/Artemis.UI/Screens/Settings/Updating/ReleaseDetailsViewModel.cs

@@ -18,7 +18,7 @@ using StrawberryShake;
 
 namespace Artemis.UI.Screens.Settings.Updating;
 
-public class ReleaseDetailsViewModel : RoutableScreen<ViewModelBase, ReleaseDetailsViewModelParameters>
+public class ReleaseDetailsViewModel : RoutableScreen<ReleaseDetailsViewModelParameters>
 {
     private readonly ObservableAsPropertyHelper<long> _fileSize;
     private readonly ILogger _logger;

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs

@@ -10,6 +10,7 @@ using Artemis.Core.Services;
 using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Extensions;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Avalonia;
 using ReactiveUI;
@@ -17,7 +18,7 @@ using SkiaSharp;
 
 namespace Artemis.UI.Screens.SurfaceEditor;
 
-public class SurfaceEditorViewModel : ActivatableViewModelBase, IMainScreenViewModel
+public class SurfaceEditorViewModel : RoutableScreen, IMainScreenViewModel
 {
     private readonly IDeviceService _deviceService;
     private readonly IDeviceVmFactory _deviceVmFactory;

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

@@ -18,7 +18,7 @@ using StrawberryShake;
 
 namespace Artemis.UI.Screens.Workshop.Entries;
 
-public abstract class EntryListBaseViewModel : RoutableScreen<ActivatableViewModelBase, WorkshopListParameters>, IWorkshopViewModel
+public abstract class EntryListBaseViewModel : RoutableScreen<WorkshopListParameters>
 {
     private readonly INotificationService _notificationService;
     private readonly IWorkshopClient _workshopClient;

src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeViewModel.cs

@@ -14,7 +14,7 @@ using ReactiveUI;
 
 namespace Artemis.UI.Screens.Workshop.Home;
 
-public class WorkshopHomeViewModel : ActivatableViewModelBase, IWorkshopViewModel
+public class WorkshopHomeViewModel : RoutableScreen
 {
     private readonly IWindowService _windowService;
     private readonly IWorkshopService _workshopService;

src/Artemis.UI/Screens/Workshop/Home/WorkshopOfflineViewModel.cs

@@ -10,7 +10,7 @@ using ReactiveUI;
 
 namespace Artemis.UI.Screens.Workshop.Home;
 
-public class WorkshopOfflineViewModel : RoutableScreen<ActivatableViewModelBase, WorkshopOfflineParameters>, IWorkshopViewModel
+public class WorkshopOfflineViewModel : RoutableScreen<WorkshopOfflineParameters>
 {
     private readonly IRouter _router;
     private readonly IWorkshopService _workshopService;

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

@@ -9,7 +9,7 @@ using StrawberryShake;
 
 namespace Artemis.UI.Screens.Workshop.Layout;
 
-public class LayoutDetailsViewModel : RoutableScreen<ActivatableViewModelBase, WorkshopDetailParameters>, IWorkshopViewModel
+public class LayoutDetailsViewModel : RoutableScreen<WorkshopDetailParameters>
 {
     private readonly IWorkshopClient _client;
     private IGetEntryById_Entry? _entry;

src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabView.axaml

@@ -3,6 +3,6 @@
              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.Library.Tabs.LibraryInstalledView">
+             x:Class="Artemis.UI.Screens.Workshop.Library.Tabs.InstalledTabView">
     Installed entries management here 🫡
 </UserControl>

src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabView.axaml.cs

@@ -5,9 +5,9 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.UI.Screens.Workshop.Library.Tabs;
 
-public partial class LibraryInstalledView : ReactiveUserControl<LibraryInstalledViewModel>
+public partial class InstalledTabView : ReactiveUserControl<InstalledTabViewModel>
 {
-    public LibraryInstalledView()
+    public InstalledTabView()
     {
         InitializeComponent();
     }

src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabViewModel.cs

@@ -1,8 +1,9 @@
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Routing;
 
 namespace Artemis.UI.Screens.Workshop.Library.Tabs;
 
-public class LibraryInstalledViewModel : ActivatableViewModelBase
+public class InstalledTabViewModel : RoutableScreen
 {
     
 }

src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsDetailView.axaml

@@ -0,0 +1,8 @@
+<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.Library.Tabs.SubmissionsDetailView">
+    Welcome to Avalonia!
+</UserControl>

src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsDetailView.axaml.cs

@@ -0,0 +1,14 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Screens.Workshop.Library.Tabs;
+
+public partial class SubmissionsDetailView : ReactiveUserControl<SubmissionsDetailViewModel>
+{
+    public SubmissionsDetailView()
+    {
+        InitializeComponent();
+    }
+}

src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsDetailViewModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Artemis.UI.Screens.Workshop.Parameters;
+using Artemis.UI.Shared.Routing;
+
+namespace Artemis.UI.Screens.Workshop.Library.Tabs;
+
+public class SubmissionsDetailViewModel : RoutableScreen<WorkshopDetailParameters>
+{
+    public override Task OnNavigating(WorkshopDetailParameters parameters, NavigationArguments args, CancellationToken cancellationToken)
+    {
+        Console.WriteLine(parameters.EntryId);
+        return Task.CompletedTask;
+    }
+}

src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml

@@ -8,8 +8,8 @@
              xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="650"
-             x:Class="Artemis.UI.Screens.Workshop.Library.Tabs.LibrarySubmissionsView"
-             x:DataType="tabs:LibrarySubmissionsViewModel">
+             x:Class="Artemis.UI.Screens.Workshop.Library.Tabs.SubmissionsTabView"
+             x:DataType="tabs:SubmissionsTabViewModel">
     <UserControl.Resources>
         <converters:EntryIconUriConverter x:Key="EntryIconUriConverter" />
         <converters:DateTimeConverter x:Key="DateTimeConverter" />
@@ -54,7 +54,7 @@
                                     Margin="0 0 0 5"
                                     HorizontalAlignment="Stretch"
                                     HorizontalContentAlignment="Stretch"
-                                    Command="{Binding $parent[tabs:LibrarySubmissionsView].DataContext.NavigateToEntry}"
+                                    Command="{Binding $parent[tabs:SubmissionsTabView].DataContext.NavigateToEntry}"
                                     CommandParameter="{CompiledBinding}">
                                 <Grid ColumnDefinitions="Auto,*,Auto">
                                     <!-- Icon -->

src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml.cs

@@ -5,9 +5,9 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.UI.Screens.Workshop.Library.Tabs;
 
-public partial class LibrarySubmissionsView : ReactiveUserControl<LibrarySubmissionsViewModel>
+public partial class SubmissionsTabView : ReactiveUserControl<SubmissionsTabViewModel>
 {
-    public LibrarySubmissionsView()
+    public SubmissionsTabView()
     {
         InitializeComponent();
     }

src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabViewModel.cs

@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using Artemis.UI.Extensions;
 using Artemis.UI.Screens.Workshop.CurrentUser;
 using Artemis.UI.Screens.Workshop.SubmissionWizard;
-using Artemis.UI.Shared;
 using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
@@ -17,7 +16,7 @@ using StrawberryShake;
 
 namespace Artemis.UI.Screens.Workshop.Library.Tabs;
 
-public class LibrarySubmissionsViewModel : ActivatableViewModelBase, IWorkshopViewModel
+public class SubmissionsTabViewModel : RoutableScreen
 {
     private readonly IWorkshopClient _client;
     private readonly SourceCache<IGetSubmittedEntries_SubmittedEntries, Guid> _entries;
@@ -25,7 +24,7 @@ public class LibrarySubmissionsViewModel : ActivatableViewModelBase, IWorkshopVi
     private bool _isLoading = true;
     private bool _workshopReachable;
 
-    public LibrarySubmissionsViewModel(IWorkshopClient client, IAuthenticationService authenticationService, IWindowService windowService, IWorkshopService workshopService, IRouter router)
+    public SubmissionsTabViewModel(IWorkshopClient client, IAuthenticationService authenticationService, IWindowService windowService, IWorkshopService workshopService, IRouter router)
     {
         _client = client;
         _windowService = windowService;

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

@@ -12,7 +12,7 @@ using System;
 
 namespace Artemis.UI.Screens.Workshop.Library;
 
-public class WorkshopLibraryViewModel : RoutableScreen<ActivatableViewModelBase>, IWorkshopViewModel
+public class WorkshopLibraryViewModel : RoutableHostScreen<RoutableScreen>
 {
     private RouteViewModel? _selectedTab;
 

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

@@ -18,7 +18,7 @@ using StrawberryShake;
 
 namespace Artemis.UI.Screens.Workshop.Profile;
 
-public class ProfileDetailsViewModel : RoutableScreen<ActivatableViewModelBase, WorkshopDetailParameters>, IWorkshopViewModel
+public class ProfileDetailsViewModel : RoutableScreen<WorkshopDetailParameters>
 {
     private readonly IWorkshopClient _client;
     private readonly ProfileEntryDownloadHandler _downloadHandler;

src/Artemis.UI/Screens/Workshop/Search/SearchViewModel.cs

@@ -19,7 +19,6 @@ public class SearchViewModel : ViewModelBase
     private readonly ILogger _logger;
     private readonly IRouter _router;
     private readonly IWorkshopClient _workshopClient;
-    private EntryType? _entryType;
     private bool _isLoading;
     private SearchResultViewModel? _selectedEntry;
 
@@ -44,12 +43,6 @@ public class SearchViewModel : ViewModelBase
         set => RaiseAndSetIfChanged(ref _selectedEntry, value);
     }
 
-    public EntryType? EntryType
-    {
-        get => _entryType;
-        set => RaiseAndSetIfChanged(ref _entryType, value);
-    }
-
     public bool IsLoading
     {
         get => _isLoading;
@@ -76,7 +69,7 @@ public class SearchViewModel : ViewModelBase
                 return new List<object>();
 
             IsLoading = true;
-            IOperationResult<ISearchEntriesResult> results = await _workshopClient.SearchEntries.ExecuteAsync(input, EntryType, cancellationToken);
+            IOperationResult<ISearchEntriesResult> results = await _workshopClient.SearchEntries.ExecuteAsync(input, null, cancellationToken);
             return results.Data?.SearchEntries.Select(e => new SearchResultViewModel(e) as object) ?? new List<object>();
         }
         catch (Exception e)

src/Artemis.UI/Screens/Workshop/WorkshopViewModel.cs

@@ -1,38 +1,18 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Artemis.UI.Screens.Workshop.Home;
+using Artemis.UI.Screens.Workshop.Home;
 using Artemis.UI.Screens.Workshop.Search;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Routing;
-using Artemis.WebClient.Workshop;
 
 namespace Artemis.UI.Screens.Workshop;
 
-public class WorkshopViewModel : RoutableScreen<IWorkshopViewModel>, IMainScreenViewModel
+public class WorkshopViewModel : RoutableHostScreen<RoutableScreen>, IMainScreenViewModel
 {
-    private readonly SearchViewModel _searchViewModel;
-
     public WorkshopViewModel(SearchViewModel searchViewModel, WorkshopHomeViewModel homeViewModel)
     {
-        _searchViewModel = searchViewModel;
-        
         TitleBarViewModel = searchViewModel;
         HomeViewModel = homeViewModel;
     }
 
     public ViewModelBase TitleBarViewModel { get; }
     public WorkshopHomeViewModel HomeViewModel { get; }
-
-    /// <inheritdoc />
-    public override Task OnNavigating(NavigationArguments args, CancellationToken cancellationToken)
-    {
-        _searchViewModel.EntryType = Screen?.EntryType;
-        return Task.CompletedTask;
-    }
-}
-
-public interface IWorkshopViewModel
-{
-    public EntryType? EntryType { get; }
 }