.forgejo/workflows/buildAndTest.yml

@@ -25,9 +25,9 @@ on:
 
 jobs:
   build:
+
     runs-on: docker
-    container:
+
-      image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
     steps:
     - name: Clone yavsc
       run: |
@@ -39,9 +39,10 @@ jobs:
           git checkout FETCH_HEAD
         fi
         git submodule update --init --recursive
-        echo "✅ Checked out at $(git rev-parse HEAD) on $(git branch --show-current 2>/dev/null || echo detached HEAD)"
+        echo "Checked out at $(git rev-parse HEAD) on $(git branch --show-current 2>/dev/null || echo detached HEAD)"
-
+    - name: Restore dependencies
+      run: cd /src/_src && dotnet restore
+    - name: Build
+      run: cd /src/_src && dotnet build --no-restore
     - name: Test
-      run: |
+      run: cd /src/_src && dotnet test --no-build --verbosity normal
-        echo "🚀 Lancement des tests..."
-        cd /src/_src && dotnet test --verbosity normal && echo "✅ Success !"

.forgejo/workflows/release.yml

@@ -51,8 +51,6 @@ jobs:
   # via l'API REST Forgejo (pas d'actions tierces Node).
   release:
     runs-on: docker
-    container:
-      image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
     steps:
       - name: Clone du repo au tag demandé
         env:
@@ -196,10 +194,10 @@ jobs:
         # la racine du checkout pour que l'étape d'upload le trouve.
         run: |
           cd /src/_src
-          APK=src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/fr.pschneider.postit-Signed.apk
+          APK=src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/com.CompanyName.PostIt-Signed.apk
           if [[ ! -f "$APK" ]]; then
             echo "::error::APK not found at $APK"
-            ls -la src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64 2>/dev/null || true
+            ls -la src/PostIt/PostIt.Android/bin/Release/net10.0-android/ 2>/dev/null || true
             exit 1
           fi
           cp "$APK" /src/_src/PostIt.Android.apk

.github/workflows/docker-publish-android.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Extraire l'APK du conteneur Docker
         run: |
           docker create --name extractor postit-android
-          docker cp extractor:/src/src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/fr.pschneider.postit-Signed.apk ./PostIt.Android.apk
+          docker cp extractor:/src/src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/com.CompanyName.PostIt-Signed.apk ./PostIt.Android.apk
           docker rm extractor
 
       - name: Téléverser l'APK en tant qu'Artéfact GitHub

.gitignore

@@ -39,6 +39,3 @@ DataDir/
 
 *.tests.trx
 *.tests.html
-
-*.log
-

.vscode/launch.json

@@ -1,57 +1,33 @@
 {
-  // Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
+    // Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
-  // Pointez pour afficher la description des attributs existants.
+    // Pointez pour afficher la description des attributs existants.
-  // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
+    // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
+    "version": "0.2.0",
-  "configurations": [
+    "configurations": [
-    {
+        {
-      "name": "Android Debug",
+            "name": "API",
-      "type": "mono",
+            "type": "dotnet",
-      "preLaunchTask": "run-debug-android",
+            "request": "launch",
-      "request": "attach",
+            "projectPath": "${workspaceFolder}/src/Api/Api.csproj"
-      "address": "localhost",
+        },
-      "port": 55555
+        {
-    },
+            "name": "Yavsc.Org",
-    {
+            "type": "dotnet",
-      "name": "Android Attach - Debug",
+            "request": "launch",
-      "type": "mono",
+            "projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj",
-      "request": "attach",
+        },
-      "address": "localhost",
+        {
-      "port": 55555
+            "name": "Yavsc.Blogs",
-    },
+            "type": "dotnet",
-    {
+            "request": "launch",
-      "name": "API",
+            "projectPath": "${workspaceFolder}/src/Yavsc.Blogs/Yavsc.Blogs.csproj"
-      "type": "dotnet",
+        },
-      "request": "launch",
+        {
-      "projectPath": "${workspaceFolder}/src/Api/Api.csproj"
+            "name": "PostIt",
-    },
+            "type": "dotnet",
-    {
+            "request": "launch",
-      "name": "Yavsc Org",
+            "projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj",
-      "type": "dotnet",
+
-      "request": "launch",
+        }
-      "projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj",
+    ]
-    },
-    {
-      "name": "Yavsc Blogs",
-      "type": "dotnet",
-      "request": "launch",
-      "projectPath": "${workspaceFolder}/src/Yavsc.Blogs/Yavsc.Blogs.csproj"
-    },
-    {
-      "name": "PostIt Desktop",
-      "type": "dotnet",
-      "request": "launch",
-      "projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj",
-    },
-    {
-      "name": "Test PostIt.Android launch (Xamarin.UITest)",
-      "type": "coreclr",
-      "request": "launch",
-      "program": "${workspaceFolder}/src/PostIt/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests.dll",
-      "args": [],
-      "cwd": "${workspaceFolder}/src/PostIt/PostIt.Tests",
-      "console": "integratedTerminal",
-      "stopAtEntry": false
-    }
-  ]
 }

.vscode/settings.json

@@ -5,7 +5,6 @@
         "appsettings",
         "asciidoctor",
         "ASPNETCORE",
-        "Avalonia",
         "Configurabilité",
         "Cratie",
         "DESTDIR",
@@ -16,7 +15,6 @@
         "Hsts",
         "Newtonsoft",
         "Npgsql",
-        "Oidc",
         "PKCE",
         "postit",
         "pschneider",

.vscode/tasks.json

@@ -1,42 +1,6 @@
 {
   "version": "2.0.0",
   "tasks": [
-    {
-      "label": "run-debug-android",
-      "command": "dotnet",
-      "type": "shell",
-      "options": {
-        "cwd": "${workspaceFolder}/src/PostIt/PostIt.Android",
-        "env": {
-          "DOTNET_HOST_PATH": "/usr/share/dotnet",
-          "ANDROID_HOME": "/opt/android-sdk",
-          "JAVA_HOME": "/usr/lib/jvm/java-1.25.0-openjdk-amd64"
-        }
-      },
-      "args": [
-        "run",
-        "-p:TargetFramework=net10.0-android",
-        "-p:Configuration=Debug",
-        "-p:AndroidAttachDebugger=true",
-        "-p:AndroidSdbHostPort=55555",
-        "-p:AndroidSdbTargetPort=55555"
-      ],
-      "problemMatcher": [
-        {
-          "owner": "dotnet",
-        "fileLocation": ["relative", "${workspaceFolder}"],
-        "source": "dotnet",
-        "pattern": {
-          "regexp": "^(.*):(\\d+):(\\d+):\\s+(error):\\s+(.*)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "severity": 4,
-          "message": 5
-        }
-      }
-      ]
-    },
     {
       "label": "build",
       "command": "dotnet",
@@ -75,6 +39,59 @@
         "kind": "build"
       },
       "isBackground": true
+    },
+    {
+      "label": "test blogs",
+      "type": "process",
+      "problemMatcher": ["$msCompile"],
+      "command": "dotnet",
+      "args": ["test"],
+      "runOptions": {
+        "instanceLimit": 1
+      },
+      "options": {
+        "cwd": "src/Yavsc.Blogs",
+        "env": {
+          "DOTNET_CLI_UI_LANGUAGE": "en-US",
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      },
+      "group": {
+        "kind": "test"
+      },
+      "isBackground": true,
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": false
+      }
+    },
+    {
+      "label": "publish",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "publish",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary;ForceNoAlign"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "watch",
+      "command": "dotnet",
+      "type": "process",
+      "args": ["watch", "--project",
+      "src/Yavsc.Org/Yavsc.Org.csproj"
+    ],
+      "problemMatcher": "$msCompile",
+      "runOptions": {
+
+      }
+
     }
   ]
 }

CHANGELOG.md

@@ -16,24 +16,6 @@ Cette convention est partagée avec le dépôt
 [`postit-debian`](https://forgejo.pschneider.fr/notazof/postit-debian)
 pour la production des paquets `.deb`.
 
-## [1.0.8-rc3] - unstable
-
-### Added
-
-* a code cleanup,
-* a first Xamarin.UITest is successful, but disabled, because breaking the actual CI process,
-* Android app starts, the login process succeeds
-
-### Changed
-
-L'identifiant de l'application client Android a changé, il passe en minuscules :
-`fr.pschneider.postit`
-
-### Fixed
-
-nothing, [TODO] a bug persists laoding a blog post from PostIt, ACL sould come along with and should not need any "Refresh" button.
-Today, assigning ACL succeeds the first time, the following times result in a 409
-
 ## [1.0.8-rc1] - unstable
 
 ### Added

Directory.Build.props

@@ -11,6 +11,6 @@
       from without conflicting names.
     -->
     <UseProjectNamespaceForGitVersionInformation>true</UseProjectNamespaceForGitVersionInformation>
-    <NoWarn>NU1701, NU1901, NU1902, NU1507</NoWarn>
+    <NoWarn>NU1701, NU1901, NU1902</NoWarn>
   </PropertyGroup>
 </Project>

external/dotnet-android-build-image

@@ -0,0 +1 @@
+Subproject commit 0695a6c1fea6508f1a88f7ad0ad9cb93733aa52d

src/PostIt.Tests/AddCircleMemberDialogTests.cs

@@ -1,8 +1,8 @@
 
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Headless.XUnit;
 using Microsoft.Extensions.DependencyInjection;
-using PostIt.Helpers;
 using PostIt.Services;
 using PostIt.ViewModels;
 using PostIt.Views;
@@ -73,7 +73,7 @@ public class AddCircleMemberDialogTests
         return context;
     }
     /// <summary>
-    /// Mount a real <see cref="MainView"/>, build a minimal
+    /// Mount a real <see cref="MainWindow"/>, build a minimal
     /// DI graph, push <see cref="CirclesPage"/> then the
     /// <see cref="AddCircleMemberDialog"/> on top of it.
     /// Returns the stack size so the test can pin the delta.
@@ -98,9 +98,12 @@ public class AddCircleMemberDialogTests
         services.AddTransient<AddCircleMemberDialogViewModel>();
         var sp = services.BuildServiceProvider();
 
-        context.Window = new MainView();
+        context.Window = new MainWindow();
         context.App = (PostIt.App)Application.Current!;
+        context.App.DataTemplates.Clear();
+        context.App.DataTemplates.Add(new ViewLocator(sp));
         context.App.AttachMainWindow(context.Window);
+        context.Window.Show();
 
         context.page = sp.GetRequiredService<CirclesPage>();
         context.Window.NavRoot.PushAsync(context.page).GetAwaiter().GetResult();

src/PostIt.Tests/BearerScopeTests.cs

@@ -1,8 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Yavsc.Blogspot;
 using Yavsc.Api.Client;
 using PostIt.Services;
+using PostIt.Services;
+using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/BlogApiTestFakes.cs

@@ -1,6 +1,7 @@
 using Yavsc.Blogspot;
 using PostIt.Services;
 using PostIt.ViewModels;
+using Yavsc.Models;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/Directory.Packages.props

@@ -0,0 +1,10 @@
+<Project>
+  <!-- Pull in shared package versions from the repository root. -->
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <!-- PostIt.Tests-specific versions -->
+  <ItemGroup>
+    <PackageVersion Include="Avalonia.Headless" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Headless.XUnit" Version="12.0.4" />
+  </ItemGroup>
+</Project>

src/PostIt.Tests/FakeAuthorizingBrowser.cs

@@ -1,3 +1,6 @@
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
 using IdentityModel.OidcClient.Browser;
 
 namespace PostIt.Tests;

src/PostIt.Tests/MainPageButtonsTests.cs

@@ -1,6 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Headless;
 using Avalonia.Headless.XUnit;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
 using Yavsc.Api.Client;
@@ -72,7 +75,7 @@ public class MainPageButtonsTests
         { }
     }
 
-    private static MainViewModel MakeViewModel(BlogPostDto? selectedPost = null)
+    private static MainPageViewModel MakeViewModel(BlogPostDto? selectedPost = null)
     {
         var api = new ThrowingApi();
         var blog = new BlogApiClient(api, "http://localhost/");
@@ -93,13 +96,13 @@ public class MainPageButtonsTests
         services.AddTransient<SignaturePage>();
         services.AddTransient<CirclesPage>();
         services.AddTransient<PostAclDialog>();
-        var vm = new MainViewModel(blog, services: services.BuildServiceProvider());
+        var vm = new MainPageViewModel(blog, services: services.BuildServiceProvider());
         if (selectedPost is not null) vm.SelectedPost = selectedPost;
         return vm;
     }
 
     /// <summary>
-    /// Mount a real <see cref="MainView"/> (as
+    /// Mount a real <see cref="MainWindow"/> (as
     /// <c>SessionStatusBannerTests</c> does), push a
     /// <see cref="MainPage"/> with the given VM onto
     /// <c>NavRoot</c>. <c>PushAsync</c> is awaited (via
@@ -109,12 +112,18 @@ public class MainPageButtonsTests
     /// realised and <c>KeyPressQwerty</c> has a real
     /// <see cref="TopLevel"/> to dispatch against.
     /// </summary>
-    private static (MainView window, MainPage page) MountMainPage(MainViewModel vm)
+    private static (MainWindow window, MainPage page) MountMainPage(MainPageViewModel vm)
     {
-        var window = new MainView();
+        var window = new MainWindow();
         var page = new MainPage { DataContext = vm };
         var app = (PostIt.App)Application.Current!;
+        if (vm.Services is not null)
+        {
+            app.DataTemplates.Clear();
+            app.DataTemplates.Add(new ViewLocator(vm.Services));
+        }
         app.AttachMainWindow(window);
+        window.Show();
         window.NavRoot.PushAsync(page).GetAwaiter().GetResult();
         return (window, page);
     }
@@ -124,7 +133,7 @@ public class MainPageButtonsTests
     /// supported headless pattern (cf. CalculatorTests in the
     /// Avalonia.Samples repo). Returns the nav-stack count
     /// before the click so the caller can assert on the delta.
-    /// KeyPressQwerty is dispatched on the <see cref="MainView"/>
+    /// KeyPressQwerty is dispatched on the <see cref="MainWindow"/>
     /// itself — it is the <see cref="TopLevel"/> that owns the
     /// headless implementation, and routing the key through any
     /// descendant TopLevel (e.g. one obtained via
@@ -133,7 +142,7 @@ public class MainPageButtonsTests
     /// because the descendant does not carry the
     /// <c>PlatformHandle</c> the harness expects.
     /// </summary>
