Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI] Update avalonia 11.1.0 #12926

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e2c1dcd
Update to Avalonia version 11.1.0-beta1
wieslawsoltes Apr 24, 2024
effb694
Use IActivatableLifetime as IActivatableApplicationLifetime is obsole…
wieslawsoltes Apr 24, 2024
d8f763a
Use generic version of the TryGetFeature
wieslawsoltes Apr 24, 2024
91c02cd
Update Avalonia.Xaml.Behaviors package to 11.1.0-beta1
wieslawsoltes Apr 24, 2024
7f13cd0
Update Avalonia.Xaml.Behaviors package to 11.1.0-beta1.4
wieslawsoltes Apr 24, 2024
4517409
Use behaviors from Avalonia.Xaml.Behaviors
wieslawsoltes Apr 24, 2024
122be5e
Merge remote-tracking branch 'upstream/master' into vdg/update-avalon…
wieslawsoltes Apr 25, 2024
43403c7
Update to 11.1.0-beta2
wieslawsoltes Apr 25, 2024
ad0e2cb
Fix lock files
wieslawsoltes Apr 25, 2024
ab3945b
Remove avalonia-all feed
wieslawsoltes Apr 25, 2024
1a4a6db
Update packageSourceMapping
wieslawsoltes Apr 25, 2024
18dd3b9
Merge remote-tracking branch 'upstream/master' into vdg/update-avalon…
wieslawsoltes Apr 26, 2024
3a4ea91
Remove workaround for caption buttons
wieslawsoltes Apr 26, 2024
ebdd93b
Revert "Remove workaround for caption buttons"
wieslawsoltes Apr 26, 2024
5f43f6f
Use latest version of the Avalonia.Controls.TreeDataGrid
wieslawsoltes May 3, 2024
9e09ff6
Merge remote-tracking branch 'upstream/master' into vdg/update-avalon…
wieslawsoltes May 3, 2024
a7c4bbe
Merge remote-tracking branch 'upstream/master' into vdg/update-avalon…
wieslawsoltes May 13, 2024
641fd1e
Merge remote-tracking branch 'upstream/master' into vdg/update-avalon…
wieslawsoltes Jun 4, 2024
b4cc8d6
Update to 11.1.0-rc1 from nightly feed
wieslawsoltes Jun 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<AvaloniaVersion>11.0.999-cibuild0044755-beta</AvaloniaVersion>
<AvaloniaVersion>11.1.0-rc1</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
<!-- AspNetCore. -->
Expand Down Expand Up @@ -29,9 +29,9 @@
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<!-- UI. -->
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.0.2" />
<PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10" />
<PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.0.5" />
<PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.1.0-beta2" />
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
Expand Down
6 changes: 3 additions & 3 deletions NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="avalonia-all" value="https://nuget-feed-all.avaloniaui.net/v3/index.json" />
<add key="avaloniaui-nuget-feed-nightly" value="https://nuget-feed-nightly.avaloniaui.net/v3/index.json" protocolVersion="3" />
</packageSources>

<packageSourceMapping>
<packageSource key="avalonia-all">
<packageSource key="nuget.org">
<package pattern="*"/>
</packageSource>
<packageSource key="nuget.org">
<packageSource key="avaloniaui-nuget-feed-nightly">
<package pattern="*"/>
</packageSource>
</packageSourceMapping>
Expand Down
2,652 changes: 410 additions & 2,242 deletions WalletWasabi.Fluent.Desktop/packages.lock.json

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions WalletWasabi.Fluent/ApplicationStateManager.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System.ComponentModel;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Platform;
using ReactiveUI;
using WalletWasabi.Fluent.Extensions;
using WalletWasabi.Fluent.Helpers;
Expand All @@ -27,14 +29,14 @@ public class ApplicationStateManager : IMainWindowService
private bool _hideRequest;
private bool _isShuttingDown;
private bool _restartRequest;
private IActivatableApplicationLifetime? _activatable;
private IActivatableLifetime? _activatable;

internal ApplicationStateManager(IClassicDesktopStyleApplicationLifetime lifetime, UiContext uiContext, bool startInBg)
{
_lifetime = lifetime;
_stateMachine = new StateMachine<State, Trigger>(State.InitialState);

if (_lifetime is IActivatableApplicationLifetime activatableLifetime)
if (Application.Current?.TryGetFeature<IActivatableLifetime>() is { } activatableLifetime)
{
if (startInBg)
{
Expand Down Expand Up @@ -185,9 +187,9 @@ private void CreateAndShowMainWindow()

MainViewModel.Instance.ApplyUiConfigWindowState();

if (_lifetime is IActivatableApplicationLifetime activatable)
if (Application.Current?.TryGetFeature<IActivatableLifetime>() is { } activatableLifetime)
{
activatable.TryLeaveBackground();
activatableLifetime.TryLeaveBackground();
}

var result = new MainWindow
Expand Down
43 changes: 0 additions & 43 deletions WalletWasabi.Fluent/Behaviors/BindPointerOverBehavior.cs

This file was deleted.

50 changes: 0 additions & 50 deletions WalletWasabi.Fluent/Behaviors/BoundsObserverBehavior.cs

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions WalletWasabi.Fluent/Behaviors/DisposingTrigger.cs

This file was deleted.

40 changes: 0 additions & 40 deletions WalletWasabi.Fluent/Behaviors/ExecuteCommandOnActivatedBehavior.cs

This file was deleted.

This file was deleted.