sync

.gitignore

@@ -1,2 +1,5 @@
-/Avalonia_Apps/AA21_Buttons/AA21_Buttons/*.user
 .vs
+bin
+obj
+*.bak
+*.user

CSharpBible/CharGrid/CharGrid.csproj

@@ -1,92 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C9207149-1178-4D9E-818E-36C4DA31047C}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>CSharpBible.CharGrid</RootNamespace>
-    <AssemblyName>CharGrid</AssemblyName>
-    <BaseOutputPath>..\..\bin\$(MSBuildProjectName)\</BaseOutputPath>
-    <BaseIntermediateOutputPath>..\..\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>..\..\obj\$(MSBuildProjectName)\</IntermediateOutputPath>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Visual\FrmCharGridMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Visual\FrmCharGridMain.Designer.cs">
-      <DependentUpon>FrmCharGridMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <EmbeddedResource Include="Visual\FrmCharGridMain.resx">
-      <DependentUpon>FrmCharGridMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<Project>
+	<Import Project="..\Solution_net.props" />
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<ProjectGuid>{C9207149-1178-4D9E-818E-36C4DA31047C}</ProjectGuid>
+		<RootNamespace>CSharpBible.CharGrid</RootNamespace>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
+		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+		<UseWindowsForms>true</UseWindowsForms>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
+	</ItemGroup>
+	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+	<ItemGroup>
+	  <ProjectReference Include="..\Libraries\BaseLib\BaseLib.csproj" />
+	  <ProjectReference Include="..\Libraries\WFSystem.Data\WFSystem.Windows.Data.csproj" />
+	</ItemGroup>
 </Project>

CSharpBible/CharGrid/Program.cs

@@ -1,36 +1,37 @@
 // ***********************************************************************
-// Assembly         : CharGrid
-// Author           : Mir
-// Created          : 12-19-2021
+// Assembly : CharGrid
+// Author : Mir
+// Created :12-19-2021
 //
-// Last Modified By : Mir
-// Last Modified On : 02-29-2020
-// ***********************************************************************
-// <copyright file="Program.cs" company="JC-Soft">
-//     Copyright © JC-Soft 2020
-// </copyright>
-// <summary></summary>
+// Last Modified By : GitHub Copilot
+// Last Modified On :2025-11-05
 // ***********************************************************************
 using System;
 using System.Windows.Forms;
-using CSharpBible.CharGrid.Visual;
+using CSharpBible.CharGrid.Views;
+using CSharpBible.CharGrid.Services;
+using CSharpBible.CharGrid.ViewModels.Interfaces;
+using CSharpBible.CharGrid.ViewModels;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace CSharpBible.CharGrid
 {
-    /// <summary>
-    /// Class Program.
-    /// </summary>
     static class Program
     {
-        /// <summary>
-        /// Der Haupteinstiegspunkt für die Anwendung.
-        /// </summary>
         [STAThread]
         static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new FrmCharGridMain());
+
+            var services = new ServiceCollection()
+            .AddSingleton<IRandomCharService, RandomCharService>()
+            .AddSingleton<ICharGridProvider, InMemoryCharGridProvider>()
+            .AddTransient<ICharGridViewModel, CharGridViewModel>()
+            .AddTransient<FrmCharGridMain>()
+            .BuildServiceProvider();
+
+            Application.Run(services.GetRequiredService<FrmCharGridMain>());
         }
     }
 }

CSharpBible/CharGrid/Properties/AssemblyInfo.cs

@@ -17,12 +17,7 @@
 // Allgemeine Informationen über eine Assembly werden über die folgenden
 // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 // die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("CharGrid")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("JC-Soft")]
-[assembly: AssemblyProduct("CharGrid")]
-[assembly: AssemblyCopyright("Copyright © JC-Soft 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -44,5 +39,3 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

CSharpBible/CharGrid/Services/ICharGridProvider.cs

@@ -0,0 +1,9 @@
+namespace CSharpBible.CharGrid.Services;
+
+public interface ICharGridProvider
+{
+    int Rows { get; }
+    int Columns { get; }
+    char GetChar(int row, int column);
+    void SetChar(int row, int column, char value);
+}

CSharpBible/CharGrid/Services/IRandomCharService.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace CSharpBible.CharGrid.Services
+{
+ public interface IRandomCharService
+ {
+ char NextChar();
+ }
+}

CSharpBible/CharGrid/Services/InMemoryCharGridProvider.cs

@@ -0,0 +1,25 @@
+using System;
+
+namespace CSharpBible.CharGrid.Services
+{
+    public class InMemoryCharGridProvider : ICharGridProvider
+    {
+        private readonly char[,] _grid;
+        public int Rows { get; }
+        public int Columns { get; }
+
+        public InMemoryCharGridProvider(int rows = 16, int columns = 32, IRandomCharService random = null)
+        {
+            Rows = rows;
+            Columns = columns;
+            _grid = new char[rows, columns];
+            var rnd = random ?? new RandomCharService();
+            for (int r = 0; r < rows; r++)
+                for (int c = 0; c < columns; c++)
+                    _grid[r, c] = rnd.NextChar();
+        }
+
+        public char GetChar(int row, int column) => _grid[row, column];
+        public void SetChar(int row, int column, char value) => _grid[row, column] = value;
+    }
+}

CSharpBible/CharGrid/Services/RandomCharService.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace CSharpBible.CharGrid.Services
+{
+ public class RandomCharService : IRandomCharService
+ {
+ private readonly Random _rnd = new Random();
+ public char NextChar()
+ {
+ // ASCII uppercase letters
+ return (char)('A' + _rnd.Next(0,26));
+ }
+ }
+}

CSharpBible/CharGrid/ViewModels/CharGridViewModel.cs

@@ -0,0 +1,52 @@
+using System.Collections.ObjectModel;
+using CSharpBible.CharGrid.Services;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CSharpBible.CharGrid.ViewModels.Interfaces;
+using System.Windows.Forms;
+
+namespace CSharpBible.CharGrid.ViewModels;
+
+public partial class CharGridViewModel : ViewModelBase, ICharGridViewModel
+{
+    private readonly ICharGridProvider _provider;
+
+    [ObservableProperty]
+    private ObservableCollection<ObservableCollection<char>> rows = new();
+
+    public int RowCount => _provider.Rows;
+    public int ColumnCount => _provider.Columns;
+
+    public CharGridViewModel(ICharGridProvider provider)
+    {
+        _provider = provider;
+        for (int r = 0; r < _provider.Rows; r++)
+        {
+            var row = new ObservableCollection<char>();
+            for (int c = 0; c < _provider.Columns; c++)
+                row.Add(_provider.GetChar(r, c));
+            rows.Add(row);
+        }
+    }
+
+    [RelayCommand]
+    private void UpdateCell((int r, int c, char value) args)
+    {
+        var (r, c, value) = args;
+        _provider.SetChar(r, c, value);
+        rows[r][c] = value;
+        // ObservableProperty will raise PropertyChanged for Rows when set; direct item change triggers collection notifications
+    }
+
+    [RelayCommand]
+    private void Exit()
+    {
+        Application.Exit();
+    }
+
+    [RelayCommand]
+    private void About()
+    {
+
+    }
+}

CSharpBible/CharGrid/ViewModels/Interfaces/ICharGridViewModel.cs

@@ -0,0 +1,15 @@
+using CommunityToolkit.Mvvm.Input;
+using System.Collections.ObjectModel;
+
+namespace CSharpBible.CharGrid.ViewModels.Interfaces;
+
+public interface ICharGridViewModel
+{
+    ObservableCollection<ObservableCollection<char>> Rows { get; }
+
+    IRelayCommand ExitCommand { get; }
+    IRelayCommand AboutCommand { get; }
+    IRelayCommand<(int r, int c, char value)> UpdateCellCommand { get; }
+    int ColumnCount { get; }
+    int RowCount { get; }
+}

CSharpBible/CharGrid/ViewModels/ViewModelBase.cs

@@ -0,0 +1,9 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace CSharpBible.CharGrid.ViewModels
+{
+    // Replaced manual INotifyPropertyChanged with ObservableObject from CommunityToolkit
+    public abstract partial class ViewModelBase : ObservableObject
+    {
+    }
+}