sync

CSharpBible/Graphics/.github/copilot-instructions.md → Avalonia_Apps/.github/copilot-instructions.md

@@ -5,7 +5,11 @@ Apply these defaults when working in this repository unless the user explicitly
 ## General Guidelines
 - Document code thoroughly in English.
 - Validate changes with relevant builds and tests before finishing.
-- If requirements are unclear, ask clarifying questions before starting implementation.
+- If requirements are unclear, ask clarifying questions before starting implementation or planning refinement.
+- Avoid UI text strings in core services. Use Enumerations instead, and keep UI-facing strings in the ViewModel/UI layer.
+- Prefer one class/interface/struct per file.
+- document changes in an DevOps-manner markdown prefered, extrapolate bugs, tasks, baglogs and features
+- Use `DevOps` as the planning directory in this workspace, and treat `.Info.md` as the general planning description file. Team terminology around Azure DevOps backlog items may differ from generic 'story' naming.
 
 ## Testing
 - Use `MSTest` in the latest practical version for new or updated tests.
@@ -17,7 +21,9 @@ Apply these defaults when working in this repository unless the user explicitly
 
 ## Architecture
 - Use MVVM architecture for UI components to separate concerns and improve testability, using CommunityToolkit.Mvvm for MVVM implementation.
+- Prefer `NotifyPropertyChangedFor` over manual `OnPropertyChanged(nameof(...))` in CommunityToolkit.Mvvm observable properties where applicable.
 - Use Dependency Injection to manage dependencies and improve testability, using Microsoft.Extensions.DependencyInjection.
+- UI-facing strings and summary formatting should stay in the ViewModel/UI layer, not in extracted application logic services.
 
 ## Naming Conventions
 - Distinguish between UI control naming and variable/field naming.
@@ -33,7 +39,7 @@ Apply these defaults when working in this repository unless the user explicitly
 - Prefer meaningful domain names over type prefixes when the intent is already clear.
 - In UI code, use short 3-character prefixes for actual controls in views and code-behind, e.g.
 	- `lst` for list controls
-	- `btn` for buttons
+	- `btn` for all kind of buttons, 
 	- `edt` for any keyboard input control
 	- `lbl` for any text output control
 - Do not use UI control prefixes for ViewModel properties or other non-UI members.

Avalonia_Apps/.github/upgrades/dotnet-upgrade-plan.md

@@ -0,0 +1,33 @@
+# .NET 8.0 Upgrade Plan
+
+## Execution Steps
+
+Execute steps below sequentially one by one in the order they are listed.
+
+1. Validate that an .NET 8.0 SDK required for this upgrade is installed on the machine and if not, help to get it installed.
+2. Ensure that the SDK version specified in global.json files is compatible with the .NET 8.0 upgrade.
+3. Upgrade UWP_00_Test\UWP_00_Test.csproj
+
+## Settings
+
+This section contains settings and data used by execution steps.
+
+### Excluded projects
+
+Table below contains projects that do belong to the dependency graph for selected projects and should not be included in the upgrade.
+
+| Project name | Description |
+|:-------------|:-----------:|
+
+### Project upgrade details
+This section contains details about each project upgrade and modifications that need to be done in the project.
+
+#### UWP_00_Test\UWP_00_Test.csproj modifications
+
+Project properties changes:
+  - Include shared props: `..\MVVM_Tutorial.props`
+  - Enable nullable reference types: `nullable` set to `enable`
+  - Migrate project to SDK style targeting .NET 8 (Windows): adopt `Microsoft.NET.Sdk` with appropriate target framework if required by the app model
+
+Other changes:
+  - Review and adjust Windows application model dependencies as needed for .NET 8 (e.g., Windows App SDK / WinUI migration if applicable)

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc/App.axaml.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Linq;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core;
-using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using AA05_CommandParCalc.Models;
@@ -44,27 +41,11 @@ protected void InitDesktopApp(IClassicDesktopStyleApplicationLifetime desktop)
 
         Services = services.BuildServiceProvider();
 
-        // Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
-        // More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
-        DisableAvaloniaDataAnnotationValidation();
         desktop.MainWindow = new MainWindow
         {
             DataContext = Services.GetRequiredService<ICommandParCalcViewModel>()
         };
     }
 
-    private void DisableAvaloniaDataAnnotationValidation()
-    {
-        // Get an array of plugins to remove
-        var dataValidationPluginsToRemove =
-            BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
-
-        // remove each entry found
-        foreach (var plugin in dataValidationPluginsToRemove)
-        {
-            BindingPlugins.DataValidators.Remove(plugin);
-        }
-    }
-
     public IServiceProvider? Services { get; private set; }
 }

Avalonia_Apps/AA06_ValueConverter2/AA06_Converters4Tests/ValueConverter/Bool2VisibilityConverterTests.cs