-    private static int ClickAndCapture(MainView window, Button button)
+    private static int ClickAndCapture(MainWindow window, Button button)
     {
         var stackBefore = window.NavRoot.NavigationStack.Count;
         button.Command?.Execute(button.CommandParameter);

src/PostIt.Tests/MainPageSaveTests.cs

@@ -1,8 +1,10 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Headless.XUnit;
 using Avalonia.VisualTree;
 using Yavsc.Blogspot;
 using Yavsc.Api.Client;
+using PostIt.Services;
 using PostIt.ViewModels;
 using PostIt.Views;
 namespace PostIt.Tests;
@@ -40,7 +42,7 @@ public class MainPageSaveTests
         var recorder = new CallRecorder();
         var api = new RecordingYavscApiClient(recorder);
         var blog = new BlogApiClient(api, "http://localhost/");
-        var viewModel = new MainViewModel(blog);
+        var viewModel = new MainPageViewModel(blog);
 
         var page = new MainPage { DataContext = viewModel };
         // MainPage is a ContentPage (a Page, not a Control), so it

src/PostIt.Tests/OidcStubAuthority.cs

@@ -1,8 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/PostAclDialogTests.cs

@@ -1,14 +1,21 @@
+using System;
+using System.Collections.Generic;
 using System.Net;
+using System.Net.Http;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Headless.XUnit;
 using Microsoft.Extensions.DependencyInjection;
-using PostIt.Helpers;
 using PostIt.Services;
 using PostIt.ViewModels;
 using PostIt.Views;
+using Yavsc.Abstract.Identity.Security;
 using Yavsc.Api.Client;
+using Yavsc.Api.Client.Dtos;
 using Yavsc.Blogspot;
 
 namespace PostIt.Tests;
@@ -117,7 +124,7 @@ public class PostAclDialogTests
     /// rebinding the global DI mid-test would trample the
     /// Settings singleton the rest of the harness depends on.
     /// </summary>
-    private static (MainView window, BlogAclApiClient aclClient, CircleApiClient circleClient, CountingHttpHandler handler) Mount()
+    private static (MainWindow window, BlogAclApiClient aclClient, CircleApiClient circleClient, CountingHttpHandler handler) Mount()
     {
         var handler = new CountingHttpHandler();
         var settings = new Settings();
@@ -138,9 +145,12 @@ public class PostAclDialogTests
         // CountingHttpHandler.
         GC.KeepAlive(sp);
 
-        var window = new MainView();
+        var window = new MainWindow();
         var app = (App)Application.Current!;
+        app.DataTemplates.Clear();
+        app.DataTemplates.Add(new ViewLocator(sp));
         app.AttachMainWindow(window);
+        window.Show();
 
         return (window, aclClient, circleClient, handler);
     }

src/PostIt.Tests/PostIt.Tests.csproj

@@ -8,26 +8,24 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
     <FileVersion>1.1.0.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+49.Branch.release-1.0.8-rc3.Sha.5274d7bdf5d14406748a2063b5ae15191aac4359</InformationalVersion>
+    <InformationalVersion>1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3</InformationalVersion>
     <Version>1.1.0-beta.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="Xamarin.UITest" />
     <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    
     <PackageReference Include="coverlet.collector" />
-
     <PackageReference Include="Avalonia.Headless" />
     <PackageReference Include="Avalonia.Headless.XUnit" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PostIt\PostIt.csproj" />
+    <ProjectReference Include="..\..\src\PostIt\PostIt\PostIt.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Using Include="Xunit" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="GitVersion.MsBuild" />
   </ItemGroup>
 </Project>

src/PostIt.Tests/PostItViewModelTests.cs

@@ -16,7 +16,7 @@ public class PostItViewModelTests
         // throws on any call (we never call the API in this test).
         var fakeApi = new ThrowingYavscApiClient();
         var blog = new BlogApiClient(fakeApi, "http://localhost/");
-        var viewModel = new MainViewModel(blog);
+        var viewModel = new MainPageViewModel(blog);
 
         viewModel.Posts.Add(new BlogPostDto { Id = 1, Title = "First post", Article = "Hello world", AuthorId = "alice" });
         viewModel.Posts.Add(new BlogPostDto { Id = 2, Title = "Second post", Article = "Nothing here", AuthorId = "bob" });
@@ -49,7 +49,7 @@ public class PostItViewModelTests
         var api = new StubYavscApiClient(expected);
         var blog = new BlogApiClient(api, "http://localhost/");
 
-        var posts = await blog.GetPostsAsync(ct: TestContext.Current.CancellationToken);
+        var posts = await blog.GetPostsAsync();
 
         Assert.Equal(2, posts.Count);
         Assert.Equal("Hello", posts[0].Title);

src/PostIt.Tests/SchemeUrlDetectorTests.cs

@@ -1,4 +1,5 @@
 using PostIt.Services;
+using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/SessionStatusBannerTests.cs

@@ -1,5 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Headless.XUnit;
+using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 using PostIt.ViewModels;
@@ -9,7 +11,7 @@ namespace PostIt.Tests;
 
 /// <summary>
 /// UI tests for <see cref="SessionStatusBanner"/>. Mounted inside
-/// a real <see cref="MainView"/> via the headless Avalonia
+/// a real <see cref="MainWindow"/> via the headless Avalonia
 /// platform declared in <c>TestApp.cs</c>.
 ///
 /// <para>The pattern is the one that <c>UnitTest1.MainPage_Should_Load</c>
@@ -34,10 +36,11 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_renders_three_buttons_in_the_visual_tree()
     {
-        MainWindow window = new MainWindow();
+        var window = new MainWindow();
+        window.SessionBanner.DataContext = new SessionStatusViewModel();
         window.Show();
 
-        var buttons = window.GetVisualDescendants()
+        var buttons = window.SessionBanner.GetVisualDescendants()
             .OfType<Button>()
             .ToList();
 
@@ -45,7 +48,7 @@ public class SessionStatusBannerTests
         // déconnecter, Se connecter, Paramètres. If any one is
         // missing, the user has no way to trigger the
         // corresponding navigation event.
-        Assert.Equal(4, buttons.Count);
+        Assert.Equal(3, buttons.Count);
         Assert.Contains(buttons, b => b.Content as string == "Se déconnecter");
         Assert.Contains(buttons, b => b.Content as string == "Se connecter");
         Assert.Contains(buttons, b => b.Content as string == "Paramètres");
@@ -54,10 +57,13 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_login_button_is_visible_when_logged_out()
     {
-        MainWindow window = new MainWindow();
+        var window = new MainWindow();
+        var vm = new SessionStatusViewModel();
+        Assert.True(vm.IsLoggedOut);  // VM default
+        window.SessionBanner.DataContext = vm;
         window.Show();
 
-        var login = window.GetVisualDescendants()
+        var login = window.SessionBanner.GetVisualDescendants()
             .OfType<Button>()
             .Single(b => b.Content as string == "Se connecter");
 
@@ -69,13 +75,13 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_logout_button_is_hidden_when_logged_out()
     {
-       SessionStatusBanner banner = CreateBanner();
+        var window = new MainWindow();
+        var vm = new SessionStatusViewModel();
+        Assert.False(vm.IsLoggedIn);  // VM default
+        window.SessionBanner.DataContext = vm;
+        window.Show();
 
-        Assert.False((banner.DataContext as SessionStatusViewModel)!
+        var logout = window.SessionBanner.GetVisualDescendants()
-        .IsLoggedIn);  // VM default
-
-
-        var logout = banner.GetVisualDescendants()
             .OfType<Button>()
             .Single(b => b.Content as string == "Se déconnecter");
 
@@ -85,9 +91,11 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_settings_button_is_visible_regardless_of_session()
     {
-        SessionStatusBanner banner = CreateBanner();
+        var window = new MainWindow();
+        window.SessionBanner.DataContext = new SessionStatusViewModel();
+        window.Show();
 
-        var settings = banner.GetVisualDescendants()
+        var settings = window.SessionBanner.GetVisualDescendants()
             .OfType<Button>()
             .Single(b => b.Content as string == "Paramètres");
 
@@ -97,21 +105,14 @@ public class SessionStatusBannerTests
         Assert.True(settings.IsVisible);
     }
 
-    private static SessionStatusBanner CreateBanner()
-    {
-        MainWindow window = new MainWindow();
-        window.Show();
-        var banner = window.MainView.SessionBanner;
-        var status = new SessionStatusViewModel();
-        banner.DataContext = status;
-        return banner;
-    }
-
     [AvaloniaFact]
     public void Banner_session_label_reflects_DataContext()
     {
-        SessionStatusBanner banner = CreateBanner();
+        var window = new MainWindow();
-        var label = banner.GetVisualDescendants()
+        window.SessionBanner.DataContext = new SessionStatusViewModel();
+        window.Show();
+
+        var label = window.SessionBanner.GetVisualDescendants()
             .OfType<TextBlock>()
             .First(t => t.Text == "Déconnecté" || t.Text == "Connecté");
 

src/PostIt.Tests/SettingsLoadTests.cs

@@ -1,3 +1,9 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
 namespace PostIt.Tests;
 
 public class SettingsLoadTests
@@ -85,7 +91,7 @@ public class SettingsLoadTests
                         bool flip = ((workerId + i) & 1) == 0;
                         settings.DarkMode = flip;
                         settings.Authentication.RedirectUri =
-                            global::AuthenticationSettings.DesktopRedirectUri;
+                            global::AuthenticationSettings.DefaultDesktopRedirectUri;
 
                         settings.BusinessApiUrl = flip
                             ? "https://a.example.test/api/v1/"
@@ -103,7 +109,7 @@ public class SettingsLoadTests
                 {
                     failures.Add(ex);
                 }
-            }, TestContext.Current.CancellationToken);
+            });
         }
         await Task.WhenAll(tasks);
 
@@ -123,7 +129,7 @@ public class SettingsLoadTests
     /// and checking that Loaded flips exactly once (no torn reads).
     /// </summary>
     [Fact]
-    public async Task Load_is_idempotent_under_concurrent_calls()
+    public void Load_is_idempotent_under_concurrent_calls()
     {
         var settings = new PostIt.ViewModels.Settings
         {
@@ -143,9 +149,9 @@ public class SettingsLoadTests
             {
                 barrier.SignalAndWait();
                 settings.Load();
-            }, TestContext.Current.CancellationToken);
+            });
         }
-        await Task.WhenAll(tasks);
+        Task.WaitAll(tasks);
 
         Assert.True(settings.Loaded);
     }

src/PostIt.Tests/SignaturePadControlTests.cs

@@ -1,5 +1,8 @@
+using System;
+using System.Linq;
 using PostIt.Controls;
 using PostIt.Models;
+using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/SignaturePageViewModelTests.cs

@@ -1,6 +1,10 @@
+using System;
+using System.IO;
 using System.Text.Json;
+using System.Threading.Tasks;
 using PostIt.Controls;
 using PostIt.ViewModels;
+using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/TestAppContext.cs

@@ -4,7 +4,7 @@ namespace PostIt.Tests;
 
 internal class TestAppContext
 {
-    public MainView? Window {get; set; }
+    public MainWindow? Window {get; set; }
     public CirclesPage? page {get; set; }
     public AddCircleMemberDialog? dialog { get; set; }
     public App? App { get; internal set; }

src/PostIt.Tests/UnitTest1.cs

@@ -1,4 +1,5 @@
 using Avalonia.Headless.XUnit;
+using Avalonia.Controls;
 using PostIt.Views;
 
 namespace PostIt.Tests;
@@ -8,7 +9,8 @@ public class MainPageTests
     [AvaloniaFact]
     public void MainPage_Should_Load()
     {
-        var window = new MainView();
+        var window = new MainWindow();
+        window.Show();
         Assert.NotNull(window);
     }
 }

src/PostIt.Tests/YavscApiClientTests.cs

@@ -1,10 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Net.Sockets;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
+using Yavsc.Blogspot;
+using Yavsc.Api.Client;
 using PostIt.Services;
+using System.Threading.Tasks;
+using IdentityModel.OidcClient;
 using IdentityModel.OidcClient.Browser;
+using PostIt.Services;
 using PostIt.ViewModels;
+using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/pslist

