Merge pull request #793 from lepoco/development

Update main branch from development, bump version to 3.0.0-preview.8

.csharpierrc

@@ -1,5 +1,5 @@
 {
-    "printWidth": 130,
+    "printWidth": 110,
     "useTabs": false,
     "tabWidth": 4,
     "preprocessorSymbolSets": [

Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>3.0.0-preview.7</Version>
+    <Version>3.0.0-preview.8</Version>
     <LangVersion>11.0</LangVersion>
     <Deterministic>true</Deterministic>
   </PropertyGroup>

docs/codesnippet/Rtf/RtfDocumentProcessor.cs

@@ -59,7 +59,11 @@ public FileModel Load(FileAndType file, ImmutableDictionary<string, object> meta
         #region Save
         public SaveResult Save(FileModel model)
         {
-            return new SaveResult { DocumentType = "Conceptual", FileWithoutExtension = Path.ChangeExtension(model.File, null), };
+            return new SaveResult
+            {
+                DocumentType = "Conceptual",
+                FileWithoutExtension = Path.ChangeExtension(model.File, null),
+            };
         }
         #endregion
 

src/Wpf.Ui.Demo.Mvvm/App.xaml.cs

@@ -69,7 +69,8 @@ public partial class App
     /// </summary>
     /// <typeparam name="T">Type of the service to get.</typeparam>
     /// <returns>Instance of the service or <see langword="null"/>.</returns>
-    public static T? GetService<T>() where T : class
+    public static T? GetService<T>()
+        where T : class
     {
         return _host.Services.GetService(typeof(T)) as T;
     }

src/Wpf.Ui.Demo.Mvvm/Services/ApplicationHostService.cs

@@ -48,7 +48,9 @@ private async Task HandleActivationAsync()
 
         if (!Application.Current.Windows.OfType<MainWindow>().Any())
         {
-            _navigationWindow = (_serviceProvider.GetService(typeof(INavigationWindow)) as INavigationWindow)!;
+            _navigationWindow = (
+                _serviceProvider.GetService(typeof(INavigationWindow)) as INavigationWindow
+            )!;
             _navigationWindow!.ShowWindow();
 
             _navigationWindow.Navigate(typeof(Views.Pages.DashboardPage));

src/Wpf.Ui.Demo.Mvvm/Services/PageService.cs

@@ -24,7 +24,8 @@ public PageService(IServiceProvider serviceProvider)
     }
 
     /// <inheritdoc />
-    public T? GetPage<T>() where T : class
+    public T? GetPage<T>()
+        where T : class
     {
         if (!typeof(FrameworkElement).IsAssignableFrom(typeof(T)))
             throw new InvalidOperationException("The page should be a WPF control.");

src/Wpf.Ui.Demo.Mvvm/ViewModels/DataViewModel.cs

@@ -34,7 +34,12 @@ private void InitializeViewModel()
                 new DataColor
                 {
                     Color = new SolidColorBrush(
-                        Color.FromArgb((byte)200, (byte)random.Next(0, 250), (byte)random.Next(0, 250), (byte)random.Next(0, 250))
+                        Color.FromArgb(
+                            (byte)200,
+                            (byte)random.Next(0, 250),
+                            (byte)random.Next(0, 250),
+                            (byte)random.Next(0, 250)
+                        )
                     )
                 }
             );

src/Wpf.Ui.Demo.Mvvm/ViewModels/SettingsViewModel.cs

@@ -15,7 +15,10 @@ public partial class SettingsViewModel : ObservableObject, INavigationAware
     private string _appVersion = String.Empty;
 
     [ObservableProperty]
-    private Wpf.Ui.Appearance.ApplicationTheme _currentApplicationTheme = Wpf.Ui.Appearance.ApplicationTheme.Unknown;
+    private Wpf.Ui.Appearance.ApplicationTheme _currentApplicationTheme = Wpf.Ui
+        .Appearance
+        .ApplicationTheme
+        .Unknown;
 
     public void OnNavigatedTo()
     {
@@ -35,7 +38,8 @@ private void InitializeViewModel()
 
     private string GetAssemblyVersion()
     {
-        return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? String.Empty;
+        return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString()
+            ?? String.Empty;
     }
 
     [RelayCommand]

src/Wpf.Ui.Demo.Mvvm/Views/MainWindow.xaml.cs

@@ -14,7 +14,11 @@ public partial class MainWindow : INavigationWindow
 {
     public ViewModels.MainWindowViewModel ViewModel { get; }
 
-    public MainWindow(ViewModels.MainWindowViewModel viewModel, IPageService pageService, INavigationService navigationService)
+    public MainWindow(
+        ViewModels.MainWindowViewModel viewModel,
+        IPageService pageService,
+        INavigationService navigationService
+    )
     {
         ViewModel = viewModel;
         DataContext = this;

src/Wpf.Ui.Demo.Mvvm/app.manifest

@@ -54,8 +54,8 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
       <windowsSettings>
-          <dpiAwareness xmlns="https://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
-          <dpiAware xmlns="https://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+          <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+          <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
           <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
       </windowsSettings>
   </application>

src/Wpf.Ui.Demo.Simple/Views/Pages/DashboardPage.xaml.cs

@@ -24,6 +24,9 @@ public DashboardPage()
 
     private void OnBaseButtonClick(object sender, RoutedEventArgs e)
     {
-        CounterTextBlock.SetCurrentValue(System.Windows.Controls.TextBlock.TextProperty, (++_counter).ToString());
+        CounterTextBlock.SetCurrentValue(
+            System.Windows.Controls.TextBlock.TextProperty,
+            (++_counter).ToString()
+        );
     }
 }

src/Wpf.Ui.Demo.Simple/Views/Pages/DataPage.xaml.cs

@@ -34,7 +34,12 @@ private void InitializeData()
                 new DataColor
                 {
                     Color = new SolidColorBrush(
-                        Color.FromArgb((byte)200, (byte)random.Next(0, 250), (byte)random.Next(0, 250), (byte)random.Next(0, 250))
+                        Color.FromArgb(
+                            (byte)200,
+                            (byte)random.Next(0, 250),
+                            (byte)random.Next(0, 250),
+                            (byte)random.Next(0, 250)
+                        )
                     )
                 }
             );

src/Wpf.Ui.Demo.Simple/Views/Pages/SettingsPage.xaml.cs

@@ -42,6 +42,7 @@ private void OnDarkThemeRadioButtonChecked(object sender, RoutedEventArgs e)
 
     private string GetAssemblyVersion()
     {
-        return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? String.Empty;
+        return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString()
+            ?? String.Empty;
     }
 }

src/Wpf.Ui.Demo.Simple/app.manifest

@@ -54,8 +54,8 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
       <windowsSettings>
-          <dpiAwareness xmlns="https://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
-          <dpiAware xmlns="https://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+          <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+          <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
           <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
       </windowsSettings>
   </application>

src/Wpf.Ui.Extension.Template.Blank/app.manifest

@@ -54,8 +54,8 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
       <windowsSettings>
-          <dpiAwareness xmlns="https://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
-          <dpiAware xmlns="https://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+          <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+          <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
           <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
       </windowsSettings>
   </application>

src/Wpf.Ui.Extension.Template.Compact/app.manifest

@@ -54,8 +54,8 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
       <windowsSettings>
-          <dpiAwareness xmlns="https://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
-          <dpiAware xmlns="https://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+          <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+          <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
           <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
       </windowsSettings>
   </application>

src/Wpf.Ui.Extension.Template.Fluent/app.manifest

@@ -54,8 +54,8 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
       <windowsSettings>
-          <dpiAwareness xmlns="https://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
-          <dpiAware xmlns="https://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+          <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+          <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
           <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
       </windowsSettings>
   </application>

src/Wpf.Ui.FontMapper/Program.cs

@@ -74,7 +74,9 @@ async Task FetchFontContents(FontSource source, string version)
         await httpClient.GetFromJsonAsync<Dictionary<string, long>>(source.SourcePath)
         ?? throw new Exception("Unable to obtain JSON data");
 
-    sourceJsonContent = sourceJsonContent.OrderBy(x => x.Value).ToDictionary(k => FormatIconName(k.Key), v => v.Value);
+    sourceJsonContent = sourceJsonContent
+        .OrderBy(x => x.Value)
+        .ToDictionary(k => FormatIconName(k.Key), v => v.Value);
 
     source.SetContents(sourceJsonContent);
     source.UpdateVersion(version);
@@ -144,7 +146,11 @@ async Task WriteToFile(FontSource singleFont, string fileRootDirectory)
         _ = enumMapStringBuilder.AppendLine($"    {singleIcon.Key} = 0x{singleIcon.Value:X},");
     }
 
-    _ = enumMapStringBuilder.AppendLine("}").AppendLine(String.Empty).AppendLine("#pragma warning restore CS1591").Append("\r\n");
+    _ = enumMapStringBuilder
+        .AppendLine("}")
+        .AppendLine(String.Empty)
+        .AppendLine("#pragma warning restore CS1591")
+        .Append("\r\n");
 
     var fileInfo = new FileInfo(destinationPath);
 

src/Wpf.Ui.Gallery/App.xaml

@@ -25,6 +25,8 @@
             </ResourceDictionary.MergedDictionaries>
 
             <helpers:EnumToBooleanConverter x:Key="EnumToBooleanConverter" />
+            <helpers:ThemeToIndexConverter x:Key="ThemeToIndexConverter" />
+            <helpers:PaneDisplayModeToIndexConverter x:Key="PaneDisplayModeToIndexConverter" />
 
         </ResourceDictionary>
     </Application.Resources>

src/Wpf.Ui.Gallery/App.xaml.cs

@@ -60,7 +60,8 @@ public partial class App
     /// </summary>
     /// <typeparam name="T">Type of the service to get.</typeparam>
     /// <returns>Instance of the service or <see langword="null"/>.</returns>
-    public static T GetRequiredService<T>() where T : class
+    public static T GetRequiredService<T>()
+        where T : class
     {
         return _host.Services.GetRequiredService<T>();
     }

src/Wpf.Ui.Gallery/Controllers/MonacoController.cs

@@ -54,9 +54,12 @@ public async Task SetThemeAsync(ApplicationTheme appApplicationTheme)
 
     public async Task SetLanguageAsync(MonacoLanguage monacoLanguage)
     {
-        var languageId = monacoLanguage == MonacoLanguage.ObjectiveC ? "objective-c" : monacoLanguage.ToString().ToLower();
+        var languageId =
+            monacoLanguage == MonacoLanguage.ObjectiveC ? "objective-c" : monacoLanguage.ToString().ToLower();
 
-        await _webView.ExecuteScriptAsync("monaco.editor.setModelLanguage(" + EditorObject + $".getModel(), \"{languageId}\");");
+        await _webView.ExecuteScriptAsync(
+            "monaco.editor.setModelLanguage(" + EditorObject + $".getModel(), \"{languageId}\");"
+        );
     }
 
     public async Task SetContentAsync(string contents)

src/Wpf.Ui.Gallery/Controls/ControlExample.xaml.cs

@@ -35,7 +35,10 @@ public class ControlExample : Control
         nameof(XamlCodeSource),
         typeof(Uri),
         typeof(ControlExample),
-        new PropertyMetadata(null, static (o, args) => ((ControlExample)o).OnXamlCodeSourceChanged((Uri)args.NewValue))
+        new PropertyMetadata(
+            null,
+            static (o, args) => ((ControlExample)o).OnXamlCodeSourceChanged((Uri)args.NewValue)
+        )
     );
 
     public static readonly DependencyProperty CsharpCodeProperty = DependencyProperty.Register(
@@ -49,7 +52,10 @@ public class ControlExample : Control
         nameof(CsharpCodeSource),
         typeof(Uri),
         typeof(ControlExample),
-        new PropertyMetadata(null, static (o, args) => ((ControlExample)o).OnCsharpCodeSourceChanged((Uri)args.NewValue))
+        new PropertyMetadata(
+            null,
+            static (o, args) => ((ControlExample)o).OnCsharpCodeSourceChanged((Uri)args.NewValue)
+        )
     );
 
     public string? HeaderText

src/Wpf.Ui.Gallery/Controls/PageControlDocumentation.xaml.cs

@@ -28,7 +28,8 @@ public class PageControlDocumentation : Control
 
     public static void SetShow(FrameworkElement target, bool show) => target.SetValue(ShowProperty, show);
 
-    public static Type? GetDocumentationType(FrameworkElement target) => (Type?)target.GetValue(DocumentationTypeProperty);
+    public static Type? GetDocumentationType(FrameworkElement target) =>
+        (Type?)target.GetValue(DocumentationTypeProperty);
 
     public static void SetDocumentationType(FrameworkElement target, Type type) =>
         target.SetValue(DocumentationTypeProperty, type);
@@ -40,12 +41,13 @@ public class PageControlDocumentation : Control
         new FrameworkPropertyMetadata(null)
     );
 
