From caea418ab5df63b3ba963039563ef0b42aa5c35a Mon Sep 17 00:00:00 2001
From: Maksym Katsydan <maxkatz6@outlook.com>
Date: Sat, 12 Nov 2022 17:03:35 -0500
Subject: [PATCH] Add DataGrid to the About page

---
 src/App.axaml                            |  3 +
 src/App.axaml.cs                         |  8 +--
 src/AvaloniaCoreRTDemo.csproj            |  1 +
 src/Windows/AboutWindow.axaml            | 73 +++++-------------------
 src/Windows/MainWindow.axaml             |  3 +
 src/Windows/ViewModels/AboutViewModel.cs | 34 ++++++-----
 6 files changed, 45 insertions(+), 77 deletions(-)

diff --git a/src/App.axaml b/src/App.axaml
index e5fccaf..42192bc 100644
--- a/src/App.axaml
+++ b/src/App.axaml
@@ -1,6 +1,9 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="AvaloniaCoreRTDemo.App">
+	<Application.Styles>
+		<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml" />
+	</Application.Styles>
 	<Application.Resources>
 		<FluentTheme x:Key="fluentTheme" Mode="Light" />
 		<SimpleTheme x:Key="simpleTheme" Mode="Light" />
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index f760a54..4897feb 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -52,19 +52,19 @@ namespace AvaloniaCoreRTDemo
             {
                 case ApplicationTheme.SimpleLight:
                     this._simpleTheme.Mode = SimpleThemeMode.Light;
-                    this.Styles[0] = this._simpleTheme;
+                    this.Styles[1] = this._simpleTheme;
                     break;
                 case ApplicationTheme.SimpleDark:
                     this._simpleTheme.Mode = SimpleThemeMode.Dark;
-                    this.Styles[0] = this._simpleTheme;
+                    this.Styles[1] = this._simpleTheme;
                     break;
                 case ApplicationTheme.FluentLight:
                     this._fluentTheme.Mode = FluentThemeMode.Light;
-                    this.Styles[0] = this._fluentTheme;
+                    this.Styles[1] = this._fluentTheme;
                     break;
                 case ApplicationTheme.FluentDark:
                     this._fluentTheme.Mode = FluentThemeMode.Dark;
-                    this.Styles[0] = this._fluentTheme;
+                    this.Styles[1] = this._fluentTheme;
                     break;
             }
         }
diff --git a/src/AvaloniaCoreRTDemo.csproj b/src/AvaloniaCoreRTDemo.csproj
index 57a8a7f..6c272f8 100644
--- a/src/AvaloniaCoreRTDemo.csproj
+++ b/src/AvaloniaCoreRTDemo.csproj
@@ -42,6 +42,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="11.0.999-cibuild0026098-beta" />
     <PackageReference Include="Avalonia.Desktop" Version="11.0.999-cibuild0026098-beta" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.999-cibuild0026098-beta" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0026098-beta" />
     <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.999-cibuild0026098-beta" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.999-cibuild0026098-beta" />
diff --git a/src/Windows/AboutWindow.axaml b/src/Windows/AboutWindow.axaml
index bcd4700..58e9b80 100644
--- a/src/Windows/AboutWindow.axaml
+++ b/src/Windows/AboutWindow.axaml
@@ -1,67 +1,20 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:viewModels="clr-namespace:AvaloniaCoreRTDemo.Windows.ViewModels"
         mc:Ignorable="d" x:Class="AvaloniaCoreRTDemo.Windows.AboutWindow" d:DesignWidth="640" d:DesignHeight="256"
-        WindowState="Normal" WindowStartupLocation="CenterOwner" MinHeight="256" MinWidth="640" Height="256" Width="640" MaxHeight="256" MaxWidth="640" Title="About" CanResize="false" ShowInTaskbar="False" Icon="avares://AvaloniaCoreRTDemo/Assets/about.ico"
+        WindowState="Normal" WindowStartupLocation="CenterOwner" Height="256" MaxWidth="840"
+        SizeToContent="Width"
+        Title="About"
+        CanResize="false" ShowInTaskbar="False" Icon="avares://AvaloniaCoreRTDemo/Assets/about.ico"
 		x:CompileBindings="True"
 		x:DataType="viewModels:AboutViewModel">