@@ -0,0 +1,94 @@
+UID          PID    PPID  C STIME TTY          TIME CMD
+paul        1155       1  0 13:18 ?        00:00:00 /usr/lib/systemd/systemd --user
+paul        1168    1155  0 13:18 ?        00:00:00 (sd-pam)
+paul        1361    1155  0 13:18 ?        00:00:00 /usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only
+paul        1364    1155  1 13:18 ?        00:01:19 /home/paul/.nvm/versions/node/v22.23.0/bin/node /home/paul/.nvm/versions/node/v22.23.0/lib/node_modules/openclaw/dist/index.js gateway --port 18789
+paul        1367    1155  0 13:18 ?        00:00:00 /usr/bin/pipewire
+paul        1372    1155  0 13:18 ?        00:00:00 /usr/bin/pipewire -c filter-chain.conf
+paul        1373    1155  0 13:18 ?        00:00:00 /usr/bin/wireplumber
+paul        1374    1155  0 13:18 ?        00:00:00 /usr/bin/pipewire-pulse
+paul        1444    1155  0 13:18 ?        00:00:00 /usr/bin/mpris-proxy
+paul        2593    1155  0 13:19 ?        00:00:00 /usr/bin/gnome-keyring-daemon --foreground --components=pkcs11,secrets --control-directory=/run/user/1000/keyring
+paul        2608    2487  0 13:19 tty2     00:00:00 /usr/libexec/gdm-x-session --run-script /usr/bin/gnome-session
+paul        2617    2608  1 13:19 tty2     00:01:12 /usr/lib/xorg/Xorg vt2 -displayfd 3 -auth /run/user/1000/gdm/Xauthority -nolisten tcp -background none -noreset -keeptty -novtswitch -verbose 3
+paul        2647    2608  0 13:19 tty2     00:00:00 /usr/libexec/gnome-session-binary
+paul        2785    1155  0 13:19 ?        00:00:00 /usr/libexec/at-spi-bus-launcher
+paul        2792    2785  0 13:19 ?        00:00:00 /usr/bin/dbus-daemon --config-file=/usr/share/defaults/at-spi2/accessibility.conf --nofork --print-address 11 --address=unix:path=/run/user/1000/at-spi/bus_1
+paul        2802    1155  0 13:19 ?        00:00:00 /usr/libexec/gcr-ssh-agent --base-dir /run/user/1000/gcr
+paul        2803    1155  0 13:19 ?        00:00:00 /usr/libexec/gnome-session-ctl --monitor
+paul        2804    1155  0 13:19 ?        00:00:00 /usr/bin/ssh-agent -D
+paul        2814    1155  0 13:19 ?        00:00:00 /usr/libexec/gvfsd
+paul        2828    1155  0 13:19 ?        00:00:00 /usr/libexec/gvfsd-fuse /run/user/1000/gvfs -f
+paul        2838    1155  0 13:19 ?        00:00:00 /usr/libexec/gnome-session-binary --systemd-service --session=gnome
+paul        2874    1155  3 13:19 ?        00:02:13 /usr/bin/gnome-shell
+paul        2896    2874  0 13:19 ?        00:00:01 /usr/libexec/mutter-x11-frames
+paul        2902    1155  0 13:19 ?        00:00:00 /usr/libexec/at-spi2-registryd --use-gnome-session
+paul        2918    1155  0 13:19 ?        00:00:00 /usr/libexec/xdg-desktop-portal
+paul        2933    1155  0 13:19 ?        00:00:00 /usr/libexec/xdg-permission-store
+paul        2938    1155  0 13:19 ?        00:00:00 /usr/libexec/xdg-document-portal
+paul        2971    1155  0 13:19 ?        00:00:00 /usr/libexec/gnome-shell-calendar-server
+paul        2976    1155  0 13:19 ?        00:00:00 /usr/libexec/dconf-service
+paul        2992    1155  0 13:19 ?        00:00:00 /usr/libexec/evolution-source-registry
+paul        2994    1155  0 13:19 ?        00:00:00 /usr/bin/gjs -m /usr/share/gnome-shell/org.gnome.Shell.Notifications
+paul        3012    1155  0 13:19 ?        00:00:12 /usr/bin/ibus-daemon --panel disable --xim
+paul        3013    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-a11y-settings
+paul        3014    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-color
+paul        3015    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-datetime
+paul        3016    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-housekeeping
+paul        3018    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-keyboard
+paul        3024    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-media-keys
+paul        3025    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-power
+paul        3027    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-print-notifications
+paul        3029    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-rfkill
+paul        3030    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-screensaver-proxy
+paul        3035    2838  0 13:19 ?        00:00:05 /usr/bin/gnome-software --gapplication-service
+paul        3037    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-sharing
+paul        3042    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-smartcard
+paul        3048    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-sound
+paul        3054    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-usb-protection
+paul        3057    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-wacom
+paul        3058    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-xsettings
+paul        3059    2838  0 13:19 ?        00:00:00 /usr/libexec/evolution-data-server/evolution-alarm-notify
+paul        3064    2838  0 13:19 ?        00:00:00 /usr/bin/kalendarac
+paul        3070    2838  0 13:19 ?        00:00:00 /usr/libexec/gsd-disk-utility-notify
+paul        3088    2838  0 13:19 ?        00:00:00 /usr/bin/kdeconnectd
+paul        3168    1155  0 13:19 ?        00:00:00 /usr/bin/gjs -m /usr/share/gnome-shell/org.gnome.ScreenSaver
+paul        3172    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-printer
+paul        3207    3012  0 13:19 ?        00:00:00 /usr/libexec/ibus-memconf
+paul        3208    3012  0 13:19 ?        00:00:06 /usr/libexec/ibus-extension-gtk3
+paul        3214    1155  0 13:19 ?        00:00:00 /usr/libexec/ibus-x11 --kill-daemon
+paul        3216    1155  0 13:19 ?        00:00:00 /usr/libexec/ibus-portal
+paul        3218    1155  0 13:19 ?        00:00:00 /usr/libexec/localsearch-3
+paul        3219    1155  0 13:19 ?        00:00:00 /usr/libexec/xdg-desktop-portal-gnome
+paul        3241    1155  0 13:19 ?        00:00:00 /usr/libexec/gvfs-udisks2-volume-monitor
+paul        3251    1155  0 13:19 ?        00:00:00 /usr/libexec/gvfs-mtp-volume-monitor
+paul        3259    1155  0 13:19 ?        00:00:00 /usr/libexec/gvfs-gphoto2-volume-monitor
+paul        3265    1155  0 13:20 ?        00:00:00 /usr/libexec/gvfs-goa-volume-monitor
+paul        3271    1155  0 13:20 ?        00:00:00 /usr/libexec/goa-daemon
+paul        3280    1155  0 13:20 ?        00:00:00 /usr/libexec/goa-identity-service
+paul        3287    1155  0 13:20 ?        00:00:00 /usr/libexec/gvfs-afc-volume-monitor
+paul        3303    3012  0 13:20 ?        00:00:02 /usr/libexec/ibus-engine-simple
+paul        3372    1155  0 13:20 ?        00:00:00 /usr/libexec/xdg-desktop-portal-gtk
+paul        3441    1155  0 13:20 ?        00:00:00 /usr/libexec/gvfsd-metadata
+paul        3453    1155  0 13:20 ?        00:00:00 /usr/libexec/evolution-calendar-factory
+paul        3495    1155  0 13:20 ?        00:00:00 /usr/libexec/evolution-addressbook-factory
+paul        4798    1155  0 13:26 ?        00:00:09 /usr/libexec/gnome-terminal-server
+paul        4810    4798  0 13:26 pts/0    00:00:00 bash
+paul        8614    1155  0 13:29 ?        00:00:01 /usr/bin/speech-dispatcher -s -t 0
+paul        8656    8614  0 13:29 ?        00:00:00 [sd_espeak-ng-mb] <defunct>
+paul        8709    8614  0 13:29 ?        00:00:00 /usr/lib/speech-dispatcher-modules/sd_espeak-ng /etc/speech-dispatcher/modules/espeak-ng.conf
+paul        8785    8614  0 13:29 ?        00:00:00 /usr/lib/speech-dispatcher-modules/sd_dummy /etc/speech-dispatcher/modules/dummy.conf
+paul        8799    8614  0 13:29 ?        00:00:00 /usr/lib/speech-dispatcher-modules/sd_espeak-ng /etc/speech-dispatcher/modules/
+paul       10028    1155  0 13:31 ?        00:00:00 adb -L tcp:5037 fork-server server --reply-fd 4
+paul       69578    2814  0 13:53 ?        00:00:00 /usr/libexec/gvfsd-http --spawner :1.22 /org/gtk/gvfs/exec_spaw/0
+paul      108341    1155  3 14:06 ?        00:00:48 /home/paul/.nvm/versions/node/v22.23.0/bin/node /home/paul/.nvm/versions/node/v22.23.0/lib/node_modules/acpx/dist/cli.js __queue-owner
+paul      108416  108341  0 14:06 ?        00:00:00 openclaw
+paul      108458  108416  2 14:06 ?        00:00:37 openclaw-acp
+paul      143553    1155  0 14:19 ?        00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpI2JxLw.tmp
+paul      149205    1155  0 14:21 ?        00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpitRyQG.tmp
+paul      151724    1155  0 14:22 ?        00:00:04 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpJEsOZV.tmp
+paul      157447    1155  1 14:24 ?        00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpyM92DV.tmp
+paul      165231    1155  0 14:26 ?        00:00:01 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmp5CKC19.tmp
+paul      168472    1155  4 14:27 ?        00:00:09 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpuRJsnQ.tmp
+paul      172147    1155  4 14:29 pts/0    00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpxT8nje.tmp
+paul      172435    4810 99 14:31 pts/0    00:00:00 ps -fu paul

src/PostIt/Directory.Packages.props

@@ -1,39 +1,21 @@
 <Project>
-  <Import
+  <!-- Pull in shared package versions from the repository root. -->
-    Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
   <!-- PostIt-product-specific versions -->
-  <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
+  <ItemGroup>
-    <PropertyGroup>
+    <PackageVersion Include="Avalonia" Version="12.0.4" />
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <PackageVersion Include="Avalonia.Android" Version="12.0.4" />
-        <AvaloniaVersionBase>12.1.1</AvaloniaVersionBase>
+    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
-    </PropertyGroup>
+    <PackageVersion Include="Avalonia.Browser" Version="12.0.4" />
-    <ItemGroup>
+    <PackageVersion Include="Avalonia.Desktop" Version="12.0.4" />
-        <!-- Avalonia packages -->
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.4" />
-        <!-- Important: keep version in sync! -->
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.4" />
-        <PackageVersion Include="Avalonia" Version="$(AvaloniaVersionBase)" />
+    <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.2" />
-        <PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersionBase)" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-        <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersionBase)" />
+    <PackageVersion Include="Material.Avalonia" Version="3.17.0" />
-        <PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersionBase)" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
-        <PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersionBase)" />
+    <PackageVersion Include="Microsoft.Maui.Essentials" Version="10.0.90" />
-        <PackageVersion Include="Avalonia.Headless" Version="$(AvaloniaVersionBase)" />
+    <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.8.0.11" />
-        <PackageVersion Include="Avalonia.Headless.Xunit" Version="$(AvaloniaVersionBase)" />
+    <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
-        <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersionBase)" />
+  </ItemGroup>
-
-        <PackageVersion Include="Material.Avalonia" Version="3.19.0" />
-        <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
-        <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersionBase)" />
-        <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-
-        <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.10.0.1" />
-
-        <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
-
-        <PackageVersion Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.10.0.1" />
-        <PackageVersion Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.10.0.1" />
-
-        <PackageVersion Include="Xamarin.UITest" Version="4.4.2" />
-
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11" />
-
-    </ItemGroup>
 </Project>

src/PostIt/Makefile

@@ -1,178 +0,0 @@
-
-# Cibles pour installer PostIt.Android en Debug sur l'AVD qemu.
-#
-# Usage typique :
-#   make qemu            # lance l'AVD, attend le boot, build l'APK, l'installe
-#   make android-install # (re)build l'APK et l'installe (AVD doit tourner)
-#   make android-build   # build l'APK seul (sans install)
-#   make qemu-run        # démarre l'AVD en background
-#   make qemu-stop       # arrête l'émulateur
-#   make qemu-wait-boot  # attend que l'AVD ait fini de booter
-#
-# Variables surchargeables (make VAR=valeur) :
-#   AVD_NAME        default: postit_test_avd
-#                    (l'AVD doit être listé par `avdmanager list avd`)
-#   ADB_SERIAL      default: emulator-5554
-#                    (port standard du premier émulateur lancé)
-#   ANDROID_HOME    default: /opt/android-sdk
-#                    (le SDK Android local; doit contenir
-#                    emulator/emulator et platform-tools/adb)
-#   POSTIT_RID      default: android-x64
-#                    (doit matcher l'ABI de l'AVD; `avdmanager list avd`
-#                    affiche la ligne Tag/ABI)
-#   EMU_HEADLESS    default: 0
-#                    (1 = lancer l'émulateur sans fenêtre, pour scripter)
-#   CONFIG          surcharge la variable CONFIG globale (Debug par
-#                    défaut dans ce Makefile). Passer à Release pour
-#                    un APK optimisé et signé release.
-#   LOGCAT_LINES    default: 200
-#                    (nombre de lignes dumpées par `make qemu-logcat`)
-#   LOGCAT_FOLLOW   default: 0
-#                    (1 = stream live via `make logcat`,
-#                    sinon dump one-shot des N dernières lignes)
-#   LOGCAT_BOOT_WAIT default: 30
-#                    (secondes d'attente entre le clear du buffer,
-#                    le `am start`, et le dump final dans
-#                    `make qemu-logcat-boot`)
-AVD_NAME ?= postit_test_avd
-ADB_SERIAL ?= emulator-5554
-ANDROID_HOME ?= /opt/android-sdk
-POSTIT_RID ?= android-x64
-EMU_HEADLESS ?= 0
-LOGCAT_LINES ?= 600
-LOGCAT_FOLLOW ?= 0
-LOGCAT_BOOT_WAIT ?= 30
-
-ANDROID_PACKAGE_NAME = fr.pschneider.postit
-POSTIT_ANDROID_CSPROJ := PostIt.Android/PostIt.Android.csproj
-POSTIT_APK_DIR := PostIt.Android/bin/$(CONFIG)/net10.0-android/$(POSTIT_RID)
-POSTIT_APK := $(POSTIT_APK_DIR)/$(ANDROID_PACKAGE_NAME)-Signed.apk
-
-clean: clean-PostIt clean-PostIt.Android clean-PostIt.Desktop
-
-clean-%:
-	rm -rf $*/obj $*/bin
-
-qemu-run:
-	@echo "  Starting AVD $(AVD_NAME) on $(ADB_SERIAL)..."
-	@mkdir -p /tmp/yavsc-emu
-	@EMU_ARGS=""; \
-	if [ "$(EMU_HEADLESS)" = "1" ]; then EMU_ARGS="-no-window -no-audio"; fi; \
-	$(ANDROID_HOME)/emulator/emulator -avd $(AVD_NAME) $$EMU_ARGS \
-	    >/tmp/yavsc-emu/$(AVD_NAME).log 2>&1 & \
-	echo "  ✅ Started emulator PID: $$!"
-
-qemu-stop:
-	adb -s $(ADB_SERIAL) emu kill
-	echo "  ✅ Stopped emulator"
-
-qemu-wait-boot:
-	@echo "  Waiting for $(ADB_SERIAL) to finish booting..."
-	adb -s $(ADB_SERIAL) wait-for-device
-	@for i in $$(seq 1 180); do \
-	    BOOTED=$$(adb -s $(ADB_SERIAL) shell getprop sys.boot_completed 2>/dev/null | tr -d '\r\n'); \
-	    if [ "$$BOOTED" = "1" ]; then \
-	        echo "  ✓ booted in $${i}s"; \
-	        exit 0; \
-	    fi; \
-	    sleep 1; \
-	done; \
-	echo "  👿  ERROR: device did not boot within 180s." >&2; \
-	echo "  Logs: /tmp/yavsc-emu/$(AVD_NAME).log" >&2; \
-	exit 1
-
-android-build:
-	# EmbedAssembliesIntoApk=true: without this, the Debug APK ships
-	# without the managed assemblies in it (they are pushed at runtime
-	# via `adb push`, "Fast Deployment"). On the qemu emulator, the
-	# runtime cannot find them in `files/.__override__/<rid>/` and
-	# aborts at startup with "No assemblies found in '.__override__'"
-	# (monodroid-glue.cc:757, SIGABRT). Forcing this property on
-	# packages the .dlls into the APK as `assemblies/<rid>/` so the
-	# runtime reads them directly.
-	#
-	# The Xamarin.Android SDK property is `EmbedAssembliesIntoApk`,
-	# not `AndroidEnableFastDeployment` (which exists in older
-	# templates but is a no-op in the .NET 10 SDK).
-	dotnet build $(POSTIT_ANDROID_CSPROJ) \
-	    -c $(CONFIG) \
-	    -p:RuntimeIdentifier=$(POSTIT_RID) \
-	    -p:EmbedAssembliesIntoApk=true \
-	    --nologo
-	@if [ ! -f "$(POSTIT_APK)" ]; then \
-	    echo "  APK not found at $(POSTIT_APK)." >&2; \
-	    echo "  Files in $(POSTIT_APK_DIR):" >&2; \
-	    ls -la "$(POSTIT_APK_DIR)" 2>/dev/null || echo "  (directory does not exist)" >&2; \
-	    exit 1; \
-	fi
-
-
-android-install: android-build
-	@echo "  Installing $(POSTIT_APK) on $(ADB_SERIAL)..."
-	adb -s $(ADB_SERIAL) install -r "$(POSTIT_APK)" -r
-	@echo "  ✅ PostIt.Android installed on $(ADB_SERIAL)"
-
-qemu-uninstall:
-	adb -s $(ADB_SERIAL) uninstall $(ANDROID_PACKAGE_NAME)
-
-# Dump recent logcat output for the running PostIt.Android process.
-# By default, prints the last $(LOGCAT_LINES) lines (one-shot, with
-# `-d`). Set LOGCAT_FOLLOW=1 to follow the stream live instead.
-# Filtering is by PID (pidof $(ANDROID_PACKAGE_NAME)), not by tag,
-# because Mono/Xamarin can emit logs under several tags
-# (mono, PostIt.Android, Avalonia.Android) and tag-based filtering
-# would miss the ones not matching. PID-based filtering is exact.
-# If the app is not running, pidof returns empty and logcat exits
-# silently with no output; that is the expected behaviour for
-# "no logs yet".
-logcat:
-	@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
-	if [ -z "$$PID" ]; then \
-	    echo "  $(ANDROID_PACKAGE_NAME) is not running on $(ADB_SERIAL)."; \
-	    echo "  Start the app first (am start -n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity)"; \
-	    exit 1; \
-	fi; \
-	echo "  Following PID $$PID (LOGCAT_FOLLOW=$(LOGCAT_FOLLOW), LOGCAT_LINES=$(LOGCAT_LINES))"; \
-	if [ "$(LOGCAT_FOLLOW)" = "1" ]; then \
-	    adb -s $(ADB_SERIAL) logcat -v time --pid=$$PID $(ANDROID_PACKAGE_NAME); \
-	else \
-	    adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID $(ANDROID_PACKAGE_NAME); \
-	fi
-
-# Clear logcat, launch PostIt.Android, then dump everything that was
-# emitted during the startup window. Targets the "démarrage KO" case
-# where the process starts but Avalonia never renders a frame — the
-# logcat trace from process start to first frame is what diagnoses it.
-#
-# Override LOGCAT_BOOT_WAIT to extend the post-launch wait
-# (default 15s; raise to 30+ if the device is slow to boot Avalonia).
-LOGCAT_BOOT_WAIT ?= 15
-
-
-android-start:
-	@echo "  Clearing logcat buffer..."
-	adb -s $(ADB_SERIAL) logcat -c
-	@echo "  Launching $(ANDROID_PACKAGE_NAME)..."
-	adb -s $(ADB_SERIAL) shell am start \
-	    -n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity
-	@echo "  ✅ $(ANDROID_PACKAGE_NAME) started on $(ADB_SERIAL)"
-
-qemu-logcat-boot: android-start
-	@echo "  Waiting $(LOGCAT_BOOT_WAIT)s for the app to start rendering..."
-	@sleep $(LOGCAT_BOOT_WAIT)
-
-	@echo "  Dumping logcat (PostIt PID + system buffer):"
-	@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
-	if [ -n "$$PID" ]; then \
-	    echo " ✅ (PID $$PID at dump time)"; \
-			sleep 10; \
-	    adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID; \
-	else \
-	    echo " 👿 (PostIt process not running at dump time — dumping last $(LOGCAT_LINES) lines unfiltered)"; \
-	    adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES); \
-			exit 1; \
-	fi
-
-qemu: qemu-run qemu-wait-boot android-install
-
-.PHONY: clean qemu qemu-run qemu-stop qemu-wait-boot android-build android-install logcat qemu-logcat-boot

