Merge branch 'feature/onplatform-xaml-compiler-support' of https://github.com/AvaloniaUI/Avalonia into feature/onplatform-xaml-compiler-support

maxkatz6 · maxkatz6 · commit 9883a9600ff8 · 2022-11-10T18:30:01.000-05:00
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs b/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs
@@ -1,11 +1,8 @@
 ﻿using System;
-using System.Reflection;
-using Avalonia.Controls;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics
 {
-    static class Convetions
+    internal static class Conventions
     {
         public static string DefaultScreenshotsRoot =>
              System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures, Environment.SpecialFolderOption.Create),
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Avalonia.Input;
+﻿using Avalonia.Input;
 
 namespace Avalonia.Diagnostics
 {
@@ -36,11 +35,11 @@ public class DevToolsOptions
         public bool ShowImplementedInterfaces { get; set; } = true;
         
         /// <summary>
-        /// Allow to customizze SreenshotHandler
+        /// Allow to customize SreenshotHandler
         /// </summary>
         /// <remarks>Default handler is <see cref="Screenshots.FilePickerHandler"/></remarks>
         public IScreenshotHandler ScreenshotHandler { get; set; }
-          = Convetions.DefaultScreenshotHandler;
+          = Conventions.DefaultScreenshotHandler;
 
         /// <summary>
         /// Gets or sets whether DevTools should use the dark mode theme
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.IO;
+﻿using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
@@ -40,7 +39,7 @@ public FilePickerHandler(string? title
         /// The default root folder is [Environment.SpecialFolder.MyPictures]/Screenshots.
         /// </summary>
         public string ScreenshotsRoot { get; }
-            = Convetions.DefaultScreenshotsRoot;
+            = Conventions.DefaultScreenshotsRoot;
 
         /// <summary>
         /// SaveFilePicker Title
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using Avalonia.Data;
-using Avalonia.Media;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Reflection;
-using Avalonia.Media;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
@@ -15,7 +14,7 @@
 
 namespace Avalonia.Diagnostics.ViewModels
 {
-    internal class ControlDetailsViewModel : ViewModelBase, IDisposable
+    internal class ControlDetailsViewModel : ViewModelBase, IDisposable, IClassesChangedListener
     {
         private readonly IAvaloniaObject _avaloniaObject;
         private IDictionary<object, PropertyViewModel[]>? _propertyIndex;
@@ -46,7 +45,7 @@ public ControlDetailsViewModel(TreePageViewModel treePage, IAvaloniaObject avalo
 
             if (avaloniaObject is StyledElement styledElement)
             {
-                styledElement.Classes.CollectionChanged += OnClassesChanged;
+                styledElement.Classes.AddListener(this);
 
                 var pseudoClassAttributes = styledElement.GetType().GetCustomAttributes<PseudoClassesAttribute>(true);
 
@@ -250,7 +249,7 @@ public void Dispose()
 
             if (_avaloniaObject is StyledElement se)
             {
-                se.Classes.CollectionChanged -= OnClassesChanged;
+                se.Classes.RemoveListener(this);
             }
         }
 
@@ -325,7 +324,7 @@ private void ControlPropertyChanged(object? sender, PropertyChangedEventArgs e)
             }
         }
 
-        private void OnClassesChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        void IClassesChangedListener.Changed()
         {
             if (!SnapshotStyles)
             {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -1,13 +1,11 @@
 ﻿using System;
 using System.ComponentModel;
 using System.Reactive.Linq;
-using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Diagnostics.Models;
 using Avalonia.Input;
 using Avalonia.Metadata;
 using Avalonia.Threading;
-using System.Linq;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
@@ -96,7 +94,9 @@ public bool ShouldVisualizeDirtyRects
                     changed = false;
                 }
                 if (changed)
-                RaiseAndSetIfChanged(ref _shouldVisualizeDirtyRects, value);
+                {
+                    RaiseAndSetIfChanged(ref _shouldVisualizeDirtyRects, value);
+                }
             }
         }
 
@@ -331,7 +331,7 @@ public bool ShowImplementedInterfaces
             private set => RaiseAndSetIfChanged(ref _showImplementedInterfaces , value); 
         }
 
-        public void ToggleShowImplementedInterfaces(object parametr)
+        public void ToggleShowImplementedInterfaces(object parameter)
         {
             ShowImplementedInterfaces = !ShowImplementedInterfaces;
             if (Content is TreePageViewModel viewModel)
@@ -340,15 +340,15 @@ public void ToggleShowImplementedInterfaces(object parametr)
             }
         }
 
-        public bool ShowDettailsPropertyType 
+        public bool ShowDetailsPropertyType
         { 
             get => _showPropertyType; 
             private set => RaiseAndSetIfChanged(ref  _showPropertyType , value); 
         }
 
-        public void ToggleShowDettailsPropertyType(object paramter)
+        public void ToggleShowDetailsPropertyType(object parameter)
         {
-            ShowDettailsPropertyType = !ShowDettailsPropertyType;
+            ShowDetailsPropertyType = !ShowDetailsPropertyType;
         }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
@@ -6,7 +6,6 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -19,7 +19,7 @@
       <ColumnDefinition Width="Auto"/>
       <!--
       When selecting the Application node, we need this trick to hide Layout Visualizer 
-      because when using the GridSplitter it sets the Witdth property of ColumnDefinition
+      because when using the GridSplitter it sets the Width property of ColumnDefinition
       (see https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Controls/GridSplitter.cs#L528) 
       and if we hide the contents of the column, the space is not reclaimed 
       (see discussion https://github.com/AvaloniaUI/Avalonia/discussions/6773). 
@@ -62,15 +62,15 @@
           <DataGridTextColumn Header="Value" Binding="{Binding Value}" />
           <DataGridTextColumn Header="Type" Binding="{Binding Type}"
                               IsReadOnly="True"
-                              IsVisible="{Binding !$parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              IsVisible="{Binding !$parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
                               />
-          <DataGridTextColumn Header="Assinged Type" Binding="{Binding AssignedType, Converter={StaticResource GetTypeName}}"
+          <DataGridTextColumn Header="Assigned Type" Binding="{Binding AssignedType, Converter={StaticResource GetTypeName}}"
                               IsReadOnly="True"
-                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
                               />
           <DataGridTextColumn Header="Property Type" Binding="{Binding PropertyType, Converter={StaticResource GetTypeName}}"
                               IsReadOnly="True"
-                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
                               />
           <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" IsReadOnly="True" />
         </DataGrid.Columns>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
@@ -53,10 +53,10 @@
                         IsEnabled="False" />
             </MenuItem.Icon>
           </MenuItem>
-          <MenuItem Header="Split Property Type" Command="{Binding ToggleShowDettailsPropertyType}">
+          <MenuItem Header="Split Property Type" Command="{Binding ToggleShowDetailsPropertyType}">
             <MenuItem.Icon>
               <CheckBox BorderThickness="0"
-                        IsChecked="{Binding ShowDettailsPropertyType}"
+                        IsChecked="{Binding ShowDetailsPropertyType}"
                         IsEnabled="False"/>
             </MenuItem.Icon>
 

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,8 @@`
`1`	`1`	`using System;`
`2`		`-using System.Reflection;`
`3`		`-using Avalonia.Controls;`
`4`		`-using Avalonia.VisualTree;`
`5`	`2`
`6`	`3`	`namespace Avalonia.Diagnostics`
`7`	`4`	`{`
`8`		`- static class Convetions`
	`5`	`+ internal static class Conventions`
`9`	`6`	`{`
`10`	`7`	`public static string DefaultScreenshotsRoot =>`
`11`	`8`	`System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures, Environment.SpecialFolderOption.Create),`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Avalonia.Data;`
`3`		`-using Avalonia.Media;`
`4`	`3`
`5`	`4`	`namespace Avalonia.Diagnostics.ViewModels`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Reflection;`
`3`		`-using Avalonia.Media;`
`4`	`3`
`5`	`4`	`namespace Avalonia.Diagnostics.ViewModels`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Collections.ObjectModel;`
`4`		`-using System.Collections.Specialized;`
`5`	`4`	`using System.ComponentModel;`
`6`	`5`	`using System.Linq;`
`7`	`6`	`using System.Reflection;`
`@@ -15,7 +14,7 @@`
`15`	`14`
`16`	`15`	`namespace Avalonia.Diagnostics.ViewModels`
`17`	`16`	`{`
`18`		`- internal class ControlDetailsViewModel : ViewModelBase, IDisposable`
	`17`	`+ internal class ControlDetailsViewModel : ViewModelBase, IDisposable, IClassesChangedListener`
`19`	`18`	`{`
`20`	`19`	`private readonly IAvaloniaObject _avaloniaObject;`
`21`	`20`	`private IDictionary<object, PropertyViewModel[]>? _propertyIndex;`
`@@ -46,7 +45,7 @@ public ControlDetailsViewModel(TreePageViewModel treePage, IAvaloniaObject avalo`
`46`	`45`
`47`	`46`	`if (avaloniaObject is StyledElement styledElement)`
`48`	`47`	`{`
`49`		`- styledElement.Classes.CollectionChanged += OnClassesChanged;`
	`48`	`+ styledElement.Classes.AddListener(this);`
`50`	`49`
`51`	`50`	`var pseudoClassAttributes = styledElement.GetType().GetCustomAttributes<PseudoClassesAttribute>(true);`
`52`	`51`
`@@ -250,7 +249,7 @@ public void Dispose()`
`250`	`249`
`251`	`250`	`if (_avaloniaObject is StyledElement se)`
`252`	`251`	`{`
`253`		`- se.Classes.CollectionChanged -= OnClassesChanged;`
	`252`	`+ se.Classes.RemoveListener(this);`
`254`	`253`	`}`
`255`	`254`	`}`
`256`	`255`
`@@ -325,7 +324,7 @@ private void ControlPropertyChanged(object? sender, PropertyChangedEventArgs e)`
`325`	`324`	`}`
`326`	`325`	`}`
`327`	`326`
`328`		`- private void OnClassesChanged(object? sender, NotifyCollectionChangedEventArgs e)`
	`327`	`+ void IClassesChangedListener.Changed()`
`329`	`328`	`{`
`330`	`329`	`if (!SnapshotStyles)`
`331`	`330`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.ComponentModel;`
`3`	`3`	`using System.Reactive.Linq;`
`4`		`-using System.Threading.Tasks;`
`5`	`4`	`using Avalonia.Controls;`
`6`	`5`	`using Avalonia.Diagnostics.Models;`
`7`	`6`	`using Avalonia.Input;`
`8`	`7`	`using Avalonia.Metadata;`
`9`	`8`	`using Avalonia.Threading;`
`10`		`-using System.Linq;`
`11`	`9`
`12`	`10`	`namespace Avalonia.Diagnostics.ViewModels`
`13`	`11`	`{`
`@@ -96,7 +94,9 @@ public bool ShouldVisualizeDirtyRects`
`96`	`94`	`changed = false;`
`97`	`95`	`}`
`98`	`96`	`if (changed)`
`99`		`- RaiseAndSetIfChanged(ref _shouldVisualizeDirtyRects, value);`
	`97`	`+ {`
	`98`	`+ RaiseAndSetIfChanged(ref _shouldVisualizeDirtyRects, value);`
	`99`	`+ }`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`@@ -331,7 +331,7 @@ public bool ShowImplementedInterfaces`
`331`	`331`	`private set => RaiseAndSetIfChanged(ref _showImplementedInterfaces , value);`
`332`	`332`	`}`
`333`	`333`
`334`		`- public void ToggleShowImplementedInterfaces(object parametr)`
	`334`	`+ public void ToggleShowImplementedInterfaces(object parameter)`
`335`	`335`	`{`
`336`	`336`	`ShowImplementedInterfaces = !ShowImplementedInterfaces;`
`337`	`337`	`if (Content is TreePageViewModel viewModel)`
`@@ -340,15 +340,15 @@ public void ToggleShowImplementedInterfaces(object parametr)`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`
`343`		`- public bool ShowDettailsPropertyType`
	`343`	`+ public bool ShowDetailsPropertyType`
`344`	`344`	`{`
`345`	`345`	`get => _showPropertyType;`
`346`	`346`	`private set => RaiseAndSetIfChanged(ref _showPropertyType , value);`
`347`	`347`	`}`
`348`	`348`
`349`		`- public void ToggleShowDettailsPropertyType(object paramter)`
	`349`	`+ public void ToggleShowDetailsPropertyType(object parameter)`
`350`	`350`	`{`
`351`		`- ShowDettailsPropertyType = !ShowDettailsPropertyType;`
	`351`	`+ ShowDetailsPropertyType = !ShowDetailsPropertyType;`
`352`	`352`	`}`
`353`	`353`	`}`
`354`	`354`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using Avalonia.Controls.Primitives;`
`7`	`7`	`using Avalonia.LogicalTree;`
`8`	`8`	`using Avalonia.Media;`
`9`		`-using Avalonia.VisualTree;`
`10`	`9`
`11`	`10`	`namespace Avalonia.Diagnostics.ViewModels`
`12`	`11`	`{`