dependencies: update to Avalonia 11.0.4 (git-ecosystem#1383)

Update from Avalonia 11.0.0-preview6 to 11.0.4 and fix the codes using APIs removed since 11.0.0 release.
mjcheetham · Aug 28, 2023 · 9902e8f · 9902e8f
2 parents e076f58 + cd0a34c
commit 9902e8f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/src/shared/Core/Core.csproj b/src/shared/Core/Core.csproj
@@ -14,24 +14,24 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Web" />
     <PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.54.0" />
-    <PackageReference Include="Avalonia.Win32" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Win32" Version="11.0.4" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Client" Version="4.54.0" />
     <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.28.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageReference Include="Avalonia" Version="11.0.0-preview6" />
-    <PackageReference Include="Avalonia.Skia" Version="11.0.0-preview6" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia" Version="11.0.4" />
+    <PackageReference Include="Avalonia.Skia" Version="11.0.4" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview6" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/shared/Core/UI/AvaloniaUi.cs b/src/shared/Core/UI/AvaloniaUi.cs
@@ -124,11 +124,11 @@ private static void SetParentExternal(Window window, IntPtr parentHandle)
                 return;
             }
 
-            IntPtr ourHandle = window.PlatformImpl.Handle.Handle;
+            IntPtr ourHandle = window.TryGetPlatformHandle()!.Handle;
 
             // Get the desktop scaling factor from our window instance so we
             // can calculate rects correctly for both our window, and the parent window.
-            double scaling = window.PlatformImpl.DesktopScaling;
+            double scaling = window.RenderScaling;
 
             // Get our window rect
             var ourRect = new PixelRect(

diff --git a/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs b/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs
@@ -5,7 +5,6 @@
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Input;
-using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using GitCredentialManager;
@@ -22,8 +21,6 @@ public partial class SixDigitInput : UserControl, IFocusable
                 (o, v) => o.Text = v,
                 defaultBindingMode: BindingMode.TwoWay);
 
-        private PlatformHotkeyConfiguration _keyMap;
-        private IClipboard _clipboard;
         private bool _ignoreTextBoxUpdate;
         private TextBox[] _textBoxes;
         private string _text;
@@ -37,8 +34,6 @@ private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
 
-            _keyMap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
-            _clipboard = AvaloniaLocator.Current.GetService<IClipboard>();
             _textBoxes = new[]
             {
                 this.FindControl<TextBox>("one"),
@@ -89,7 +84,7 @@ public void SetFocus()
         {
             // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
             if (!PlatformUtils.IsMacOS())
-                KeyboardDevice.Instance.SetFocusedElement(_textBoxes[0], NavigationMethod.Tab, KeyModifiers.None);
+                _textBoxes[0].Focus(NavigationMethod.Tab, KeyModifiers.None);
         }
 
         private void SetUpTextBox(TextBox textBox)
@@ -99,7 +94,7 @@ private void SetUpTextBox(TextBox textBox)
             void OnPreviewKeyDown(object sender, KeyEventArgs e)
             {
                 // Handle paste
-                if (_keyMap.Paste.Any(x => x.Matches(e)))
+                if (TopLevel.GetTopLevel(this)?.PlatformSettings?.HotkeyConfiguration.Paste.Any(x => x.Matches(e)) ?? false)
                 {
                     OnPaste();
                     e.Handled = true;
@@ -166,8 +161,7 @@ void OnPreviewKeyDown(object sender, KeyEventArgs e)
 
         private void OnPaste()
         {
-            string text = _clipboard.GetTextAsync().GetAwaiter().GetResult();
-            Text = text;
+            Text = TopLevel.GetTopLevel(this)?.Clipboard?.GetTextAsync().GetAwaiter().GetResult();
         }
 
         private bool MoveNext() => MoveFocus(true);
@@ -177,7 +171,7 @@ private void OnPaste()
         private bool MoveFocus(bool next)
         {
             // Get currently focused text box
-            if (FocusManager.Instance.Current is TextBox textBox)
+            if (TopLevel.GetTopLevel(this)?.FocusManager?.GetFocusedElement() is TextBox textBox)
             {
                 int textBoxIndex = Array.IndexOf(_textBoxes, textBox);
                 if (textBoxIndex > -1)
@@ -186,7 +180,7 @@ private bool MoveFocus(bool next)
                         ? Math.Min(_textBoxes.Length - 1, textBoxIndex + 1)
                         : Math.Max(0, textBoxIndex - 1);
 
-                    KeyboardDevice.Instance.SetFocusedElement(_textBoxes[nextIndex], NavigationMethod.Tab, KeyModifiers.None);
+                    _textBoxes[nextIndex].Focus(NavigationMethod.Tab, KeyModifiers.None);
                     return true;
                 }
             }

diff --git a/src/shared/GitHub/UI/Views/SelectAccountView.axaml b/src/shared/GitHub/UI/Views/SelectAccountView.axaml
@@ -43,7 +43,7 @@
         </StackPanel>
 
         <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-            <ListBox Items="{Binding Accounts}"
+            <ListBox ItemsSource="{Binding Accounts}"
                      SelectedItem="{Binding SelectedAccount}"
                      Margin="20,0,20,10"
                      MaxHeight="200"