src/PostIt/PostIt.Android/Application.cs

@@ -2,12 +2,6 @@
 using Android.Runtime;
 using Avalonia;
 using Avalonia.Android;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Avalonia.Controls;
-using Avalonia.Styling;
-using Yavsc.Api.Client;
 
 namespace PostIt.Android
 {

src/PostIt/PostIt.Android/MainActivity.cs

@@ -1,11 +1,8 @@
-
 using Android.App;
-using Android.Content;
 using Android.Content.PM;
-using AndroidX.Core.Provider;
+using Android.Content;
-using AndroidX.Emoji2.Text;
+using Avalonia;
 using Avalonia.Android;
-using PostIt.Droid.Services;
 
 namespace PostIt.Android;
 
@@ -15,28 +12,26 @@ namespace PostIt.Android;
     Theme = "@style/MyTheme.NoActionBar",
     Icon = "@drawable/icon",
     MainLauncher = true,
+    LaunchMode = LaunchMode.SingleTask,
     ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 public class MainActivity : AvaloniaMainActivity
 {
     /// <summary>
-    /// The current MainActivity instance.
+    /// Strongly-typed handle to the current MainActivity instance, set in
+    /// <see cref="OnCreate"/> and consumed by platform services such as
+    /// <see cref="Services.AndroidSystemBrowser"/> which need to launch
+    /// Chrome Custom Tabs.
     /// </summary>
     public static MainActivity? Current { get; private set; }
 
     protected override void OnCreate(global::Android.OS.Bundle? savedInstanceState)
     {
-        FontRequest fontRequest = new FontRequest(
-                "com.google.android.gms.fonts",
-                "com.google.android.gms",
-                "Noto Color Emoji Compat",
-                Yavsc.Resource.Array.com_google_android_gms_fonts_certs); //com_google_android_gms_fonts_certs
-        EmojiCompat.Config config = new FontRequestEmojiCompatConfig(this, fontRequest);
-        EmojiCompat.Init(config);
-        PlatformBootstrap.InitPlatform();
         base.OnCreate(savedInstanceState);
+        PlatformBootstrap.EnsureInitialized();
         Current = this;
     }
-     /// <summary>
+
+    /// <summary>
     /// Receives the deep-link Intent fired by the system browser after the
     /// user completes the OIDC login on https://yavsc.pschneider.fr. The
     /// Intent URI has the shape <c>android://postit-signin?code=...&amp;state=...</c>.
@@ -48,13 +43,7 @@ public class MainActivity : AvaloniaMainActivity
     protected override void OnNewIntent(Intent? intent)
     {
         base.OnNewIntent(intent);
-
+        if (intent is not null) AndroidOidcCallbackSink.Handle(intent);
-         var url = intent?.DataString;
-        if (!string.IsNullOrEmpty(url) && url.StartsWith("postit://callback"))
-        {
-            OidcCallbackManager.SetResult(url);
-        }
-
     }
 
     internal static class AndroidOidcCallbackSink

src/PostIt/PostIt.Android/PlatformBootstrap.cs

@@ -12,9 +12,14 @@ namespace PostIt.Android;
 /// </summary>
 internal static class PlatformBootstrap
 {
-    internal static void InitPlatform()
+    private static int _initialized;
-    {
 
+    internal static void EnsureInitialized()
+    {
+        if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
+            return;
+
+        Platform.DefaultRedirectUri = ViewModels.Settings.AndroidRedirectUri;
         Platform.CreateBrowser = () =>
         {
             var activity = MainActivity.Current;

src/PostIt/PostIt.Android/PostIt.Android.csproj

@@ -2,30 +2,35 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net10.0-android</TargetFramework>
-    <SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
+    <!-- FORCE LES ARCHITECTURES ANDROID VALIDES -->
+    <RuntimeIdentifiers>android-arm64;android-x64</RuntimeIdentifiers>
+    <SupportedOSPlatformVersion>23.0.0</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
-    <ApplicationId>fr.pschneider.postit</ApplicationId>
+    <ApplicationId>com.CompanyName.PostIt</ApplicationId>
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
+    <AssemblyVersion>1.1.0.0</AssemblyVersion>
+    <FileVersion>1.1.0.0</FileVersion>
+    <InformationalVersion>1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3</InformationalVersion>
+    <Version>1.1.0-beta.1</Version>
   </PropertyGroup>
-
   <ItemGroup>
     <AndroidResource Include="Icon.png">
       <Link>Resources\drawable\Icon.png</Link>
     </AndroidResource>
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Avalonia.Android" />
     <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" />
     <PackageReference Include="Xamarin.AndroidX.Browser" />
-
+  </ItemGroup>
-   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
-
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Essentials" />
+  </ItemGroup>
 </Project>

src/PostIt/PostIt.Android/Properties/AndroidManifest.xml

@@ -1,6 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
 	<uses-permission android:name="android.permission.INTERNET" />
-		<application android:label="PostIt" android:icon="@drawable/Icon">
+	<application android:label="PostIt" android:icon="@drawable/Icon">
+
+		<!--
+			Deep-link receiver for the OIDC Authorization Code + PKCE flow.
+			After the user authenticates in the system browser, the OP
+			redirects to android://postit-signin?... and Android forwards
+			the Intent to the MainActivity (configured SingleTask so the
+			existing instance receives OnNewIntent rather than spawning a
+			new one).
+
+			The host value (postit-signin) MUST match the
+			AndroidRedirectUri constant in PostIt/Settings/Settings.cs and
+			the corresponding RedirectUri registered for the 'postit'
+			client in IdentityServer (Yavsc.Org ConfigurationDb).
+		-->
+		<activity-alias
+			android:name="PostIt.Android.OidcCallbackActivity"
+			android:targetActivity="PostIt.Android.PostItMainActivity"
+			android:exported="true"
+			android:launchMode="singleTask">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="android" android:host="postit-signin" />
+			</intent-filter>
+		</activity-alias>
 	</application>
 </manifest>

src/PostIt/PostIt.Android/Resources/values/font_certs.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <array name="com_google_android_gms_fonts_certs">
-        <item>@array/com_google_android_gms_fonts_certs_dev</item>
-        <item>@array/com_google_android_gms_fonts_certs_prod</item>
-    </array>
-    <string-array name="com_google_android_gms_fonts_certs_dev">
-        <item>MIIEqDCCA5CgAwIBAgIJAN5gc16AJfAsMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHR29vZ2xlMRAwDgYDVQQLEwdBbmRyb2lkMRAwDgYDVQQDEwdBbmRyb2lkMSEwHwYJKoZIhvcNAQkBFhJhbmRyb2lkQGFuZHJvaWQuY29tMCAXDTA4MDQxNTIyNDA0M1YYDzQyMDgxMzA0MjI0MDQzWjCBlDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDURvdW50YWluIFZpZXcxEDAOBgNVBAoTB0dvb2dsZTEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEhMB8GCSqGSIb3DQEJARYSYW5kcm9pZEBhbmRyb2lkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBi1vF0K1vOEHG7AxneTjOHUka46MIidBqvFcO164A49iU2DkYPhUaM4H8JCdzh6N1GzM6h9o6E2V6z8+gEtdI6nqqs0EGA0G0H701bFjLp9+K/1DkMIFeD4P8J7X1/M8t4+X09X/7bQyV3w0v7q+Qh38sY8W/7K29B3f2O2sLw+uX9U8a8Tf4Xv8A==</item>
-    </string-array>
-    <string-array name="com_google_android_gms_fonts_certs_prod">
-        <item>MIIEQzCCAyugAwIBAgIJAMLgh0ZgXpYOMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKvSkUIXm+t9M8rXj2V</item>
-    </string-array>
-</resources>

src/PostIt/PostIt.Android/Services/AndroidSystemBrowser.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading.Tasks;
 using Android.App;
+using Android.Content;
 using AndroidX.Browser.CustomTabs;
 using IdentityModel.OidcClient.Browser;
-using PostIt.Droid.Services;
 
 namespace PostIt.Android.Services;
 
@@ -36,19 +36,14 @@ public sealed class AndroidSystemBrowser : IBrowser
             };
         }
 
-        // 1. Enregistrez la tâche avant de lancer le Custom Tab
-        var callbackTask = OidcCallbackManager.RegisterCallback(cancellationToken);
-
-        // 2. LANCEZ VOTRE CUSTOM TAB ICI (via AndroidX.Browser.CustomTabs)
-        // ... code pour ouvrir l'URL d'authentification ...
-
-
         var uri = global::Android.Net.Uri.Parse(options.StartUrl)!;
 
+        var callbackTask = MainActivity.AndroidOidcCallbackSink.AwaitNextCallbackAsync();
+
         var tabsIntent = new CustomTabsIntent.Builder()
-            .SetShowTitle(true)!
+            .SetShowTitle(true)
             .Build();
-        tabsIntent!.LaunchUrl(_activity, uri);
+        tabsIntent.LaunchUrl(_activity, uri);
 
         string responseUri;
         try

src/PostIt/PostIt.Android/Services/ContactService.Mobile.cs

@@ -0,0 +1,84 @@
+#if ANDROID || IOS
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Maui.ApplicationModel.Communication;
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Devices;
+using PostIt.Services;
+using System.Linq;
+
+namespace PostIt.Android.Services;
+
+/// <summary>
+/// Mobile implementation backed by MAUI Essentials
+/// <c>Contacts.Default</c>.
+///
+/// <para>Compiled only for ANDROID and IOS. On desktop targets,
+/// see <c>ContactService.Desktop.cs</c> (the stub that wins at
+/// compile time).</para>
+///
+/// <para>Note: at runtime, this class throws
+/// <c>NotImplementedInReferenceAssemblyException</c> unless
+/// the host application project also references the
+/// platform-specific Microsoft.Maui.Essentials implementation
+/// (typically <c>PostIt.Android</c>). On iOS the same is
+/// required via <c>PostIt.iOS</c>. On desktop the stub is used
+/// and this file is excluded.</para>
+/// </summary>
+public sealed class ContactService : IContactService
+{
+    public async Task<IReadOnlyList<ContactDto>> GetDeviceContactsAsync(CancellationToken ct = default)
+    {
+        if (DeviceInfo.Current.Platform == DevicePlatform.Unknown)
+            return Array.Empty<ContactDto>();
+
+        try
+        {
+            var status = await Permissions.RequestAsync<Permissions.ContactsRead>();
+            if (status != PermissionStatus.Granted)
+                return Array.Empty<ContactDto>();
+
+            var contacts = await Contacts.Default.GetAllAsync();
+            if (contacts is null) return Array.Empty<ContactDto>();
+
+            // Carry the per-contact email list as-is. A real
+            // device contact can carry several addresses (home /
+            // work / other); the UI use case ("invite / add to a
+            // circle") can then decide which address to use, or
+            // let the user pick. The platform-neutral ContactDto
+            // shape is intentionally richer than the Yavsc
+            // directory's single-Email shape — the two flows
+            // answer different questions.
+            var result = new List<ContactDto>(contacts.Count());
+            foreach (var c in contacts)
+            {
+                var emails = ExtractEmails(c.Emails);
+                result.Add(new ContactDto(
+                    c.Id,
+                    c.DisplayName ?? string.Empty,
+                    emails));
+            }
+            return result;
+        }
+        catch (Exception ex)
+        {
+            System.Diagnostics.Debug.WriteLine($"ContactService: {ex.Message}");
+            return Array.Empty<ContactDto>();
+        }
+    }
+
+    private static IReadOnlyList<string> ExtractEmails(IEnumerable<ContactEmail>? emails)
+    {
+        if (emails is null) return Array.Empty<string>();
+        var list = new List<string>();
+        foreach (var e in emails)
+        {
+            if (!string.IsNullOrEmpty(e.EmailAddress))
+                list.Add(e.EmailAddress);
+        }
+        return list;
+    }
+}
+#endif

src/PostIt/PostIt.Android/Services/OidcCallbackManager.cs

@@ -1,21 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace PostIt.Droid.Services;
-
-public static class OidcCallbackManager
-{
-    private static TaskCompletionSource<string>? _tcs;
-
-    public static Task<string> RegisterCallback(CancellationToken cancellationToken)
-    {
-        _tcs = new TaskCompletionSource<string>();
-        cancellationToken.Register(() => _tcs.TrySetCanceled());
-        return _tcs.Task;
-    }
-
-    public static void SetResult(string url)
-    {
-        _tcs?.TrySetResult(url);
-    }
-}

src/PostIt/PostIt.Android/WebAuthenticationCallbackActivity.cs

@@ -1,35 +0,0 @@
-using Android.App;
-using Android.Content;
-using Android.Content.PM;
-using Android.OS;
-using PostIt.Droid.Services;
-
-namespace PostIt.Android;
-
-[Activity(NoHistory = true, LaunchMode = LaunchMode.SingleTop, Exported = true)]
-[IntentFilter(new[] { Intent.ActionView },
-    Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable },
-    DataScheme = "postit", // Remplacez par votre schéma personnalisé (ex: yavsc ou postit)
-    DataHost = "callback")] // Correspond à postit://callback
-public class WebAuthenticationCallbackActivity : Activity
-{
-    protected override void OnCreate(Bundle? savedInstanceState)
-    {
-        base.OnCreate(savedInstanceState);
-
-        // Capturer l'URL de redirection OIDC
-        var url = Intent?.DataString;
-
-        if (!string.IsNullOrEmpty(url))
-        {
-            // Transmettre l'URL au gestionnaire partagé pour compléter la Task
-            OidcCallbackManager.SetResult(url);
-        }
-
-        // Fermer cette activité transparente et ramener l'application au premier plan
-        var intent = new Intent(this, typeof(MainActivity));
-        intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop);
-        StartActivity(intent);
-        Finish();
-    }
-}

src/PostIt/PostIt.Browser/PostIt.Browser.csproj

@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
     <FileVersion>1.1.0.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+49.Branch.release-1.0.8-rc3.Sha.5274d7bdf5d14406748a2063b5ae15191aac4359</InformationalVersion>
+    <InformationalVersion>1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3</InformationalVersion>
     <Version>1.1.0-beta.1</Version>
   </PropertyGroup>
   <ItemGroup>
@@ -15,4 +15,7 @@
   <ItemGroup>
     <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GitVersion.MsBuild" />
+  </ItemGroup>
 </Project>

src/PostIt/PostIt.Browser/Program.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Browser;
 using PostIt;

src/PostIt/PostIt.Desktop/PlatformBootstrap.cs

@@ -0,0 +1,30 @@
+using IdentityModel.OidcClient.Browser;
+using PostIt.Services;
+
+namespace PostIt.Desktop;
+
+/// <summary>
+/// One-shot platform bootstrap. Called from <c>Program.Main</c> so that
+/// the shared OIDC login path sees a working <c>IBrowser</c> — the
+/// custom-scheme browser that hands the OIDC callback off to the
+/// running instance through the named pipe. Desktop builds do NOT use
+/// a loopback HTTP listener: the <c>postit://</c> scheme is registered
+/// with the OS at install time and the browser is whatever the user
+/// has configured to open it.
+/// </summary>
+internal static class PlatformBootstrap
+{
+    private static int _initialized;
+
+    internal static void EnsureInitialized()
+    {
+        if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
+            return;
+
+        // Use the custom-scheme redirect on Desktop. Loopback is only
+        // a fallback for platforms that cannot register postit://
+        // (see Settings.DefaultLoopbackRedirectUri for that path).
+        Platform.DefaultRedirectUri = AuthenticationSettings.DefaultDesktopRedirectUri;
+        Platform.CustomScheme = "postit";
+    }
+}

src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj

@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
     <FileVersion>1.1.0.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+49.Branch.release-1.0.8-rc3.Sha.5274d7bdf5d14406748a2063b5ae15191aac4359</InformationalVersion>
+    <InformationalVersion>1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3</InformationalVersion>
     <Version>1.1.0-beta.1</Version>
   </PropertyGroup>
   <PropertyGroup>
@@ -24,4 +24,7 @@
   <ItemGroup>
     <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GitVersion.MsBuild" />
+  </ItemGroup>
 </Project>

src/PostIt/PostIt.Desktop/Program.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using Avalonia;
 using PostIt.Services;
 
@@ -12,6 +13,8 @@ sealed class Program
     [STAThread]
     public static void Main(string[] args)
     {
+        PlatformBootstrap.EnsureInitialized();
+
         // Short-circuit 2nd-instance launches (OS handing us the
         // postit://callback URL) BEFORE Avalonia spins up a window.
         // If we let Avalonia initialise, the new MainWindow flashes
@@ -66,6 +69,9 @@ sealed class Program
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
+#if DEBUG
+            .WithDeveloperTools()
+#endif
             .WithInterFont()
             .LogToTrace();
 }

src/PostIt/PostIt.Tests/AndroidAppLaunchTests.cs

@@ -1,72 +0,0 @@
-using System.Diagnostics;
-using Xamarin.UITest;
-
-namespace PostIt.Tests;
-
-/// <summary>
-/// Smoke test: launches the installed PostIt.Android app on the running
-/// emulator and waits for the first Avalonia frame to render. Reveals the
-/// "démarrage KO" bug — the test fails if Avalonia never draws a frame
-/// within the timeout.
-///
-/// Skip conditions: the package is not installed on the connected device,
-/// or no device is connected via adb.
-/// </summary>
-public class AndroidAppLaunchTests
-{
-    private const string PackageName = "fr.pschneider.postit";
-
-    private readonly ITestOutputHelper _output;
-
-    public AndroidAppLaunchTests(ITestOutputHelper output)
-    {
-        _output = output;
-    }
-
-    // https://twosixtech.com/blog/integrating-docker-and-adb/
-    // FIXME ala hosted shared resource adb server - [Fact]
-    public void PostIt_starts_and_draws_a_first_frame_on_the_emulator()
-    {
-        if (!IsPackageInstalledOnAnyDevice())
-        {
-            _output.WriteLine($"[skip] {PackageName} not installed on any device");
-            return;
-        }
-
-        _output.WriteLine($"[step] configuring app via InstalledApp({PackageName})");
-        var app = ConfigureApp.Android
-            .InstalledApp(PackageName)
-            .StartApp(Xamarin.UITest.Configuration.AppDataMode.DoNotClear);
-        _output.WriteLine("[step] app.StartApp returned, waiting for first frame");
-
-        app.WaitForElement(
-            e => e.Class("android.view.View"),
-            timeout: TimeSpan.FromSeconds(30));
-        _output.WriteLine("[step] first frame observed");
-    }
-
-    private static bool IsPackageInstalledOnAnyDevice()
-    {
-        try
-        {
-            var startInfo = new ProcessStartInfo("adb", "shell pm list packages")
-            {
-                RedirectStandardOutput = true,
-                RedirectStandardError = true,
-                UseShellExecute = false,
-                CreateNoWindow = true,
-            };
-            using var proc = Process.Start(startInfo);
-            if (proc is null) return false;
-            var stdout = proc.StandardOutput.ReadToEnd();
-            proc.WaitForExit(5000);
-            return stdout
-                .Split('\n', StringSplitOptions.RemoveEmptyEntries)
-                .Any(line => line.Trim().Equals($"package:{PackageName}", StringComparison.Ordinal));
-        }
-        catch
-        {
-            return false;
-        }
-    }
-}

src/PostIt/PostIt/App.axaml

@@ -1,15 +1,13 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:PostIt"
-             x:Class="PostIt.App"
+             x:Class="PostIt.App">
-             RequestedThemeVariant="Default">
-             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
-    <Application.DataTemplates>
+    <!-- ViewLocator is registered in App.axaml.cs with the real DI container. -->
-        <local:ViewLocator />
-    </Application.DataTemplates>
 
-     <Application.Styles>
+    <Application.Styles>
         <FluentTheme />
+            <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
+
     </Application.Styles>
 </Application>

src/PostIt/PostIt/App.axaml.cs

@@ -1,15 +1,16 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
-using Microsoft.Extensions.DependencyInjection;
 using PostIt.Services;
+using Yavsc.Api.Client;
 using PostIt.ViewModels;
 using PostIt.Views;
-using PostIt.Helpers;
 
 namespace PostIt;
 
@@ -26,8 +27,10 @@ public partial class App : Application
     /// <c>DataValidationErrors.SetErrors</c>.
     /// </summary>
     public IServiceProvider? ServiceProvider { get; private set; }
-
+    private MainWindow window;
-    public MainView? View { get; private set; }
+    public App()
+    {
+    }
 
     public override void Initialize()
     {
@@ -36,74 +39,197 @@ public partial class App : Application
 
     public override void OnFrameworkInitializationCompleted()
     {
+        // Belt-and-braces 2nd-instance guard. The primary check now
+        // lives in PostIt.Desktop.Program.Main and exits before
+        // Avalonia boots — preventing a flash of the MainWindow on
+        // every postit://callback launch. This block is kept for any
+        // entry point that bypasses Program.Main (PostIt.Browser,
+        // PostIt.Android's process lifecycle, ad-hoc tests that build
+        // App directly) and as defence-in-depth in case the Desktop
+        // build is ever reconfigured to skip the early check.
         if (TryHandOffCustomSchemeUrl()) return;
 
-        this.ServiceProvider = new ServiceCollection().BuildServices();
+        this.ServiceProvider = BuildServices(new ServiceCollection());
+        AttachServiceProvider(ServiceProvider);
         var settings = ServiceProvider.GetRequiredService<Settings>();
+        var sessionStatus = ServiceProvider.GetRequiredService<SessionStatusViewModel>();
+        var api = ServiceProvider.GetRequiredService<YavscApiClient>();
+
+        DataTemplates.Clear();
+        DataTemplates.Add(new ViewLocator(ServiceProvider));
+
+        // Wire the Settings singleton onto the SettingsPage singleton
+        // once, at composition time. The page is registered as a
+        // singleton (see above) precisely so this binding is stable
+        // for the lifetime of the app: every push to / pop from the
+        // navigation stack finds the same ContentPage with the same
+        // DataContext, and the TwoWay bindings inside the page keep
+        // mutating the same in-memory Settings instance that the rest
+        // of the app reads (OidcClientOptions construction, etc.).
+        ServiceProvider.GetRequiredService<SettingsPage>().DataContext = settings;
+
+        // Settings.DarkMode was previously a dead field: it round-
+        // tripped through the settings file and the SettingsPage
+        // CheckBox, but no consumer ever read it. Wire it here to
+        // Application.RequestedThemeVariant so the toggle takes
+        // effect immediately, and seed the initial theme from the
+        // value Load() just populated (so a dark-mode user lands on
+        // a dark window on first launch, not on a default-light
+        // window that flips after the user touches the toggle).
+        ApplyDarkMode(settings);
+        settings.PropertyChanged += (_, e) =>
+        {
+            if (e.PropertyName == nameof(Settings.DarkMode))
+            {
+                ApplyDarkMode(settings);
+            }
+        };
 
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            var window = ServiceProvider.GetRequiredService<MainWindow>();
+            var homeVm = ServiceProvider.GetRequiredService<HomePageViewModel>();
+
+            window = new MainWindow();
+            window.SessionBanner.DataContext = sessionStatus;
+
+            // Build the navigation stack from scratch: HomePage is the
+            // root in both cases. App.BootAsync will push MainPage on
+            // top if the silent refresh succeeds.
             desktop.MainWindow = window;
-            var api = ServiceProvider!.GetRequiredService<YavscApiClient>();
+            _ = PushPageAsync(homeVm);
-            desktop.MainWindow.Opened += async (_, _) => await BootAsync(this.ServiceProvider!, api);
-            View = window.MainView;
-            this.ConfigureRootView(window.MainView);
 
-            ApplyDarkMode(settings);
+            // When the user logs out, route back to HomePage. We
-        }
+            // ReplaceAsync the current top so we don't grow the stack
-        else if (ApplicationLifetime is IActivityApplicationLifetime singleViewFactoryApplicationLifetime)
+            // on every logout — otherwise repeated login/logout would
-        {
+            // eventually balloon the back history.
-            singleViewFactoryApplicationLifetime.MainViewFactory =
+            sessionStatus.LogoutCompleted += () =>
-                () =>
+            {
-                {
+                var w = (MainWindow)((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime!).MainWindow!;
-                    View = ServiceProvider.GetRequiredService<MainView>();
+                var nav = w.NavRoot;
-                    this.ConfigureRootView(View);
+                _ = nav.PopToRootAsync();
-                    ApplyDarkMode(settings);
+            };
-                    return View;
-                };
-        }
-        else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
-        {
-            singleViewPlatform.MainView = View = ServiceProvider.GetRequiredService<MainView>();
-            ConfigureRootView(View);
-            ApplyDarkMode(settings);
-        }
 
-        base.OnFrameworkInitializationCompleted();
+            // When the user signs in interactively (Login button on
+            // the session banner), push MainPage on top of HomePage.
+            sessionStatus.LoginSucceeded += () =>
+            {
+                var w = (MainWindow)((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime!).MainWindow!;
+                _ = PushMainPageAsync();
+            };
+
+            window.Opened += async (_, _) => await BootAsync(this.ServiceProvider, api);
+        }
+        else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
+        {
+            singleView.MainView = new MainWindow
+            {
+                DataContext = ServiceProvider.GetRequiredService<HomePageViewModel>()
+            };
+        }
     }
 
-private void ConfigureRootView(MainView rootView)
+    /// <summary>
-{
+    /// Build the DI container the app uses. Pulled out of
-    var api = ServiceProvider!.GetRequiredService<YavscApiClient>();
+    /// <see cref="OnFrameworkInitializationCompleted"/> so headless
-
+    /// tests can construct the same container at <c>TestApp</c> boot
-    // Déclencher le Boot lors du chargement du contrôle à l'écran
+    /// without going through the full Avalonia desktop lifetime
-    rootView.AttachedToVisualTree += async (_, _) => await BootAsync(this.ServiceProvider!, api);
+    /// (which never runs in a unit test). The container returned is
-
+    /// the exact one production uses — no test-only fakes, no
-    var sessionStatus = ServiceProvider!.GetRequiredService<SessionStatusViewModel>();
+    /// trimmed service list — so a test that exercises a VM, page,
-    sessionStatus.LogoutCompleted += () =>
+    /// or service resolves through the same wiring the real app
+    /// does, and a green test is a green contract for prod.
+    /// </summary>
+    internal static IServiceProvider BuildServices(ServiceCollection services)
     {
-        // Remplacer Window.NavRoot par rootView.NavRoot
+        var settings = new Settings();
-        rootView.NavRoot.PopToRootAsync();
+        settings.Load();
-    };
 
-    sessionStatus.LoginSucceeded += async () =>
+        var tokenStore = new TokenStore(System.IO.Path.Combine(
-    {
+            System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData),
-        await PushMainPageAsync();
+            "PostIt", "tokens.json"));
-    };
 
-    rootView.SessionBanner.DataContext = sessionStatus;
+        var api = new YavscApiClient(settings, tokenStore);
-}
+        var client = new BlogApiClient(api, settings.BlogsApiUrl);
+        var circleClient = new CircleApiClient(api, settings.BlogsApiUrl);
+        var blogAclClient = new BlogAclApiClient(api, settings.BlogsApiUrl);
+        var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl);
+        var contactService = new ContactService();
+        var userDirectory = new UserDirectory(userSearchClient);
+
+
+        // Vues
+        services.AddTransient<MainPage>();
+        // SettingsPage is a singleton: there must be one and only one
+        // instance of the settings UI for the lifetime of the app.
+        // This guarantees that (a) the bindings always reflect the
+        // current in-memory Settings state, (b) the page already has
+        // its DataContext wired up at composition-root time (see
+        // below), and (c) PushPageAsync's anti-empilement guard sees
+        // the same instance across pushes, so a second Settings tap
+        // is a no-op rather than re-pushing the page. Transient would
+        // let the user accumulate stale SettingsPage instances on
+        // the navigation stack, each bound to a fresh
+        // SettingsViewModel and missing any in-flight edits.
+        services.AddSingleton<SettingsPage>();
+        services.AddTransient<HomePage>();
+        services.AddTransient<SignaturePage>();
+        services.AddTransient<CirclesPage>();
+        // Dialogs (modal-light pages): the ViewLocator resolves
+        // them when a caller pushes a PostAclDialogViewModel or
+        // AddCircleMemberDialogViewModel via App.PushPageAsync.
+        // App.PushPageAsync overwrites the page's DataContext with
+        // the caller-built VM, so the parameterless ctor is enough
+        // here — the parametrised ctors stay for direct test wiring.
+        services.AddTransient<PostAclDialog>();
+        services.AddTransient<AddCircleMemberDialog>();
+        // ViewModels
+        services.AddSingleton(settings);
+        services.AddSingleton<YavscApiClient>(api);
+        services.AddSingleton<IYavscApiClient>(api);
+        services.AddSingleton(client);
+        services.AddSingleton(circleClient);
+        services.AddSingleton(blogAclClient);
+        services.AddSingleton(userSearchClient);
+        services.AddSingleton<IContactService>(contactService);
+        services.AddSingleton<IUserDirectory>(userDirectory);
+        services.AddTransient<MainPageViewModel>();
+        services.AddTransient<HomePageViewModel>();
+        services.AddTransient<SignaturePageViewModel>();
+        services.AddTransient<CirclesPageViewModel>();
+
+        // Persistent session banner: one instance for the lifetime of
+        // the app so the same VM survives page navigation.
+        var sessionStatus = new SessionStatusViewModel { Api = api };
+        sessionStatus.Refresh();
+        services.AddSingleton(sessionStatus);
+        services.AddTransient<SessionStatusBanner>();
+
+        return services.BuildServiceProvider();
+    }
 
     /// <summary>
