code reorg

src/PostIt/PostIt/App.axaml.cs

@@ -148,7 +148,7 @@ private void ConfigureRootView(MainView rootView)
     public static async Task PushBlogsPageAsync()
     {
         var app = (App)Current!;
-        var mainVm = app.ServiceProvider!.GetRequiredService<MainViewModel>();
+        var mainVm = app.ServiceProvider!.GetRequiredService<BlogsViewModel>();
         await mainVm.InitializeAsync();
         await app.PushPageAsync(mainVm);
     }

src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs

@@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection;
 using PostIt.Services;
 using PostIt.ViewModels;
 using PostIt.Views;
+using PostIt.Views.Blogs;
 using PostIt.Views.Commands;
 using Yavsc.Api.Client;
 
@@ -34,7 +35,7 @@ public static class ServiceCollectionHelpers
 
         // Vues
         services.AddSingleton<MainView>();
-        services.AddSingleton<MainPage>();
+        services.AddSingleton<BlogsPage>();
         services.AddSingleton<MainWindow>();
 
         // SettingsPage is a singleton: there must be one and only one
@@ -89,7 +90,7 @@ public static class ServiceCollectionHelpers
         sessionStatus.Refresh();
         services.AddSingleton(sessionStatus);
         services.AddSingleton<SessionStatusBanner>();
-        services.AddSingleton<MainViewModel>();
+        services.AddSingleton<BlogsViewModel>();
         return services.BuildServiceProvider();
     }
 }

src/PostIt/PostIt/ViewLocator.cs

@@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
 using PostIt.ViewModels;
 using PostIt.ViewModels.Commands;
 using PostIt.Views;
+using PostIt.Views.Blogs;
 using PostIt.Views.Commands;
 
 namespace PostIt;
@@ -38,7 +39,7 @@ public class ViewLocator : IDataTemplate
         var services = app!.ServiceProvider!;
         return data switch
         {
-            MainViewModel => services.GetRequiredService<MainPage>(),
+            BlogsViewModel => services.GetRequiredService<BlogsPage>(),
             Settings => services.GetRequiredService<SettingsPage>(),
             HomePageViewModel => services.GetRequiredService<HomePage>(),
             ActivitiesPageViewModel => services.GetRequiredService<ActivitiesPage>(),

src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs

@@ -12,7 +12,7 @@ using PostIt.Helpers;
 
 namespace PostIt.ViewModels;
 
-public partial class MainViewModel : ViewModelBase, IActionStatusViewModel
+public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
 {
     /// <summary>Window/tab title. Cosmetic — bound by
     /// <c>MainPage.axaml</c> if at all. Not the post title.</summary>
@@ -336,7 +336,7 @@ public partial class MainViewModel : ViewModelBase, IActionStatusViewModel
     }
 
 
-    public MainViewModel()
+    public BlogsViewModel()
     {
         SettingsModel = new Settings();
         Init(SettingsModel);
@@ -396,7 +396,7 @@ public partial class MainViewModel : ViewModelBase, IActionStatusViewModel
     /// <see cref="BlogApiClient"/>. Production code uses the
     /// (Settings, BlogApiClient) overload below.
     /// </summary>
-    public MainViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
+    public BlogsViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
     {
         SettingsModel = new Settings();
         BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient)); ;

src/PostIt/PostIt/Views/Blogs/MainPage.axaml

@@ -5,15 +5,15 @@
              xmlns:vm="using:PostIt.ViewModels"
              xmlns:postitControls="using:PostIt.Controls"
              xmlns:models="using:Yavsc.Blogspot"
-             xmlns:views="using:PostIt.Views"
+             xmlns:views="using:PostIt.Views.Blogs"
              xmlns:AvaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
              mc:Ignorable="d"
-             x:Class="PostIt.Views.MainPage"
-             x:DataType="vm:MainViewModel"
+             x:Class="PostIt.Views.Blogs.BlogsPage"
+             x:DataType="vm:BlogsViewModel"
              HorizontalAlignment="Stretch"
              VerticalAlignment="Stretch">
     <Design.DataContext>
-        <vm:MainViewModel />
+        <vm:BlogsViewModel />
     </Design.DataContext>
 
     <Grid Margin="12" RowSpacing="12"

src/PostIt/PostIt/Views/Blogs/MainPage.axaml.cs

@@ -2,11 +2,11 @@ using System;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 
-namespace PostIt.Views;
+namespace PostIt.Views.Blogs;
 
-public partial class MainPage : ContentPage
+public partial class BlogsPage : ContentPage
 {
-    public MainPage()
+    public BlogsPage()
     {
         InitializeComponent();
     }
@@ -14,7 +14,7 @@ public partial class MainPage : ContentPage
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        if (DataContext is ViewModels.MainViewModel vm)
+        if (DataContext is ViewModels.BlogsViewModel vm)
         {
             if (!vm.IsLoaded)
             {

src/PostIt/PostIt/Views/Layout/MainView.axaml

@@ -6,11 +6,11 @@
              xmlns:views="using:PostIt.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="PostIt.Views.MainView"
-             x:DataType="vm:MainViewModel">
+             x:DataType="vm:HomePageViewModel">
   <Design.DataContext>
     <!-- This only sets the DataContext for the previewer in an IDE,
     to set the actual DataContext for runtime, set the DataContext property in code (look at App.axaml.cs) -->
-    <vm:MainViewModel />
+    <vm:HomePageViewModel />
   </Design.DataContext>
 
   <DockPanel LastChildFill="True">

src/PostIt/PostIt/Views/Layout/MainView.axaml.cs

@@ -13,7 +13,7 @@ public partial class MainView : UserControl
     protected override void OnDataContextChanged(EventArgs e)
     {
         base.OnDataContextChanged(e);
-        if (DataContext is ViewModels.MainViewModel vm)
+        if (DataContext is ViewModels.BlogsViewModel vm)
         {
             if (!vm.IsLoaded)
             {