-	<Grid VerticalAlignment="Top" HorizontalAlignment="Left" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-		<Image Margin="0, 60" Grid.Row="0" Grid.Column="0" Stretch="None" Source="{Binding ComputerImage}" VerticalAlignment="Top" HorizontalAlignment="Left">
-			</Image>
-		<ScrollViewer Margin="0, 10" Width="500" Height="230" Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto">
-			<Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
-				<Grid Grid.Row="0" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="Number of Cores: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding NCores}"/>
-				</Grid>
-				<Grid Grid.Row="1" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="OS: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding OS}"/>
-				</Grid>
-				<Grid Grid.Row="2" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="OS Arch: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding OSArch}"/>
-				</Grid>
-				<Grid Grid.Row="3" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="OS Version: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding OSVersion}"/>
-				</Grid>
-				<Grid Grid.Row="4" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="Computer: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding ComputerName}"/>
-				</Grid>
-				<Grid Grid.Row="5" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="User: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding UserName}"/>
-				</Grid>
-				<Grid Grid.Row="6" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="System Path: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding SystemPath}"/>
-				</Grid>
-				<Grid Grid.Row="7" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="Current Path: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding CurrentPath}"/>
-				</Grid>
-				<Grid Grid.Row="8" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="Process Arch: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding ProcessArch}"/>
-				</Grid>
-				<Grid Grid.Row="9" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="Runtime Name: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding RuntimeName}"/>
-				</Grid>
-				<Grid Grid.Row="10" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="Runtime Path: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding RuntimePath}"/>
-				</Grid>
-				<Grid Grid.Row="11" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="Runtime Version: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding RuntimeVersion}"/>
-				</Grid>
-				<Grid Grid.Row="12" Grid.Column="0" ColumnDefinitions="Auto,Auto" RowDefinitions="Auto">
-					<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" FontWeight="Bold" Text="Framework Version: "/>
-					<TextBlock Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Left" TextAlignment="Left" Text="{Binding FrameworkVersion}"/>
-				</Grid>
-			</Grid>
-		</ScrollViewer>
+	<Grid VerticalAlignment="Top" HorizontalAlignment="Left" ColumnDefinitions="Auto,*">
+		<Image Margin="0, 60" Grid.Column="0" Stretch="None" Source="{Binding ComputerImage}" VerticalAlignment="Top" HorizontalAlignment="Left">
+		</Image>
+		<DataGrid Grid.Column="1" Items="{Binding SystemDetails}" IsReadOnly="True">
+			<DataGrid.Columns>
+				<DataGridTextColumn Header="Key" Binding="{Binding Key, x:DataType=viewModels:SystemDetail}" FontWeight="Bold" />
+				<DataGridTextColumn Header="Value" Binding="{Binding Value, x:DataType=viewModels:SystemDetail}" />
+			</DataGrid.Columns>
+		</DataGrid>
 	</Grid>
 </Window>
diff --git a/src/Windows/MainWindow.axaml b/src/Windows/MainWindow.axaml
index e82bf20..0c5a4ca 100644
--- a/src/Windows/MainWindow.axaml
+++ b/src/Windows/MainWindow.axaml
@@ -7,6 +7,9 @@
         x:DataType="viewModels1:MainViewModelBase">
     <DockPanel>
         <NativeMenuBar DockPanel.Dock="Top" />
+        <StackPanel DockPanel.Dock="Top">
+            <Button Content="About" Command="{Binding HelpAboutMethod}" />
+        </StackPanel>
         <controls:MainControl/>
     </DockPanel>
     <NativeMenu.Menu>
diff --git a/src/Windows/ViewModels/AboutViewModel.cs b/src/Windows/ViewModels/AboutViewModel.cs
index c252ac3..0cb018f 100644
--- a/src/Windows/ViewModels/AboutViewModel.cs
+++ b/src/Windows/ViewModels/AboutViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
 using Avalonia.Media.Imaging;
@@ -7,25 +8,32 @@ using ReactiveUI;
 
 namespace AvaloniaCoreRTDemo.Windows.ViewModels
 {
+    internal record SystemDetail(string Key, string Value);
+    
     internal sealed class AboutViewModel : ReactiveObject
     {
+        
         private readonly IBitmap _computerImage;
         private readonly Boolean _darkTheme;
 
         public IBitmap ComputerImage => _computerImage;
-        public String NCores => Environment.ProcessorCount.ToString();
-        public String OS => RuntimeInformation.OSDescription;
-        public String OSArch => RuntimeInformation.OSArchitecture.ToString();
-        public String OSVersion => Environment.OSVersion.ToString();
-        public String ComputerName => Environment.MachineName;
-        public String UserName => Environment.UserName;
-        public String SystemPath => Environment.SystemDirectory;
-        public String CurrentPath => Environment.CurrentDirectory;
-        public String ProcessArch => RuntimeInformation.ProcessArchitecture.ToString();
-        public String RuntimeName => RuntimeInformation.FrameworkDescription;
-        public String RuntimePath => RuntimeEnvironment.GetRuntimeDirectory();
-        public String RuntimeVersion => RuntimeEnvironment.GetSystemVersion();
-        public String FrameworkVersion => Environment.Version.ToString();
+
+        public IReadOnlyList<SystemDetail> SystemDetails { get; } = new[]
+        {
+            new SystemDetail("Number of Cores", Environment.ProcessorCount.ToString()),
+            new SystemDetail("OS", RuntimeInformation.OSDescription),
+            new SystemDetail("OS Arch", RuntimeInformation.OSArchitecture.ToString()),
+            new SystemDetail("OS Version", Environment.OSVersion.ToString()),
+            new SystemDetail("Computer", Environment.MachineName),
+            new SystemDetail("User", Environment.UserName),
+            new SystemDetail("System Path", Environment.SystemDirectory),
+            new SystemDetail("Current Path", Environment.CurrentDirectory),
+            new SystemDetail("Process Arch", RuntimeInformation.ProcessArchitecture.ToString()),
+            new SystemDetail("Runtime Name", RuntimeInformation.FrameworkDescription),
+            new SystemDetail("Runtime Path", RuntimeEnvironment.GetRuntimeDirectory()),
+            new SystemDetail("Runtime Version", RuntimeEnvironment.GetSystemVersion()),
+            new SystemDetail("Framework Version", Environment.Version.ToString()),
+        };
 
         private String ComputerImageName
         {