-    /// Test-only hook: bind a concrete <see cref="MainView"/> so
+    /// Attach a pre-built DI container to this <see cref="App"/>
+    /// instance. Used by headless tests after
+    /// <see cref="BuildServices"/>; in production this happens
+    /// implicitly via <see cref="OnFrameworkInitializationCompleted"/>.
+    /// Idempotent w.r.t. <see cref="Settings.BindToServiceProvider"/>:
+    /// re-binding from a second App boot is a no-op.
+    /// </summary>
+    internal void AttachServiceProvider(IServiceProvider sp)
+    {
+        ServiceProvider = sp;
+        Settings.BindToServiceProvider(sp);
+    }
+
+    /// <summary>
+    /// Test-only hook: bind a concrete <see cref="MainWindow"/> so
     /// command-driven navigation paths (<see cref="PushPage"/>) can
     /// push onto a real <see cref="NavigationPage"/> in headless
     /// fixtures that do not run the full desktop lifetime bootstrap.
     /// </summary>
-    internal void AttachMainWindow(MainView mainView)
+    internal void AttachMainWindow(MainWindow mainWindow)
     {
-        View = mainView ?? throw new ArgumentNullException(nameof(mainView));
+        window = mainWindow ?? throw new ArgumentNullException(nameof(mainWindow));
     }
 
     private static void ApplyDarkMode(Settings settings)
