Rename conflicting property.
MODIFY
WalletWasabi.Gui/Controls/LockScreen/LockScreen.xaml
WalletWasabi.Gui/Controls/LockScreen/LockScreen.xaml
xmlns:cont="clr-namespace:WalletWasabi.Gui.Controls.LockScreen"
xmlns:shell="clr-namespace:AvalonStudio.Controls;assembly=AvalonStudio.Shell.Extensibility"
x:Class="WalletWasabi.Gui.Controls.LockScreen.LockScreen">
- <cont:SlideLock IsAnimating="{Binding IsAnimating, Mode=TwoWay}" IsLocked="{Binding IsLocked, Mode=TwoWay}" CanSlide="{Binding CanSlide}">
+ <cont:SlideLock IsAnimationRunning="{Binding IsAnimationRunning, Mode=TwoWay}" IsLocked="{Binding IsLocked, Mode=TwoWay}" CanSlide="{Binding CanSlide}">
<shell:ViewModelViewHost />
</cont:SlideLock>
</UserControl>

MODIFY
WalletWasabi.Gui/Controls/LockScreen/LockScreenViewModelBase.cs
WalletWasabi.Gui/Controls/LockScreen/LockScreenViewModelBase.cs
@@ -8,7 +8,7 @@ namespace WalletWasabi.Gui.Controls.LockScreen
{
public abstract class LockScreenViewModelBase : ViewModelBase
{
- private bool _isAnimating;
+ private bool _isAnimationRunning;
private bool _isLocked = true;
private bool _canSlide;
private volatile bool _disposedValue = false; // To detect redundant calls
@@ -27,10 +27,10 @@ namespace WalletWasabi.Gui.Controls.LockScreen
set => this.RaiseAndSetIfChanged(ref _isLocked, value);
}
- public bool IsAnimating
+ public bool IsAnimationRunning
{
- get => _isAnimating;
- set => this.RaiseAndSetIfChanged(ref _isAnimating, value);
+ get => _isAnimationRunning;
+ set => this.RaiseAndSetIfChanged(ref _isAnimationRunning, value);
}
public void Initialize()
@@ -46,7 +46,7 @@ namespace WalletWasabi.Gui.Controls.LockScreen
{
IsLocked = false;
- this.WhenAnyValue(x => x.IsAnimating)
+ this.WhenAnyValue(x => x.IsAnimationRunning)
.Where(x => !x)
.Take(1)
.Subscribe(x => MainWindowViewModel.Instance?.CloseLockScreen(this));

MODIFY
WalletWasabi.Gui/Controls/LockScreen/SlideLock.cs
WalletWasabi.Gui/Controls/LockScreen/SlideLock.cs
@@ -22,8 +22,8 @@ namespace WalletWasabi.Gui.Controls.LockScreen
public static readonly DirectProperty<SlideLock, bool> IsLockedProperty =
AvaloniaProperty.RegisterDirect<SlideLock, bool>(nameof(IsLocked), o => o.IsLocked, (o, v) => o.IsLocked = v);
- public static readonly DirectProperty<SlideLock, bool> IsAnimatingProperty =
- AvaloniaProperty.RegisterDirect<SlideLock, bool>(nameof(IsAnimating), o => o.IsAnimating, (o, v) => o.IsAnimating = v);
+ public static readonly DirectProperty<SlideLock, bool> IsAnimationRunningProperty =
+ AvaloniaProperty.RegisterDirect<SlideLock, bool>(nameof(IsAnimationRunning), o => o.IsAnimationRunning, (o, v) => o.IsAnimationRunning = v);
public static readonly StyledProperty<double> ValueProperty =
AvaloniaProperty.Register<SlideLock, double>(nameof(Value));
@@ -31,7 +31,7 @@ namespace WalletWasabi.Gui.Controls.LockScreen
private Thumb _thumb;
private Grid _container;
private bool _isLocked;
- private bool _isAnimating;
+ private bool _isAnimationRunning;
private Animation _closeAnimation;
private Animation _openAnimation;
private bool _canSlide;
@@ -113,10 +113,10 @@ namespace WalletWasabi.Gui.Controls.LockScreen
set => SetAndRaise(IsLockedProperty, ref _isLocked, value);
}
- public bool IsAnimating
+ public bool IsAnimationRunning
{
- get => _isAnimating;
- set => SetAndRaise(IsAnimatingProperty, ref _isAnimating, value);
+ get => _isAnimationRunning;
+ set => SetAndRaise(IsAnimationRunningProperty, ref _isAnimationRunning, value);
}
public double Value
@@ -127,16 +127,16 @@ namespace WalletWasabi.Gui.Controls.LockScreen
public async Task RunCloseAnimationAsync()
{
- IsAnimating = true;
+ IsAnimationRunning = true;
await _closeAnimation.RunAsync(this);
- IsAnimating = false;
+ IsAnimationRunning = false;
}
public async Task RunOpenAnimationAsync()
{
- IsAnimating = true;
+ IsAnimationRunning = true;
await _openAnimation.RunAsync(this);
- IsAnimating = false;
+ IsAnimationRunning = false;
}
protected override Size ArrangeOverride(Size finalSize)

Rename conflicting property.