-    public static readonly DependencyProperty IsDocumentationLinkVisibleProperty = DependencyProperty.Register(
-        nameof(IsDocumentationLinkVisible),
-        typeof(Visibility),
-        typeof(PageControlDocumentation),
-        new FrameworkPropertyMetadata(Visibility.Collapsed)
-    );
+    public static readonly DependencyProperty IsDocumentationLinkVisibleProperty =
+        DependencyProperty.Register(
+            nameof(IsDocumentationLinkVisible),
+            typeof(Visibility),
+            typeof(PageControlDocumentation),
+            new FrameworkPropertyMetadata(Visibility.Collapsed)
+        );
 
     public static readonly DependencyProperty TemplateButtonCommandProperty = DependencyProperty.Register(
         nameof(TemplateButtonCommand),
@@ -73,7 +75,10 @@ public PageControlDocumentation()
         Loaded += static (sender, _) => ((PageControlDocumentation)sender).OnLoaded();
         Unloaded += static (sender, _) => ((PageControlDocumentation)sender).OnUnloaded();
 
-        SetValue(TemplateButtonCommandProperty, new CommunityToolkit.Mvvm.Input.RelayCommand<string>(OnClick));
+        SetValue(
+            TemplateButtonCommandProperty,
+            new CommunityToolkit.Mvvm.Input.RelayCommand<string>(OnClick)
+        );
     }
 
     private FrameworkElement? _page;