@@ -127,9 +253,6 @@ private void ConfigureRootView(MainView rootView)
         var refreshed = await api.TrySilentLoginAsync().ConfigureAwait(true);
         var sessionStatus = provider.GetRequiredService<SessionStatusViewModel>();
         sessionStatus.Refresh();
-        var homePage = provider.GetRequiredService<HomePageViewModel>();
-        var app = (App)Current!;
-        await app.PushPageAsync(homePage);
         if (!refreshed) return;
 
         await PushMainPageAsync().ConfigureAwait(true);
@@ -143,11 +266,11 @@ private void ConfigureRootView(MainView rootView)
     /// (interactive login from the banner). Pulled out as a helper so
     /// the two callers can't drift apart.
     /// </summary>
-    public static async Task PushMainPageAsync()
+    public static Task PushMainPageAsync()
     {
-        var app = (App)Current!;
+        var app = (App)Current;
-        var mainVm = app.ServiceProvider!.GetRequiredService<MainViewModel>();
+        var mainVm = app.ServiceProvider.GetRequiredService<MainPageViewModel>();
-        await app.PushPageAsync(mainVm);
+        return app.PushPageAsync(mainVm);
     }
 
     private bool TryHandOffCustomSchemeUrl()
@@ -182,8 +305,53 @@ private void ConfigureRootView(MainView rootView)
         return true;
     }
 
+    internal void PushPage(ViewModelBase vm)
+    {
+        _ = PushPageAsync(vm);
+    }
+
+    internal Task PushPageAsync(ViewModelBase vm)
+    {
+        if (window is null)
+        {
+            throw new InvalidOperationException("MainWindow is not initialized yet.");
+        }
+
+        var template = DataTemplates.FirstOrDefault(t => t.Match(vm));
+        if (template is null)
+        {
+            throw new InvalidOperationException($"No IDataTemplate found for {vm.GetType().Name}.");
+        }
+
+        var view = template.Build(vm);
+        if (view is null)
+        {
+            throw new InvalidOperationException(
+                $"Template for {vm.GetType().Name} returned <null>.");
+        }
+
+        var page = view as Page;
+        if (page is null)
+        {
+            // NavigationPage expects Page instances. Wrap any fallback control
+            // (e.g. ViewLocator error TextBlock) into a ContentPage so it can render.
+            page = new ContentPage { Content = view };
+        }
+
+        page.DataContext = vm;
+
+        // Avoid stacking the same singleton page twice (e.g. SettingsPage).
+        var stack = window.NavRoot.NavigationStack;
+        if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page))
+        {
+            return Task.CompletedTask;
+        }
+
+        return window.NavRoot.PushAsync(page);
+    }
+
     internal async Task GoBackAsync()
     {
-        await View!.NavRoot.PopAsync();
+        await window.NavRoot.PopAsync();
     }
 }

src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs

@@ -1,78 +0,0 @@
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using PostIt.Services;
-using PostIt.ViewModels;
-using PostIt.Views;
-using Yavsc.Api.Client;
-
-namespace PostIt.Helpers;
-
-public static class ServiceCollectionHelpers
-{
-    public static IServiceProvider BuildServices(this ServiceCollection services)
-    {
-        var settings = new Settings();
-        settings.Load();
-
-        var tokenStore = new TokenStore(System.IO.Path.Combine(
-            System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData),
-            "PostIt", "tokens.json"));
-
-        var api = new YavscApiClient(settings, tokenStore);
-        var client = new BlogApiClient(api, settings.BlogsApiUrl);
-        var circleClient = new CircleApiClient(api, settings.BlogsApiUrl);
-        var blogAclClient = new BlogAclApiClient(api, settings.BlogsApiUrl);
-        var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl);
-        var userDirectory = new UserDirectory(userSearchClient);
-
-        // Vues
-        services.AddSingleton<MainView>();
-        services.AddSingleton<MainPage>();
-        services.AddSingleton<MainWindow>();
-
-        // SettingsPage is a singleton: there must be one and only one
-        // instance of the settings UI for the lifetime of the app.
-        // This guarantees that (a) the bindings always reflect the
-        // current in-memory Settings state, (b) the page already has
-        // its DataContext wired up at composition-root time (see
-        // below), and (c) PushPageAsync's anti-empilement guard sees
-        // the same instance across pushes, so a second Settings tap
-        // is a no-op rather than re-pushing the page. Transient would
-        // let the user accumulate stale SettingsPage instances on
-        // the navigation stack, each bound to a fresh
-        // SettingsViewModel and missing any in-flight edits.
-        services.AddSingleton<SettingsPage>();
-        services.AddTransient<HomePage>();
-        services.AddTransient<SignaturePage>();
-        services.AddTransient<CirclesPage>();
-        // Dialogs (modal-light pages): the ViewLocator resolves
-        // them when a caller pushes a PostAclDialogViewModel or
-        // AddCircleMemberDialogViewModel via App.PushPageAsync.
-        // App.PushPageAsync overwrites the page's DataContext with
-        // the caller-built VM, so the parameterless ctor is enough
-        // here — the parametrised ctors stay for direct test wiring.
-        services.AddTransient<PostAclDialog>();
-        services.AddTransient<AddCircleMemberDialog>();
-        // ViewModels
-        services.AddSingleton(settings);
-        services.AddSingleton<YavscApiClient>(api);
-        services.AddSingleton(client);
-        services.AddSingleton(circleClient);
-        services.AddSingleton(blogAclClient);
-        services.AddSingleton(userSearchClient);
-        services.AddSingleton<IUserDirectory>(userDirectory);
-        services.AddTransient<MainViewModel>();
-        services.AddTransient<HomePageViewModel>();
-        services.AddTransient<SignaturePageViewModel>();
-        services.AddTransient<CirclesPageViewModel>();
-
-        // Persistent session banner: one instance for the lifetime of
-        // the app so the same VM survives page navigation.
-        var sessionStatus = new SessionStatusViewModel { Api = api };
-        sessionStatus.Refresh();
-        services.AddSingleton(sessionStatus);
-        services.AddTransient<SessionStatusBanner>();
-
-        return services.BuildServiceProvider();
-    }
-}

src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using PostIt.ViewModels;
-
-namespace PostIt.Helpers;
-
-public static class ViewModelBaseHelpers
-{
-    public static async Task PushPageAsync(this App app, ViewModelBase vm)
-    {
-        var window = app.View;
-        if (window is null)
-        {
-            throw new InvalidOperationException("MainWindow is not initialized yet.");
-        }
-
-        var template = app.DataTemplates.FirstOrDefault(t => t.Match(vm));
-        if (template is null)
-        {
-            throw new InvalidOperationException($"No IDataTemplate found for {vm.GetType().Name}.");
-        }
-
-        var view = template.Build(vm);
-        if (view is null)
-        {
-            throw new InvalidOperationException(
-                $"Template for {vm.GetType().Name} returned <null>.");
-        }
-
-        var page = view as Page;
-        if (page is null)
-        {
-            // NavigationPage expects Page instances. Wrap any fallback control
-            // (e.g. ViewLocator error TextBlock) into a ContentPage so it can render.
-            page = new ContentPage { Content = view };
-        }
-
-        page.DataContext = vm;
-
-        // Avoid stacking the same singleton page twice (e.g. SettingsPage).
-        var stack = window.NavRoot.NavigationStack;
-        if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page))
-        {
-            return;
-        }
-
-        await window.NavRoot.PushAsync(page);
-    }
-}

src/PostIt/PostIt/PostIt.csproj

@@ -1,14 +1,32 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    <AssemblyVersion>1.1.0.0</AssemblyVersion>
+    <FileVersion>1.1.0.0</FileVersion>
+    <InformationalVersion>1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3</InformationalVersion>
+    <Version>1.1.0-beta.1</Version>
   </PropertyGroup>
-
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
-
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Avalonia.Fonts.Inter" />
+    <PackageReference Include="Avalonia.AvaloniaEdit" />
+    <PackageReference Include="AvaloniaUI.DiagnosticsSupport">
+      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
+      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="CommunityToolkit.Mvvm" />
+    <PackageReference Include="IdentityModel.OidcClient" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <ProjectReference Include="../../Yavsc.Abstract/Yavsc.Abstract.csproj" />
+    <ProjectReference Include="../../Yavsc.Api.Client/Yavsc.Api.Client.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <Content Include="postit-settings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -20,20 +38,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" />
+    <PackageReference Include="GitVersion.MsBuild" />
-    <PackageReference Include="Avalonia.Themes.Fluent" />
-    <PackageReference Include="Avalonia.Fonts.Inter" />
-    <PackageReference Include="AvaloniaUI.DiagnosticsSupport">
-      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
-      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="IdentityModel.OidcClient" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../Yavsc.Abstract/Yavsc.Abstract.csproj" />
-    <ProjectReference Include="../../Yavsc.Api.Client/Yavsc.Api.Client.csproj" />
   </ItemGroup>
 </Project>

src/PostIt/PostIt/Services/ContactService.Desktop.cs

@@ -0,0 +1,36 @@
+#if !ANDROID && !IOS
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PostIt.Services;
+
+/// <summary>
+/// Desktop stub for <see cref="IContactService"/>.
+///
+/// <para>The desktop has no equivalent of the mobile address
+/// book (no <c>Contacts.Default</c>, no CardDAV out of the
+/// box). Rather than synthesise a list from a different
+/// source, this provider returns an empty list and lets the
+/// UI render an honest "no local contacts on this platform"
+/// message.</para>
+///
+/// <para>If desktop users want to invite people who aren't
+/// Yavsc members, that flow goes through a separate path
+/// (manual email entry + invitation endpoint) — not through
+/// <see cref="IContactService"/>. Finding existing Yavsc
+/// members is <see cref="IUserDirectory"/>'s job, not this
+/// one's.</para>
+///
+/// <para>Future CardDAV / Google Contacts / Exchange
+/// providers can plug in here as additional
+/// <see cref="IContactService"/> implementations selected
+/// from DI by configuration.</para>
+/// </summary>
+public sealed class ContactService : IContactService
+{
+    public Task<IReadOnlyList<ContactDto>> GetDeviceContactsAsync(CancellationToken ct = default)
+        => Task.FromResult<IReadOnlyList<ContactDto>>(Array.Empty<ContactDto>());
+}
+#endif

