diff --git a/src/Avalonia.Animation/Clock.cs b/src/Avalonia.Animation/Clock.cs index bea6c75982..6c7ae8349a 100644 --- a/src/Avalonia.Animation/Clock.cs +++ b/src/Avalonia.Animation/Clock.cs @@ -10,10 +10,9 @@ namespace Avalonia.Animation { public static IClock GlobalClock => AvaloniaLocator.Current.GetService(); - private IDisposable _parentSubscription; + private readonly IDisposable _parentSubscription; - public Clock() - :this(GlobalClock) + public Clock() : this(GlobalClock) { } diff --git a/src/Avalonia.Animation/TransitionObservableBase.cs b/src/Avalonia.Animation/TransitionObservableBase.cs index e18b6859f5..9f4fb8093c 100644 --- a/src/Avalonia.Animation/TransitionObservableBase.cs +++ b/src/Avalonia.Animation/TransitionObservableBase.cs @@ -15,18 +15,6 @@ namespace Avalonia.Animation _progress = progress; } - protected override void Unsubscribed() - { - _progressSubscription?.Dispose(); - } - - protected override void Subscribed() - { - _progressSubscription = _progress.Subscribe(this); - } - - protected abstract T ProduceValue(double progress); - void IObserver.OnCompleted() { PublishCompleted(); @@ -41,5 +29,17 @@ namespace Avalonia.Animation { PublishNext(ProduceValue(value)); } + + protected override void Unsubscribed() + { + _progressSubscription?.Dispose(); + } + + protected override void Subscribed() + { + _progressSubscription = _progress.Subscribe(this); + } + + protected abstract T ProduceValue(double progress); } }