@@ -40,7 +40,7 @@ public class Bool2VisibilityConverterTests
     /// <param name="value">The value.</param>
     /// <param name="expected">The expected.</param>
     /// <autogeneratedoc />
-    [DataTestMethod]
+    [TestMethod]
     [DataRow(10.5, true)]
     [DataRow(0.99, true)]
   [DataRow(true, true)]
@@ -58,7 +58,7 @@ public void ConvertTest(object? value, bool expected)
     /// Defines the test method ConvertBackTest.
     /// </summary>
     /// <autogeneratedoc />
-    [DataTestMethod()]
+    [TestMethod()]
     [DataRow(true, true)]
     [DataRow(false, false)]
     [DataRow(false, null)]

Avalonia_Apps/AA06_ValueConverter2/AA06_Converters4Tests/View/Converter/WindowPortToGridLinesTests.cs

@@ -8,7 +8,9 @@ namespace AA06_Converters_4.View.Converter.Tests;
 [TestClass()]
 public class WindowPortToGridLinesTests
 {
+#pragma warning disable CS8618 // Ein Non-Nullable-Feld muss beim Beenden des Konstruktors einen Wert ungleich NULL enthalten. Fügen Sie ggf. den „erforderlichen“ Modifizierer hinzu, oder deklarieren Sie den Modifizierer als NULL-Werte zulassend.
     WindowPortToGridLines testVC;
+#pragma warning restore CS8618 // Ein Non-Nullable-Feld muss beim Beenden des Konstruktors einen Wert ungleich NULL enthalten. Fügen Sie ggf. den „erforderlichen“ Modifizierer hinzu, oder deklarieren Sie den Modifizierer als NULL-Werte zulassend.
     ViewModels.SWindowPort wp;
 
     public static IEnumerable<object[]> ConvertTestData
@@ -34,7 +36,7 @@ public void WindowPortToGridLinesTest()
         Assert.Fail();
     }
 
-    [DataTestMethod()]
+    [TestMethod()]
     [DynamicData(nameof(ConvertTestData))]
     public void ConvertTest(object o)
     {

Avalonia_Apps/AA06_ValueConverter2/AA06_ValueConverter2/App.axaml.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Linq;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core;
-using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using AA06_ValueConverter2.Models;
@@ -46,25 +43,11 @@ protected void InitDesktopApp(IClassicDesktopStyleApplicationLifetime desktop)
 
         // Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
         // More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
-        DisableAvaloniaDataAnnotationValidation();
         desktop.MainWindow = new MainWindow
         {
             DataContext = Services.GetRequiredService<IValueConverterViewModel>()
         };
     }
 
-    private void DisableAvaloniaDataAnnotationValidation()
-    {
-        // Get an array of plugins to remove
-        var dataValidationPluginsToRemove =
-            BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
-
-        // remove each entry found
-        foreach (var plugin in dataValidationPluginsToRemove)
-        {
-            BindingPlugins.DataValidators.Remove(plugin);
-        }
-    }
-
     public IServiceProvider? Services { get; private set; }
 }

Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/AA09_DialogBoxes.csproj

@@ -34,7 +34,6 @@
 			<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
 		</PackageReference>
 		<PackageReference Include="CommunityToolkit.Mvvm" />
-		<PackageReference Include="MsBox.Avalonia" />
 	</ItemGroup>
 	<ItemGroup>
 		<AvaloniaResource Include="Assets\**" />
@@ -57,6 +56,9 @@
 		<Compile Update="Views\DialogWindow.axaml.cs">
 		  <DependentUpon>DialogWindow.axaml</DependentUpon>
 		</Compile>
+		<Compile Update="Views\OverlayDialogControl.axaml.cs">
+		  <DependentUpon>OverlayDialogControl.axaml</DependentUpon>
+		</Compile>
 		<Compile Update="App.axaml.cs">
 		  <DependentUpon>App.axaml</DependentUpon>
 		</Compile>

Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/Messages/MessageBoxRequestMessage.cs

@@ -1,14 +1,14 @@
-using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging.Messages;
-using AA09_DialogBoxes.ViewModels;
-using MsBox.Avalonia.Enums;
 
 namespace AA09_DialogBoxes.Messages;
 