src/PostIt/PostIt/Services/Platform.cs

@@ -21,14 +21,14 @@ public static class Platform
     /// override this property at startup (e.g. PostIt.Android sets
     /// it to <c>android://postit-signin</c>).
     /// </summary>
-    public const string RedirectUri = "postit://callback";
+    public static string DefaultRedirectUri { get; set; } = "postit://callback";
 
     /// <summary>
     /// Scheme prefix the <see cref="CustomSchemeBrowser"/> matches
     /// against <c>BrowserOptions.EndUrl</c>. Overridable for apps
     /// that want to register their own scheme.
     /// </summary>
-    public const string CustomScheme = "postit";
+    public static string CustomScheme { get; set; } = "postit";
 
     /// <summary>
     /// Constructs a fresh <see cref="IBrowser"/> for the running platform.

src/PostIt/PostIt/Services/YavscApiClient.cs

@@ -3,6 +3,7 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
+using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;

src/PostIt/PostIt/Settings/AuthenticationSettings.cs

@@ -10,7 +10,7 @@ public partial class AuthenticationSettings : ObservableObject
     /// hand-off in <see cref="PostIt.Services.SingleInstance"/>
     /// (RFC 8252 §7.1). Production Desktop builds use this.
     /// </summary>
-    public const string DesktopRedirectUri = "postit://callback";
+    public const string DefaultDesktopRedirectUri = "postit://callback";
 
     /// <summary>
     /// Redirect URI used by the Android app. The corresponding IntentFilter
@@ -21,9 +21,6 @@ public partial class AuthenticationSettings : ObservableObject
     public static string DefaultAuthority { get; internal set; } = "https://yavsc.pschneider.fr";
 
     public static string DefaultClientId { get; internal set; } = "postit";
-
-    public static string[] DefaultScopes { get; set; } = { "blogs"} ;
-
     [ObservableProperty]
     public partial string Authority { get; set; }
 
@@ -34,19 +31,15 @@ public partial class AuthenticationSettings : ObservableObject
     [ObservableProperty]
     public partial string[] Scopes { get; set; }
 
+
     /// <summary>
-    /// OAuth redirect URI. Defaults to <see cref="DesktopRedirectUri"/>
+    /// OAuth redirect URI. Defaults to <see cref="DefaultDesktopRedirectUri"/>
     /// (custom URI scheme) which is the right answer for desktop
     /// production builds. Mobile platforms must set this to
     /// <see cref="AndroidRedirectUri"/> before calling <c>LoginAsync</c>.
     /// </summary>
     [ObservableProperty]
-    public partial string RedirectUri { get; set; }
+    public partial string RedirectUri { get; set; } = DefaultDesktopRedirectUri;
-#if ANDROID
-    = AndroidRedirectUri;
-#else
-    = DesktopRedirectUri;
-#endif
 
     /// <summary>
     /// Space-separated view of <see cref="Scopes"/>. Exists for the

src/PostIt/PostIt/ViewLocator.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,13 +10,17 @@ namespace PostIt;
 /// <summary>
 /// Given a view model, returns the corresponding view if possible.
 /// </summary>
-[RequiresUnreferencedCode(
+
-    "Default implementation of ViewLocator involves reflection which may be trimmed away.",
-    Url = "https://docs.avaloniaui.net/docs/concepts/view-locator")]
 public class ViewLocator : IDataTemplate
 {
+     private readonly IServiceProvider _services;
 
-     public Control Build(object? data)
+    public ViewLocator(IServiceProvider services)
+    {
+        _services = services;
+    }
+
+    public Control Build(object? data)
     {
         try
         {
@@ -29,24 +32,21 @@ public class ViewLocator : IDataTemplate
         }
     }
 
-
     private Control BuildCore(object? data)
     {
-        var app = App.Current as App;
-        var services = app!.ServiceProvider!;
         return data switch
         {
-            MainViewModel => services.GetRequiredService<MainPage>(),
+            MainPageViewModel => _services.GetRequiredService<MainPage>(),
-            Settings => services.GetRequiredService<SettingsPage>(),
+            Settings => _services.GetRequiredService<SettingsPage>(),
-            HomePageViewModel => services.GetRequiredService<HomePage>(),
+            HomePageViewModel => _services.GetRequiredService<HomePage>(),
-            SignaturePageViewModel => services.GetRequiredService<SignaturePage>(),
+            SignaturePageViewModel => _services.GetRequiredService<SignaturePage>(),
-            AddCircleMemberDialogViewModel => services.GetRequiredService<AddCircleMemberDialog>(),
+            AddCircleMemberDialogViewModel => _services.GetRequiredService<AddCircleMemberDialog>(),
-            CirclesPageViewModel => services.GetRequiredService<CirclesPage>(),
+            CirclesPageViewModel => _services.GetRequiredService<CirclesPage>(),
-            PostAclDialogViewModel => services.GetRequiredService<PostAclDialog>(),
+            PostAclDialogViewModel => _services.GetRequiredService<PostAclDialog>(),
             null => new TextBlock { Text = "No view for <null>" },
             _ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
         };
     }
 
-     public bool Match(object? data) => data is ViewModelBase;
+    public bool Match(object? data) => data is ViewModelBase;
 }

src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using PostIt.Services;
+using PostIt.Views;
 using Yavsc.Api.Client;
 
 namespace PostIt.ViewModels;

src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs

@@ -5,7 +5,6 @@ using Avalonia;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
-using PostIt.Helpers;
 using PostIt.Services;
 using Yavsc.Api.Client;
 using Yavsc.Api.Client.Dtos;

src/PostIt/PostIt/ViewModels/HomePageViewModel.cs

@@ -1,4 +1,6 @@
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.DependencyInjection;
+using PostIt;
 using PostIt.Services;
 namespace PostIt.ViewModels;
 

src/PostIt/PostIt/ViewModels/MainPageViewModel.cs

@@ -8,11 +8,12 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
 using Yavsc.Blogspot;
 using Yavsc.Api.Client;
-using PostIt.Helpers;
+using PostIt.Services;
+using PostIt.Views;
 
 namespace PostIt.ViewModels;
 
-public partial class MainViewModel : ViewModelBase
+public partial class MainPageViewModel : ViewModelBase
 {
     /// <summary>Window/tab title. Cosmetic — bound by
     /// <c>MainPage.axaml</c> if at all. Not the post title.</summary>
@@ -121,10 +122,10 @@ public partial class MainViewModel : ViewModelBase
     }
 
 
-    public MainViewModel()
+    public MainPageViewModel()
     {
+        Init(null);
         SettingsModel = new Settings();
-        Init(SettingsModel);
         BlogClient = null;
     }
 
@@ -136,11 +137,6 @@ public partial class MainViewModel : ViewModelBase
         SelectedPost = null;
         IsBusy = false;
         StatusMessage = "Ready";
-        Settings = settings ?? new Settings();
-        WindowTitle = "PostIt";
-        DraftTitle = string.Empty;
-        DraftArticle = string.Empty;
-        DraftIsPublished = false;
         // Production path: DI injects the canonical Settings singleton
         // and we use it as-is. Test path: tests call this constructor
         // without a Settings argument; we fall back to a fresh
@@ -151,7 +147,11 @@ public partial class MainViewModel : ViewModelBase
         // sink; that crash is fixed in Settings.OnPropertyChanged
         // (thread-safe dispatcher marshalling) so the duplicate
         // instance is now merely wasteful, not dangerous.
-
+        Settings = settings ?? new Settings();
+        WindowTitle = "PostIt";
+        DraftTitle = string.Empty;
+        DraftArticle = string.Empty;
+        DraftIsPublished = false;
     }
 
     /// <summary>Save is enabled as soon as the user has typed
@@ -171,11 +171,12 @@ public partial class MainViewModel : ViewModelBase
     /// <see cref="BlogApiClient"/>. Production code uses the
     /// (Settings, BlogApiClient) overload below.
     /// </summary>
-    public MainViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
+    public MainPageViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
     {
         SettingsModel = new Settings();
         BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient)); ;
         Services = services;
+
         Init(settings);
     }
 
