Bump Avalonia to 11.0 + fixes

Coding-Enthusiast · Coding-Enthusiast · commit bbef6fc3c8db · 2023-11-26T11:04:46.000+03:30
diff --git a/Src/Denovo/App.axaml b/Src/Denovo/App.axaml
@@ -1,14 +1,15 @@
 ﻿<Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Denovo"
-             x:Class="Denovo.App">
+             x:Class="Denovo.App"
+			 RequestedThemeVariant="Default">
+	
   <Application.DataTemplates>
     <local:ViewLocator/>
   </Application.DataTemplates>
 
   <Application.Styles>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+	  <SimpleTheme/>
   </Application.Styles>
 
   <Application.Styles>
diff --git a/Src/Denovo/App.axaml.cs b/Src/Denovo/App.axaml.cs
@@ -51,10 +51,12 @@ public override void OnFrameworkInitializationCompleted()
                     }
                 }
 
+                MainWindowViewModel vm = new(network);
                 desktop.MainWindow = new MainWindow
                 {
-                    DataContext = new MainWindowViewModel(network)
+                    DataContext = vm
                 };
+                vm.Clipboard = desktop.MainWindow.Clipboard;
             }
 
             base.OnFrameworkInitializationCompleted();
diff --git a/Src/Denovo/Denovo.csproj b/Src/Denovo/Denovo.csproj
@@ -14,8 +14,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.6" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.6" />
+    <PackageReference Include="Avalonia" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+	<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Src/Denovo/ViewLocator.cs b/Src/Denovo/ViewLocator.cs
@@ -14,12 +14,12 @@ public class ViewLocator : IDataTemplate
     {
         public bool SupportsRecycling => false;
 
-        public IControl Build(object data)
+        public Control Build(object data)
         {
             string name = data.GetType().FullName.Replace("ViewModel", "View");
             Type type = Type.GetType(name);
 
-            if (!(type is null))
+            if (type is not null)
             {
                 return (Control)Activator.CreateInstance(type);
             }
diff --git a/Src/Denovo/ViewModels/AboutViewModel.cs b/Src/Denovo/ViewModels/AboutViewModel.cs
@@ -4,6 +4,7 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Avalonia;
+using Avalonia.Input.Platform;
 using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -16,7 +17,13 @@ public AboutViewModel() : base(400, 600)
         {
         }
 
+        public AboutViewModel(IClipboard clipboard) : this()
+        {
+            Clipboard = clipboard;
+        }
+
 
+        public IClipboard Clipboard { get; set; }
         public string NameAndVersion => $"Denovo {Assembly.GetExecutingAssembly().GetName().Version.ToString(4)}";
         public string SourceLink => "https://github.com/Autarkysoft/Denovo";
         public string BitcointalkLink => "";
@@ -29,9 +36,12 @@ public AboutViewModel() : base(400, 600)
         private const string Bip21Extras = "?label=Coding-Enthusiast&message=Donation%20for%20Denovo%20project";
 
 
-        public void Copy(int i)
+        public async void Copy(int i)
         {
-            Application.Current.Clipboard.SetTextAsync(i == 1 ? DonationAddr1 : DonationAddr2);
+            if (Clipboard is not null)
+            {
+                await Clipboard.SetTextAsync(i == 1 ? DonationAddr1 : DonationAddr2);
+            }
         }
 
         // Taken from avalonia source code
diff --git a/Src/Denovo/ViewModels/MainWindowViewModel.cs b/Src/Denovo/ViewModels/MainWindowViewModel.cs
@@ -7,6 +7,7 @@
 using Autarkysoft.Bitcoin.Clients;
 using Autarkysoft.Bitcoin.P2PNetwork;
 using Autarkysoft.Bitcoin.P2PNetwork.Messages;
+using Avalonia.Input.Platform;
 using Denovo.Models;
 using Denovo.MVVM;
 using Denovo.Services;
@@ -54,6 +55,7 @@ public MainWindowViewModel(NetworkType network)
         public NetworkType Network { get; }
         public NodePool AllNodes { get; set; }
 
+        public IClipboard Clipboard { get; set; }
         public IWindowManager WinMan { get; set; }
         public IDenovoFileManager FileMan { get; set; }
         public bool IsInitialized { get; }
diff --git a/Src/Denovo/Views/AboutView.axaml.cs b/Src/Denovo/Views/AboutView.axaml.cs
@@ -4,13 +4,11 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Denovo.Views
 {
     public partial class AboutView : UserControl
     {
         public AboutView() => InitializeComponent();
-        private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
     }
 }
diff --git a/Src/Denovo/Views/ConfigurationView.axaml b/Src/Denovo/Views/ConfigurationView.axaml
@@ -26,7 +26,7 @@
           </StackPanel>
           <StackPanel Orientation="Horizontal" Margin="5" Spacing="5" Grid.Row="1">
             <TextBlock Text="Select client type:"/>
-            <ComboBox Items="{Binding ClientTypes}" SelectedItem="{Binding Config.SelectedClientType}" Width="120"/>
+            <ComboBox ItemsSource="{Binding ClientTypes}" SelectedItem="{Binding Config.SelectedClientType}" Width="120"/>
             <TextBlock Text="Pruned size:" IsVisible="{Binding ShowPruneSize}"/>
             <TextBox Text="{Binding Config.PrunedSize}" IsVisible="{Binding ShowPruneSize}" Width="75"/>
           </StackPanel>
@@ -69,7 +69,7 @@
           </StackPanel>
           <StackPanel Orientation="Horizontal" Spacing="5">
             <TextBlock Text="Initial peer discovery:"/>
-            <ComboBox Items="{Binding PeerDiscoveryOptions}" SelectedItem="{Binding Config.SelectedPeerDiscoveryOption}"
+            <ComboBox ItemsSource="{Binding PeerDiscoveryOptions}" SelectedItem="{Binding Config.SelectedPeerDiscoveryOption}"
                       Width="80"/>
           </StackPanel>
           <TextBox Text="{Binding Config.PeerList}" AcceptsReturn="True" HorizontalAlignment="Left" Height="150" Width="400"/>
diff --git a/Src/Denovo/Views/ConfigurationView.axaml.cs b/Src/Denovo/Views/ConfigurationView.axaml.cs
@@ -4,20 +4,11 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Denovo.Views
 {
-    public class ConfigurationView : UserControl
+    public partial class ConfigurationView : UserControl
     {
-        public ConfigurationView()
-        {
-            this.InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
+        public ConfigurationView() => InitializeComponent();
     }
 }
diff --git a/Src/Denovo/Views/EciesView.axaml b/Src/Denovo/Views/EciesView.axaml
@@ -19,7 +19,7 @@
              Margin="3"
              Grid.Column="0"
              Grid.Row="0"/>
-    <ListBox Items="{Binding InputEncodingList}"
+    <ListBox ItemsSource="{Binding InputEncodingList}"
              SelectedItem="{Binding SelectedInputEncoding}"
              Classes="RadioButtonListBox"
              Grid.Column="1"
@@ -31,7 +31,7 @@
              Margin="3"
              Grid.Column="0"
              Grid.Row="1"/>
-    <ListBox Items="{Binding KeyEncodingList}"
+    <ListBox ItemsSource="{Binding KeyEncodingList}"
              SelectedItem="{Binding SelectedKeyEncoding}"
              Classes="RadioButtonListBox"
              Grid.Column="1"
@@ -46,7 +46,7 @@
              Margin="3"
              Grid.Column="0"
              Grid.Row="2"/>
-    <ListBox Items="{Binding OutputEncodingList}"
+    <ListBox ItemsSource="{Binding OutputEncodingList}"
              SelectedItem="{Binding SelectedOutputEncoding}"
              Classes="RadioButtonListBox"
              Grid.Column="1"
diff --git a/Src/Denovo/Views/EciesView.axaml.cs b/Src/Denovo/Views/EciesView.axaml.cs
@@ -4,20 +4,11 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Denovo.Views
 {
-    public class EciesView : UserControl
+    public partial class EciesView : UserControl
     {
-        public EciesView()
-        {
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
+        public EciesView() => InitializeComponent();
     }
 }
diff --git a/Src/Denovo/Views/MainWindow.axaml b/Src/Denovo/Views/MainWindow.axaml
@@ -45,9 +45,10 @@
 
         <TextBlock Text="{Binding Result}" TextWrapping="Wrap"/>
 
-        <ListBox Height="200" Items="{Binding AllNodes}"
+        <ListBox Height="200"
+				 ItemsSource="{Binding AllNodes}"
                  SelectedItem="{Binding SelectedNode}">
-          <ListBox.DataTemplates>
+          <ListBox.ItemTemplate>
             <DataTemplate>
               <StackPanel Orientation="Horizontal" Spacing="8">
                 <TextBlock Text="{Binding NodeStatus.HandShake}"/>
@@ -61,7 +62,7 @@
                 <TextBlock Text="{Binding NodeStatus.Violation}"/>
               </StackPanel>
             </DataTemplate>
-          </ListBox.DataTemplates>
+          </ListBox.ItemTemplate>
         </ListBox>
 
         <Grid ColumnDefinitions="*,*">
diff --git a/Src/Denovo/Views/MainWindow.axaml.cs b/Src/Denovo/Views/MainWindow.axaml.cs
@@ -4,17 +4,16 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Denovo.ViewModels;
 
 namespace Denovo.Views
 {
-    public class MainWindow : Window
+    public partial class MainWindow : Window
     {
         public MainWindow()
         {
-            this.InitializeComponent();
-            this.Opened += MainWindow_Opened;
+            InitializeComponent();
+            Opened += MainWindow_Opened;
         }
 
         private void MainWindow_Opened(object sender, System.EventArgs e)
@@ -25,10 +24,5 @@ private void MainWindow_Opened(object sender, System.EventArgs e)
                 vm.OpenConfig();
             }
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/Src/Denovo/Views/MinerView.axaml b/Src/Denovo/Views/MinerView.axaml
@@ -19,10 +19,11 @@
     
     <TextBox Text="{Binding PreviousBlockHex}" Height="100" TextWrapping="Wrap" AcceptsReturn="True" Margin="3" Grid.Row="1"/>
 
-    <ListBox Height="200" Items="{Binding AllNodes}"
+    <ListBox Height="200"
+			 ItemsSource="{Binding AllNodes}"
              SelectedItem="{Binding SelectedNode}"
              Margin="3" Grid.Row="2">
-      <ListBox.DataTemplates>
+      <ListBox.ItemTemplate>
         <DataTemplate>
           <StackPanel Orientation="Horizontal" Spacing="8">
             <TextBlock Text="{Binding NodeStatus.HandShake}"/>
@@ -31,7 +32,7 @@
             <TextBlock Text="{Binding NodeStatus.UserAgent}"/>
           </StackPanel>
         </DataTemplate>
-      </ListBox.DataTemplates>
+      </ListBox.ItemTemplate>
     </ListBox>
 
     <TextBlock Text="{Binding NodeInfo}" Margin="3" Grid.Row="3"/>
diff --git a/Src/Denovo/Views/MinerView.axaml.cs b/Src/Denovo/Views/MinerView.axaml.cs
@@ -4,20 +4,11 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Denovo.Views
 {
-    public class MinerView : UserControl
+    public partial class MinerView : UserControl
     {
-        public MinerView()
-        {
-            this.InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
+        public MinerView() => InitializeComponent();
     }
 }
diff --git a/Src/Denovo/Views/PushTxView.axaml b/Src/Denovo/Views/PushTxView.axaml
@@ -12,7 +12,7 @@
 
   <Grid RowDefinitions="auto,*,*">
     <StackPanel Orientation="Horizontal" Spacing="3" Grid.Row="0">
-      <ComboBox Items="{Binding NetworkList}"
+      <ComboBox ItemsSource="{Binding NetworkList}"
                 SelectedItem="{Binding SelectedNetwork}"
                 IsEnabled="{Binding !IsConnected}"/>
       <Button Content="Connect"
diff --git a/Src/Denovo/Views/PushTxView.axaml.cs b/Src/Denovo/Views/PushTxView.axaml.cs
@@ -4,13 +4,11 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Denovo.Views
 {
     public partial class PushTxView : UserControl
     {
         public PushTxView() => InitializeComponent();
-        private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
     }
 }
diff --git a/Src/Denovo/Views/VerifyTxView.axaml b/Src/Denovo/Views/VerifyTxView.axaml
@@ -39,7 +39,7 @@
       
     </Grid>
 
-    <ItemsControl Items="{Binding UtxoList}" Grid.Row="1" ScrollViewer.VerticalScrollBarVisibility="Visible">
+    <ItemsControl ItemsSource="{Binding UtxoList}" Grid.Row="1" ScrollViewer.VerticalScrollBarVisibility="Visible">
       <ItemsControl.ItemsPanel>
         <ItemsPanelTemplate>
           <StackPanel Orientation="Vertical"/>
diff --git a/Src/Denovo/Views/VerifyTxView.axaml.cs b/Src/Denovo/Views/VerifyTxView.axaml.cs
@@ -4,13 +4,11 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Denovo.Views
 {
     public partial class VerifyTxView : UserControl
     {
         public VerifyTxView() => InitializeComponent();
-        private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
     }
 }
diff --git a/Src/Denovo/Views/WifHelperView.axaml b/Src/Denovo/Views/WifHelperView.axaml
@@ -12,7 +12,7 @@
   </Design.DataContext>
 
   <Grid ColumnDefinitions="auto,*" RowDefinitions="*,*">
-    <ListBox Items="{Binding ConversionType}"
+    <ListBox ItemsSource="{Binding ConversionType}"
              SelectedItem="{Binding SelectedConversionType}"
              Classes="RadioButtonListBox"
              Grid.Column="0"
diff --git a/Src/Denovo/Views/WifHelperView.axaml.cs b/Src/Denovo/Views/WifHelperView.axaml.cs
@@ -4,13 +4,11 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Denovo.Views
 {
     public partial class WifHelperView : UserControl
     {
         public WifHelperView() => InitializeComponent();
-        private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,12 @@ public override void OnFrameworkInitializationCompleted()`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ MainWindowViewModel vm = new(network);`
`54`	`55`	`desktop.MainWindow = new MainWindow`
`55`	`56`	`{`
`56`		`- DataContext = new MainWindowViewModel(network)`
	`57`	`+ DataContext = vm`
`57`	`58`	`};`
	`59`	`+ vm.Clipboard = desktop.MainWindow.Clipboard;`
`58`	`60`	`}`
`59`	`61`
`60`	`62`	`base.OnFrameworkInitializationCompleted();`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ public class ViewLocator : IDataTemplate`
`14`	`14`	`{`
`15`	`15`	`public bool SupportsRecycling => false;`
`16`	`16`
`17`		`- public IControl Build(object data)`
	`17`	`+ public Control Build(object data)`
`18`	`18`	`{`
`19`	`19`	`string name = data.GetType().FullName.Replace("ViewModel", "View");`
`20`	`20`	`Type type = Type.GetType(name);`
`21`	`21`
`22`		`- if (!(type is null))`
	`22`	`+ if (type is not null)`
`23`	`23`	`{`
`24`	`24`	`return (Control)Activator.CreateInstance(type);`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,11 @@`
`4`	`4`	`// file LICENCE or http://www.opensource.org/licenses/mit-license.php.`
`5`	`5`
`6`	`6`	`using Avalonia.Controls;`
`7`		`-using Avalonia.Markup.Xaml;`
`8`	`7`
`9`	`8`	`namespace Denovo.Views`
`10`	`9`	`{`
`11`	`10`	`public partial class AboutView : UserControl`
`12`	`11`	`{`
`13`	`12`	`public AboutView() => InitializeComponent();`
`14`		`- private void InitializeComponent() => AvaloniaXamlLoader.Load(this);`
`15`	`13`	`}`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,20 +4,11 @@`
`4`	`4`	`// file LICENCE or http://www.opensource.org/licenses/mit-license.php.`
`5`	`5`
`6`	`6`	`using Avalonia.Controls;`
`7`		`-using Avalonia.Markup.Xaml;`
`8`	`7`
`9`	`8`	`namespace Denovo.Views`
`10`	`9`	`{`
`11`		`- public class ConfigurationView : UserControl`
	`10`	`+ public partial class ConfigurationView : UserControl`
`12`	`11`	`{`
`13`		`- public ConfigurationView()`
`14`		`- {`
`15`		`- this.InitializeComponent();`
`16`		`- }`
`17`		`-`
`18`		`- private void InitializeComponent()`
`19`		`- {`
`20`		`- AvaloniaXamlLoader.Load(this);`
`21`		`- }`
	`12`	`+ public ConfigurationView() => InitializeComponent();`
`22`	`13`	`}`
`23`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,17 +4,16 @@`
`4`	`4`	`// file LICENCE or http://www.opensource.org/licenses/mit-license.php.`
`5`	`5`
`6`	`6`	`using Avalonia.Controls;`
`7`		`-using Avalonia.Markup.Xaml;`
`8`	`7`	`using Denovo.ViewModels;`
`9`	`8`
`10`	`9`	`namespace Denovo.Views`
`11`	`10`	`{`
`12`		`- public class MainWindow : Window`
	`11`	`+ public partial class MainWindow : Window`
`13`	`12`	`{`
`14`	`13`	`public MainWindow()`
`15`	`14`	`{`
`16`		`- this.InitializeComponent();`
`17`		`- this.Opened += MainWindow_Opened;`
	`15`	`+ InitializeComponent();`
	`16`	`+ Opened += MainWindow_Opened;`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`private void MainWindow_Opened(object sender, System.EventArgs e)`
`@@ -25,10 +24,5 @@ private void MainWindow_Opened(object sender, System.EventArgs e)`
`25`	`24`	`vm.OpenConfig();`
`26`	`25`	`}`
`27`	`26`	`}`
`28`		`-`
`29`		`- private void InitializeComponent()`
`30`		`- {`
`31`		`- AvaloniaXamlLoader.Load(this);`
`32`		`- }`
`33`	`27`	`}`
`34`	`28`	`}`