-public sealed class MessageBoxRequestMessage : AsyncRequestMessage<ButtonResult>
+public enum MsgBoxResult { None, Yes, No }
+
+public sealed class MessageBoxRequestMessage : AsyncRequestMessage<MsgBoxResult>
 {
     public string Title { get; }
     public string Content { get; }
+
     public MessageBoxRequestMessage(string title, string content)
     {
         Title = title;

Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/Messages/OverlayMessageRequestMessage.cs

@@ -0,0 +1,15 @@
+using CommunityToolkit.Mvvm.Messaging.Messages;
+
+namespace AA09_DialogBoxes.Messages;
+
+public sealed class OverlayMessageRequestMessage : AsyncRequestMessage<MsgBoxResult>
+{
+    public string Title { get; }
+    public string Content { get; }
+
+    public OverlayMessageRequestMessage(string title, string content)
+    {
+        Title = title;
+        Content = content;
+    }
+}

Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/ViewModels/DialogViewModel.cs

@@ -17,7 +17,6 @@
 using CommunityToolkit.Mvvm.Messaging;
 using AA09_DialogBoxes.Messages;
 using System.Threading.Tasks;
-using MsBox.Avalonia.Enums;
 
 namespace AA09_DialogBoxes.ViewModels;
 
@@ -55,7 +54,7 @@ private async Task OpenMsg()
         var request = new MessageBoxRequestMessage("Frage", "Willst Du Das ?");
         WeakReferenceMessenger.Default.Send(request);
         var result = await request.Response;
-        Name = result == ButtonResult.Yes ? "42 Entwickler" : "Nö";
+        Name = result == MsgBoxResult.Yes ? "42 Entwickler" : "Nö";
     }
 
     [RelayCommand]

Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/ViewModels/MainWindowViewModel.cs

@@ -17,19 +17,16 @@
 using AA09_DialogBoxes.Messages;
 using Avalonia.ViewModels;
 using System.Threading.Tasks;
-using MsBox.Avalonia.Enums;
 
 namespace AA09_DialogBoxes.ViewModels;
 
-public enum MsgBoxResult { None, Yes, No }
-
 public partial class MainWindowViewModel : ViewModelBase
 {
     #region Properties
     [ObservableProperty]
-    public partial string Name { get; set; }= "<Name>";
+    public partial string Name { get; set;} = "<Name>";
     [ObservableProperty]
-    public partial string Email { get; set; }= "<Email>";
+    public partial string Email { get; set; } = "<Email>";
     [ObservableProperty]
     private int cnt = 1;
     #endregion
@@ -42,12 +39,21 @@ private async Task OpenMsg()
         var request = new MessageBoxRequestMessage("Frage", "Willst Du Das ?");
         WeakReferenceMessenger.Default.Send(request);
         var result = await request.Response;
-        if (result == ButtonResult.Yes)
+        if (result == MsgBoxResult.Yes)
             Name = "42 Entwickler";
         else
             Name = "Nö";
     }
 
+    [RelayCommand]
+    private async Task OpenOverlayMsg()
+    {
+        var request = new OverlayMessageRequestMessage("Overlay Frage", "Soll der In-Window-Overlay-Dialog verwendet werden?");
+        WeakReferenceMessenger.Default.Send(request);
+        var result = await request.Response;
+        Name = result == MsgBoxResult.Yes ? "Overlay: Ja" : "Overlay: Nein";
+    }
+
     [RelayCommand]
     private async Task OpenDialog()
     {

Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/Views/DialogView.axaml

@@ -10,8 +10,8 @@
     <vm:DialogViewModel />
   </Design.DataContext>
   <StackPanel Margin="16" Spacing="8">
-    <TextBox Text="{Binding Name, Mode=TwoWay}" Watermark="Name"/>
-    <TextBox Text="{Binding Email, Mode=TwoWay}" Watermark="Email"/>
+    <TextBox Text="{Binding Name, Mode=TwoWay}" PlaceholderText="Name"/>
+    <TextBox Text="{Binding Email, Mode=TwoWay}" PlaceholderText="Email"/>
     <StackPanel Orientation="Horizontal" Spacing="8">
       <Button Content="Open Dialog" Command="{Binding OpenDialogCommand}"/>
       <Button Content="Open Message" Command="{Binding OpenMsgCommand}"/>

Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/Views/DialogWindow.axaml

@@ -12,8 +12,8 @@
     <vm:DialogWindowViewModel />
   </Design.DataContext>
   <StackPanel Margin="16" Spacing="8">
-    <TextBox Text="{Binding Name, Mode=TwoWay}" Watermark="Name"/>
-    <TextBox Text="{Binding Email, Mode=TwoWay}" Watermark="Email"/>
+    <TextBox Text="{Binding Name, Mode=TwoWay}" PlaceholderText="Name"/>
+    <TextBox Text="{Binding Email, Mode=TwoWay}" PlaceholderText="Email"/>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
       <Button Content="OK" Command="{Binding OKCommand}"/>
       <Button Content="Cancel" Command="{Binding CancelCommand}"/>

Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/Views/MainWindow.axaml

@@ -6,18 +6,22 @@
         x:Class="AA09_DialogBoxes.Views.MainWindow"
         Width="600" Height="400"
         Title="Dialog Demo"
-				x:DataType="vm:MainWindowViewModel"
+        x:DataType="vm:MainWindowViewModel"
         mc:Ignorable="d">
   <Design.DataContext>
     <vm:MainWindowViewModel />
   </Design.DataContext>
-  <StackPanel Margin="16" Spacing="8">
-    <TextBox Text="{Binding Name, Mode=TwoWay}" Watermark="Name"/>
-    <TextBox Text="{Binding Email, Mode=TwoWay}" Watermark="Email"/>
-    <StackPanel Orientation="Horizontal" Spacing="8">
-      <Button Content="Open Dialog" Command="{Binding OpenDialogCommand}"/>
-      <Button Content="Open Message" Command="{Binding OpenMsgCommand}"/>
+
+  <Grid x:Name="MainRootGrid">
+    <StackPanel Margin="16" Spacing="8">
+      <TextBox Text="{Binding Name, Mode=TwoWay}" PlaceholderText="Name"/>
+      <TextBox Text="{Binding Email, Mode=TwoWay}" PlaceholderText="Email"/>
+      <StackPanel Orientation="Horizontal" Spacing="8">
+        <Button Content="Open Dialog" Command="{Binding OpenDialogCommand}"/>
+        <Button Content="Open Message" Command="{Binding OpenMsgCommand}"/>
+        <Button Content="Open Overlay Message" Command="{Binding OpenOverlayMsgCommand}"/>
+      </StackPanel>
+      <TextBlock Text="{Binding Cnt}"/>
     </StackPanel>
-    <TextBlock Text="{Binding Cnt}"/>
-  </StackPanel>
+  </Grid>
 </Window>

Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/Views/MainWindow.axaml.cs

@@ -1,33 +1,43 @@
 using System;
 using Avalonia.Controls;
 using AA09_DialogBoxes.ViewModels;
-using MsBox.Avalonia;
-using MsBox.Avalonia.Enums;
-using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using AA09_DialogBoxes.Messages;
-using MessageBox.Avalonia.Enums;
 
 namespace AA09_DialogBoxes.Views;
 
 public partial class MainWindow : Window
 {
+    private readonly OverlayDialogControl _overlayDialogControl;
+
     public Func<object,IDialogWindow> NewDialogWindow = (o) => new DialogWindow() { DataContext = o};
 
     public MainWindow()
     {
         InitializeComponent();
         DataContext ??= new MainWindowViewModel();
+
+        var root = this.FindControl<Grid>("MainRootGrid")!;
+        _overlayDialogControl = new OverlayDialogControl();
+        _overlayDialogControl.HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Stretch;
+        _overlayDialogControl.VerticalAlignment = Avalonia.Layout.VerticalAlignment.Stretch;
+        _overlayDialogControl.SetValue(Panel.ZIndexProperty, 10);
+        root.Children.Add(_overlayDialogControl);
+
         this.Opened += Window_Opened;
     }
 
     private void Window_Opened(object? sender, EventArgs e)
     {
-        // Register UI handlers for messages
-        WeakReferenceMessenger.Default.Register<MessageBoxRequestMessage>(this, async (r, m) =>
+        WeakReferenceMessenger.Default.Register<MessageBoxRequestMessage>(this, (r, m) =>
+        {
+            var box = new MessageBoxWindow(m.Title, m.Content);
+            m.Reply(box.ShowDialog<MsgBoxResult>(this));
+        });
+
+        WeakReferenceMessenger.Default.Register<OverlayMessageRequestMessage>(this, (r, m) =>
         {
-            var box = MessageBoxManager.GetMessageBoxStandard(m.Title, m.Content, ButtonEnum.YesNo);
-            m.Reply(box.ShowAsync());
+            m.Reply(_overlayDialogControl.ShowAsync(this, m.Title, m.Content));
         });
 
         WeakReferenceMessenger.Default.Register<EditDialogRequestMessage>(this, (r, m) =>

Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/Views/MessageBoxWindow.axaml

@@ -0,0 +1 @@
+<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="AA09_DialogBoxes.Views.MessageBoxWindow" Width="420" Height="240" MinWidth="360" MinHeight="200" CanResize="False" WindowStartupLocation="CenterOwner" Title="Frage"><Grid RowDefinitions="*,Auto"><ScrollViewer Grid.Row="0" Margin="16" VerticalScrollBarVisibility="Auto"><TextBlock x:Name="MessageText" TextWrapping="Wrap" VerticalAlignment="Top" /></ScrollViewer><StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8" Margin="16,0,16,16"><Button x:Name="YesButton" Click="OnYesClick" MinWidth="80"><TextBlock><Run TextDecorations="Underline">J</Run><Run>a</Run></TextBlock></Button><Button x:Name="NoButton" Click="OnNoClick" MinWidth="80"><TextBlock><Run TextDecorations="Underline">N</Run><Run>ein</Run></TextBlock></Button></StackPanel></Grid></Window>