@@ -211,7 +212,7 @@ public partial class MainViewModel : ViewModelBase
     {
         await ExecuteAsync(async () =>
         {
-            var posts = await BlogClient!.GetPostsAsync();
+            var posts = await BlogClient.GetPostsAsync();
             Posts.Clear();
             foreach (var post in posts.OrderByDescending(p => p.DateModified))
             {
@@ -260,7 +261,7 @@ public partial class MainViewModel : ViewModelBase
                     DateCreated = DateTime.UtcNow,
                     DateModified = DateTime.UtcNow,
                 };
-                var created = await BlogClient!.CreatePostAsync(draft);
+                var created = await BlogClient.CreatePostAsync(draft);
                 if (created is not null)
                 {
                     SelectedPost = created;
@@ -279,7 +280,7 @@ public partial class MainViewModel : ViewModelBase
                     DateCreated = SelectedPost.DateCreated,
                     DateModified = DateTime.UtcNow,
                 };
-                await BlogClient!.UpdatePostAsync(SelectedPost.Id, update);
+                await BlogClient.UpdatePostAsync(SelectedPost.Id, update);
                 StatusMessage = $"Saved post {SelectedPost.Id}.";
             }
 
@@ -298,7 +299,7 @@ public partial class MainViewModel : ViewModelBase
 
         await ExecuteAsync(async () =>
         {
-            await BlogClient!.DeletePostAsync(SelectedPost.Id);
+            await BlogClient.DeletePostAsync(SelectedPost.Id);
             StatusMessage = $"Deleted post {SelectedPost.Id}.";
             SelectedPost = null;
             await RefreshPostsAsync();
@@ -332,7 +333,7 @@ public partial class MainViewModel : ViewModelBase
         await ExecuteAsync(async () =>
         {
             var desired = !DraftIsPublished;
-            await BlogClient!.SetPublishAsync(SelectedPost.Id, desired);
+            await BlogClient.SetPublishAsync(SelectedPost.Id, desired);
             DraftIsPublished = desired;
             // Mirror into the selected post so a subsequent
             // RefreshPostsAsync() doesn't blow away the
@@ -373,7 +374,7 @@ public partial class MainViewModel : ViewModelBase
 
     private async Task RefreshPostsAsync()
     {
-        var posts = await BlogClient!.GetPostsAsync();
+        var posts = await BlogClient.GetPostsAsync();
         Posts.Clear();
         foreach (var post in posts.OrderByDescending(p => p.DateModified))
         {

src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs

@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
-using PostIt.Helpers;
 using PostIt.Services;
 
 namespace PostIt.ViewModels;
@@ -140,7 +139,7 @@ public partial class SessionStatusViewModel : ViewModelBase
     internal async Task OpenSettings()
     {
         var app = (App)App.Current!;
-        await app.PushPageAsync(app.ServiceProvider!.GetRequiredService<Settings>()).ConfigureAwait(true);
+        await app.PushPageAsync(app.ServiceProvider.GetRequiredService<Settings>()).ConfigureAwait(true);
     }
 
 }

src/PostIt/PostIt/ViewModels/Settings.cs

@@ -2,11 +2,13 @@ using System.Runtime.CompilerServices;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using IdentityModel.OidcClient;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Text.Json;
+using System.Threading;
 
 [assembly: InternalsVisibleTo("PostIt.Tests")]
 
@@ -16,6 +18,70 @@ public partial class Settings : ViewModelBase
 {
     const string SettingsFileName = "postit-settings.json";
 
+    /// <summary>
+    /// Redirect URI used by the Android app. The corresponding IntentFilter
+    /// in <c>PostIt.Android/Properties/AndroidManifest.xml</c> must match.
+    /// </summary>
+    public const string AndroidRedirectUri = "android://postit-signin";
+
+
+
+    /// <summary>
+    /// Process-wide canonical <see cref="Settings"/> instance, wired up
+    /// at application boot by <see cref="App.OnFrameworkInitializationCompleted"/>
+    /// through <see cref="BindToServiceProvider"/>. The hybrid pattern:
+    /// <list type="bullet">
+    ///   <item><description>The static <c>Current</c> reference gives
+    ///   ViewModels a non-DI way to reach the same instance (and lets
+    ///   the framework bindings push notifications through one stable
+    ///   <see cref="ObservableObject"/>).</description></item>
+    ///   <item><description>Tests that want to exercise a clean
+    ///   instance still call <c>new Settings()</c>; <c>Current</c>
+    ///   stays null in those contexts because <see cref="BindToServiceProvider"/>
+    ///   is never invoked.</description></item>
+    ///   <item><description>Reads (<see cref="GetCurrent"/>) are
+    ///   thread-safe and never allocate; mutations always go through
+    ///   the DI-resolved singleton so two threads cannot each register
+    ///   a different "current" Settings.</description></item>
+    /// </list>
+    /// </summary>
+    private static Settings? s_current;
+
+    /// <summary>
+    /// Wire the canonical Settings instance to a DI container. Called
+    /// exactly once from <c>App.axaml.cs</c> after the singleton has
+    /// been registered. Subsequent calls are no-ops: the DI container
+    /// owns the instance lifetime and we don't want a stray
+    /// <c>BindToServiceProvider</c> in a test fixture to silently
+    /// rebind the production instance.
+    /// </summary>
+    public static void BindToServiceProvider(IServiceProvider services)
+    {
+        if (services is null) throw new ArgumentNullException(nameof(services));
+        Interlocked.CompareExchange(ref s_current,
+            services.GetService<Settings>() ?? throw new InvalidOperationException(
+                "Settings is not registered in the DI container."),
+            null);
+    }
+
+    /// <summary>
+    /// Returns the canonical Settings instance previously bound through
+    /// <see cref="BindToServiceProvider"/>, or <c>null</c> when called
+    /// outside a running Avalonia application (tests, CLI tools).
+    /// </summary>
+    public static Settings? GetCurrent() => Volatile.Read(ref s_current);
+
+    /// <summary>
+    /// Resolve the canonical Settings instance or throw. Use this in
+    /// production code paths that must not silently fall back to a
+    /// freshly-constructed <see cref="Settings"/> (which used to be
+    /// the root cause of the postit://callback crash: two Settings
+    /// instances racing on PropertyChanged from different threads).
+    /// </summary>
+    public static Settings RequireCurrent() =>
+        GetCurrent() ?? throw new InvalidOperationException(
+            "Settings.Current is not bound. Call App.OnFrameworkInitializationCompleted first.");
+
     [ObservableProperty]
     public partial AuthenticationSettings Authentication { get; set; } = new();
 
@@ -33,7 +99,7 @@ public partial class Settings : ViewModelBase
     /// setters above all funnel through here, and we flip
     /// <see cref="IsDirty"/> in lock-step. Sub-property mutations
     /// (e.g. <c>Authentication.Authority</c>) are caught by the
-    /// subscription wired up in
+    /// subscription wired up in <see cref="OnAuthenticationChanged"/>
     /// below. <see cref="ApplyJson"/> disables the flag during bulk
     /// hydration so the disk load itself does not count as a user
     /// edit.
@@ -284,14 +350,15 @@ public partial class Settings : ViewModelBase
             var settings = JsonSerializer.Deserialize<Settings>(json);
             if (settings is null)
             {
-                UseDefaultSettings();
+                Console.Error.WriteLine($"🩎 Settings payload is invalid (source: {source}).");
+                return;
             }
             // Apply under the gate so concurrent Load() callers cannot
             // see half the new values / half the old ones. The actual
             // PropertyChanged fan-out is handled by [ObservableProperty]'s
             // setters which we route through SetProperty → OnPropertyChanged
             // → our overridden dispatcher-safe marshaller below.
-            else lock (_mutationGate)
+            lock (_mutationGate)
             {
                 this.Authentication = settings.Authentication;
                 this.DarkMode = settings.DarkMode;
@@ -303,12 +370,7 @@ public partial class Settings : ViewModelBase
                     this.Authentication.ClientId = string.IsNullOrWhiteSpace(settings.Authentication.ClientId) ?
                      AuthenticationSettings.DefaultClientId : settings.Authentication.ClientId;
                     this.Authentication.RedirectUri = string.IsNullOrWhiteSpace(settings.Authentication.RedirectUri) ?
-                     AuthenticationSettings.DesktopRedirectUri : settings.Authentication.RedirectUri;
+                     AuthenticationSettings.DefaultDesktopRedirectUri : settings.Authentication.RedirectUri;
-                    if (settings.Authentication.Scopes is null || settings.Authentication.Scopes.Length == 0)
-                    {
-                        settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
-                    }
-                    else
                     this.Authentication.Scopes = settings.Authentication.Scopes;
                 }
             }
@@ -338,18 +400,6 @@ public partial class Settings : ViewModelBase
         }
     }
 
-    private void UseDefaultSettings()
-    {
-        this.Authentication = new AuthenticationSettings
-        {
-            Authority = AuthenticationSettings.DefaultAuthority,
-            ClientId = AuthenticationSettings.DefaultClientId,
-            RedirectUri = AuthenticationSettings.DesktopRedirectUri,
-            Scopes = AuthenticationSettings.DefaultScopes
-        };
-        this.DarkMode = false;
-    }
-
     /// <summary>
     /// Persist the current in-memory state to
     /// <c>~/.config/PostIt/postit-settings.json</c> (Linux) /

src/PostIt/PostIt/ViewModels/ViewModelBase.cs

@@ -1,10 +1,12 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using Avalonia.Styling;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace PostIt.ViewModels;
 
 public abstract partial class ViewModelBase : ObservableObject
 {
-     /// <summary>
+    
+    /// <summary>
     /// Gets if the user can navigate to the next page
     /// </summary>
     public abstract bool CanNavigateNext { get; protected set; }

src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml.cs

@@ -1,10 +1,9 @@
-
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using PostIt.Services;
 using PostIt.ViewModels;
-using System.Threading.Tasks;
 
 namespace PostIt.Views;
 
@@ -20,7 +19,7 @@ namespace PostIt.Views;
 /// circle id. The dialog itself does not know the circle id
 /// by design.</para>
 /// </summary>
-public partial class AddCircleMemberDialog : Avalonia.Controls.ContentPage
+public partial class AddCircleMemberDialog : ContentPage
 {
     public AddCircleMemberDialog()
     {
@@ -42,9 +41,10 @@ public partial class AddCircleMemberDialog : Avalonia.Controls.ContentPage
     public AddCircleMemberDialogViewModel? ViewModel
         => DataContext as AddCircleMemberDialogViewModel;
 
-    private async Task OnCloseClicked(object? sender, RoutedEventArgs e)
+    private void OnCloseClicked(object? sender, RoutedEventArgs e)
     {
-        App app = App.Current! as App;
+        var nav = this.FindAncestorOfType<NavigationPage>();
-        await app!.GoBackAsync();
+        if (nav is not null)
+            _ = nav.PopAsync();
     }
 }

src/PostIt/PostIt/Views/CirclesPage.axaml.cs

@@ -1,5 +1,10 @@
+using System;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Microsoft.Extensions.DependencyInjection;
+using PostIt.Services;
+using PostIt.ViewModels;
 
 namespace PostIt.Views;
 

src/PostIt/PostIt/Views/MainPage.axaml

@@ -8,11 +8,11 @@
              xmlns:AvaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
              mc:Ignorable="d"
              x:Class="PostIt.Views.MainPage"
-             x:DataType="vm:MainViewModel"
+             x:DataType="vm:MainPageViewModel"
              HorizontalAlignment="Stretch"
              VerticalAlignment="Stretch">
     <Design.DataContext>
-        <vm:MainViewModel />
+        <vm:MainPageViewModel />
     </Design.DataContext>
 
     <Grid Margin="12" RowSpacing="12"
@@ -97,15 +97,16 @@
 
                 <TextBlock Grid.Row="0" Text="Post detail" FontWeight="SemiBold" />
                 <TextBox Grid.Row="1" Text="{Binding DraftTitle, Mode=TwoWay}" PlaceholderText="Title" />
-               <TextBox Grid.Row="2" PlaceholderText="Write something here !"
+                <AvaloniaEdit:TextEditor Grid.Row="2"
-                  Text="{Binding DraftArticle, Mode=TwoWay}"
+                    views:TextEditorBinding.Text="{Binding DraftArticle, Mode=TwoWay}"
-                  MinHeight="320"
+                    ShowLineNumbers="True"
-                  HorizontalAlignment="Stretch"
+                    FontFamily="Cascadia Code, Consolas, Menlo, Monospace"
-                  VerticalAlignment="Stretch">
+                    MinHeight="320"
-                </TextBox>
+                    HorizontalAlignment="Stretch"
-
+                    VerticalAlignment="Stretch"
+                    VerticalScrollBarVisibility="Auto"
+                    HorizontalScrollBarVisibility="Auto" />
                 <TextBlock Grid.Row="3" Text="{Binding StatusMessage}" Foreground="Gray" />
-
             </Grid>
         </Border>
     </Grid>

src/PostIt/PostIt/Views/MainView.axaml

@@ -1,22 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="using:PostIt.ViewModels"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:views="using:PostIt.Views"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="PostIt.Views.MainView"
-             x:DataType="vm:MainViewModel">
-  <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 />
-  </Design.DataContext>
-
-  <DockPanel LastChildFill="True">
-    <views:SessionStatusBanner
-      x:Name="SessionBanner"
-      DockPanel.Dock="Bottom"/>
-    <NavigationPage x:Name="NavRoot"/>
-  </DockPanel>
-</UserControl>

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

@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace PostIt.Views;
-
-public partial class MainView : UserControl
-{
-    public MainView()
-    {
-        InitializeComponent();
-    }
-}

src/PostIt/PostIt/Views/MainWindow.axaml

@@ -1,12 +1,27 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="using:PostIt.ViewModels"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:views="using:PostIt.Views"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:DataType="vm:MainPageViewModel"
         x:Class="PostIt.Views.MainWindow"
-        Icon="/Assets/avalonia-logo.ico"
+        >
-        Title="PostIt">
+
-        <views:MainView x:Name="MainView" />
+    <!--
+        Root layout: persistent session banner on top, navigation
+        surface below. The banner is the single source of truth for
+        "Connecté / Déconnecté" and the logout button — visible on
+        every page (HomePage, MainPage) so the user never has to dig
+        through a menu to find their session state.
+
+        The navigation stack is built programmatically in
+        App.OnFrameworkInitializationCompleted: HomePage is the
+        root, MainPage is pushed on top when the silent refresh
+        succeeds at boot or after a fresh login from HomePage.
+    -->
+    <DockPanel LastChildFill="True">
+        <views:SessionStatusBanner x:Name="SessionBanner"
+                                   DockPanel.Dock="Bottom"/>
+        <NavigationPage x:Name="NavRoot"/>
+    </DockPanel>
+
 </Window>

src/PostIt/PostIt/Views/SessionStatusBanner.axaml.cs

@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
 
 namespace PostIt.Views;
 

src/PostIt/PostIt/Views/TextEditorBinding.cs

@@ -0,0 +1,51 @@
+using Avalonia;
+using Avalonia.Data;
+using AvaloniaEdit;
+
+namespace PostIt.Views;
+
+public sealed class TextEditorBinding
+{
+    public static readonly AttachedProperty<string?> TextProperty =
+        AvaloniaProperty.RegisterAttached<TextEditorBinding, TextEditor, string?>(
+            "Text",
+            defaultBindingMode: BindingMode.TwoWay);
+
+    private static readonly AttachedProperty<bool> IsTextChangeSubscribedProperty =
+        AvaloniaProperty.RegisterAttached<TextEditorBinding, TextEditor, bool>("IsTextChangeSubscribed");
+
+    static TextEditorBinding()
+    {
+        TextProperty.Changed.AddClassHandler<TextEditor>((editor, args) =>
+        {
+            EnsureTextChangeSubscribed(editor);
+
+            var text = args.GetNewValue<string?>() ?? string.Empty;
+            if (editor.Text != text)
+            {
+                editor.Text = text;
+            }
+        });
+    }
+
+    public static string? GetText(TextEditor editor) => editor.GetValue(TextProperty);
+
+    public static void SetText(TextEditor editor, string? value) => editor.SetValue(TextProperty, value);
+
+    private static void EnsureTextChangeSubscribed(TextEditor editor)
+    {
+        if (editor.GetValue(IsTextChangeSubscribedProperty))
+        {
+            return;
+        }
+
+        editor.SetValue(IsTextChangeSubscribedProperty, true);
+        editor.TextChanged += (_, _) =>
+        {
+            if (editor.Text != GetText(editor))
+            {
+                SetText(editor, editor.Text);
+            }
+        };
+    }
+}

src/Yavsc.Abstract/Attributes/ActivityBillingAttribute.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Yavsc.Attributes
 {
     public class ActivityBillingAttribute : Attribute

src/Yavsc.Abstract/Attributes/ActivitySettingsAttribute.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Yavsc.Attributes
 {
     public class ActivitySettingsAttribute : Attribute

src/Yavsc.Abstract/Attributes/Validation/ValidRemoteUserDirAttribute.cs

@@ -1,3 +1,5 @@
+
+using System;
 using System.ComponentModel.DataAnnotations;
 using Yavsc.Server.Helpers;
 

src/Yavsc.Abstract/Attributes/Validation/YaRegularExpression.cs

@@ -1,3 +1,5 @@
+
+using System;
 using System.Reflection;
 
 namespace Yavsc.Attributes.Validation

src/Yavsc.Abstract/Attributes/Validation/YaRequiredAttribute.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Yavsc.Attributes.Validation
 {
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]

src/Yavsc.Abstract/Attributes/Validation/YaStringLength.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Yavsc.Attributes.Validation
 {
     public partial class YaStringLength: YaValidationAttribute

src/Yavsc.Abstract/Attributes/Validation/YaValidationAttribute.cs

@@ -1,3 +1,6 @@
+using System;
+using System.Reflection;
+
 namespace Yavsc.Attributes.Validation
 {
     public class YaValidationAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute

src/Yavsc.Abstract/Authentication/RegisterModel.cs

@@ -1,4 +1,7 @@
 using System.ComponentModel.DataAnnotations;
+using Yavsc.Attributes.Validation;
+using Yavsc.Abstract;
+    using Yavsc;
 
 namespace Yavsc.ViewModels.Account
 {

src/Yavsc.Abstract/Billing/IBillable.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using Yavsc.Services;
 
 namespace Yavsc.Billing

src/Yavsc.Abstract/Blogspot/IBlogPost.cs

@@ -2,6 +2,7 @@
 
 
 using Yavsc.Abstract.Identity.Security;
+using Yavsc.Interfaces;
 
 namespace Yavsc.Blogspot
 {

src/Yavsc.Abstract/Chat/IChatRoom.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace Yavsc.Abstract.Chat

src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs

@@ -1,4 +1,7 @@
-using System.Text;
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
 using Yavsc.ViewModels.UserFiles;
 
 namespace Yavsc.Server.Helpers

src/Yavsc.Abstract/FileSystem/RemoteFileInfo.cs

@@ -1,4 +1,6 @@
-namespace Yavsc.ViewModels
+using System;
+
+namespace Yavsc.ViewModels
 {
     public class RemoteFileInfo 
     {

src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs

@@ -1,3 +1,7 @@
+using System;
+using System.IO;
+using System.Linq;
+using Yavsc.Abstract.FileSystem;
 using Yavsc.Server.Helpers;
 
 namespace Yavsc.ViewModels.UserFiles
@@ -9,7 +13,7 @@ namespace Yavsc.ViewModels.UserFiles
         public RemoteFileInfo [] Files {
             get; set;
         }
-        public DirectoryShortInfo [] SubDirectories {
+        public DirectoryShortInfo [] SubDirectories { 
             get; set;
         }
         private readonly DirectoryInfo dInfo;

src/Yavsc.Abstract/Google/Calendar/CalendarEventList.cs

@@ -18,6 +18,8 @@
 //
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+
 namespace Yavsc.Models.Google
 {
 

src/Yavsc.Abstract/Google/Calendar/CalendarList.cs

@@ -19,6 +19,8 @@
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using System;
+
 namespace Yavsc.Models.Google.Calendar
 {
 	/// <summary>

src/Yavsc.Abstract/Google/Calendar/CalendarListEntry.cs

@@ -19,6 +19,8 @@
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using System;
+
 namespace Yavsc.Models.Google.Calendar
 {
 	/// <summary>

src/Yavsc.Abstract/Google/Calendar/Reminder.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Yavsc.Models.Google.Calendar
 {
     [Obsolete("use GoogleUse.Apis")]

src/Yavsc.Abstract/Google/GDate.cs

@@ -18,6 +18,8 @@
 //
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+
 namespace Yavsc.Models.Google
 {
 	/// <summary>

src/Yavsc.Abstract/Google/Messaging/MessageWithPayLoad.cs

@@ -20,6 +20,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using Yavsc.Abstract.Models.Messaging;
+using Yavsc.Models.Messaging;
 
 namespace Yavsc.Models.Google.Messaging
 {

src/Yavsc.Abstract/IT/CodeFromChars.cs

@@ -1,4 +1,6 @@
+using System;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace Yavsc.Abstract.IT
 {

src/Yavsc.Abstract/IT/ICode.cs

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace Yavsc.Abstract.IT
 {
     // un code est, parmis les ensembles de suites de signes,

src/Yavsc.Abstract/IT/IProject.cs

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace Yavsc.Abstract.IT
 {
     public interface IProject

src/Yavsc.Abstract/Identity/TokenInfo.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Yavsc.Abstract.Identity
 {
     public class TokenInfo