@@ -127,7 +132,8 @@ private void OnClick(string? param)
 
         string navigationUrl = param switch
         {
-            "doc" when GetDocumentationType(_page) is { } documentationType => CreateUrlForDocumentation(documentationType),
+            "doc" when GetDocumentationType(_page) is { } documentationType
+                => CreateUrlForDocumentation(documentationType),
             "xaml" => CreateUrlForGithub(_page.GetType(), ".xaml"),
             "c#" => CreateUrlForGithub(_page.GetType(), ".xaml.cs"),
             _ => String.Empty

src/Wpf.Ui.Gallery/Controls/TermsOfUseContentDialog.xaml.cs

@@ -10,7 +10,8 @@ namespace Wpf.Ui.Gallery.Controls;
 
 public partial class TermsOfUseContentDialog : ContentDialog
 {
-    public TermsOfUseContentDialog(ContentPresenter contentPresenter) : base(contentPresenter)
+    public TermsOfUseContentDialog(ContentPresenter contentPresenter)
+        : base(contentPresenter)
     {
         InitializeComponent();
     }

src/Wpf.Ui.Gallery/Controls/TypographyControl.xaml.cs

@@ -24,7 +24,8 @@ public class TypographyControl : Control
         typeof(TypographyControl),
         new PropertyMetadata(
             FontTypography.Body,
-            static (o, args) => ((TypographyControl)o).OnExampleFontTypographyChanged((FontTypography)args.NewValue)
+            static (o, args) =>
+                ((TypographyControl)o).OnExampleFontTypographyChanged((FontTypography)args.NewValue)
         )
     );
 

src/Wpf.Ui.Gallery/ControlsLookup/ControlPages.cs

@@ -11,7 +11,11 @@ static class ControlPages
 
     public static IEnumerable<GalleryPage> All()
     {
-        foreach (var type in GalleryAssembly.Asssembly.GetTypes().Where(t => t.IsDefined(typeof(GalleryPageAttribute))))
+        foreach (
+            var type in GalleryAssembly.Asssembly
+                .GetTypes()
+                .Where(t => t.IsDefined(typeof(GalleryPageAttribute)))
+        )
         {
             var galleryPageAttribute = type.GetCustomAttributes<GalleryPageAttribute>().FirstOrDefault();
 

src/Wpf.Ui.Gallery/DependencyModel/ServiceCollectionExtensions.cs

@@ -17,7 +17,11 @@ internal static class ServiceCollectionExtensions
         {
             IEnumerable<Type> types = assembly
                 .GetTypes()
-                .Where(x => x.IsClass && x.Namespace!.StartsWith(namespaceName, StringComparison.InvariantCultureIgnoreCase));
+                .Where(
+                    x =>
+                        x.IsClass
+                        && x.Namespace!.StartsWith(namespaceName, StringComparison.InvariantCultureIgnoreCase)
+                );
 
             foreach (Type? type in types)
             {

src/Wpf.Ui.Gallery/Helpers/EnumToBooleanConverter.cs

@@ -5,7 +5,7 @@
 
 namespace Wpf.Ui.Gallery.Helpers;
 
-internal class EnumToBooleanConverter : IValueConverter
+internal sealed class EnumToBooleanConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {

src/Wpf.Ui.Gallery/Helpers/NameToPageTypeConverter.cs

@@ -5,7 +5,7 @@
 
 namespace Wpf.Ui.Gallery.Helpers;
 
-internal class NameToPageTypeConverter
+internal sealed class NameToPageTypeConverter
 {
     private static readonly Type[] PageTypes = Assembly
         .GetExecutingAssembly()