From a487b38c3319097778b5b976a1f306cdbf9afb0d Mon Sep 17 00:00:00 2001 From: danwalmsley Date: Sat, 28 Sep 2019 15:20:45 +0100 Subject: [PATCH] Revert "Updated ReactiveUI to version 10.1.1" --- build/ReactiveUI.props | 2 +- build/Rx.props | 2 +- build/System.Memory.props | 2 +- .../ViewModels/MainWindowViewModel.cs | 7 +++-- .../ViewModels/MainWindowViewModel.cs | 5 ++-- .../ViewModels/MainWindowViewModel.cs | 27 +++++++++---------- .../AvaloniaActivationForViewFetcher.cs | 2 +- src/Avalonia.ReactiveUI/RoutedViewHost.cs | 4 +-- .../AvaloniaActivationForViewFetcherTest.cs | 8 +++--- 9 files changed, 28 insertions(+), 31 deletions(-) diff --git a/build/ReactiveUI.props b/build/ReactiveUI.props index 7caeaf90ae..1208be34b8 100644 --- a/build/ReactiveUI.props +++ b/build/ReactiveUI.props @@ -1,5 +1,5 @@ - + diff --git a/build/Rx.props b/build/Rx.props index edff0af160..359ce53a92 100644 --- a/build/Rx.props +++ b/build/Rx.props @@ -1,5 +1,5 @@  - + diff --git a/build/System.Memory.props b/build/System.Memory.props index b36998a780..b328f7fd97 100644 --- a/build/System.Memory.props +++ b/build/System.Memory.props @@ -1,5 +1,5 @@ - + diff --git a/samples/BindingDemo/ViewModels/MainWindowViewModel.cs b/samples/BindingDemo/ViewModels/MainWindowViewModel.cs index 22d01e0765..858fb5159a 100644 --- a/samples/BindingDemo/ViewModels/MainWindowViewModel.cs +++ b/samples/BindingDemo/ViewModels/MainWindowViewModel.cs @@ -1,11 +1,10 @@ using System; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive; +using ReactiveUI; using System.Reactive.Linq; using System.Threading.Tasks; using System.Threading; -using ReactiveUI; namespace BindingDemo.ViewModels { @@ -57,7 +56,7 @@ namespace BindingDemo.ViewModels public ObservableCollection Items { get; } public ObservableCollection SelectedItems { get; } - public ReactiveCommand ShuffleItems { get; } + public ReactiveCommand ShuffleItems { get; } public string BooleanString { @@ -90,7 +89,7 @@ namespace BindingDemo.ViewModels } public IObservable CurrentTimeObservable { get; } - public ReactiveCommand StringValueCommand { get; } + public ReactiveCommand StringValueCommand { get; } public DataAnnotationsErrorViewModel DataAnnotationsValidation { get; } = new DataAnnotationsErrorViewModel(); public ExceptionErrorViewModel ExceptionDataValidation { get; } = new ExceptionErrorViewModel(); diff --git a/samples/RenderDemo/ViewModels/MainWindowViewModel.cs b/samples/RenderDemo/ViewModels/MainWindowViewModel.cs index d2d789a687..0cb5e1b87b 100644 --- a/samples/RenderDemo/ViewModels/MainWindowViewModel.cs +++ b/samples/RenderDemo/ViewModels/MainWindowViewModel.cs @@ -1,5 +1,4 @@ using System; -using System.Reactive; using ReactiveUI; namespace RenderDemo.ViewModels @@ -27,7 +26,7 @@ namespace RenderDemo.ViewModels set { this.RaiseAndSetIfChanged(ref drawFps, value); } } - public ReactiveCommand ToggleDrawDirtyRects { get; } - public ReactiveCommand ToggleDrawFps { get; } + public ReactiveCommand ToggleDrawDirtyRects { get; } + public ReactiveCommand ToggleDrawFps { get; } } } diff --git a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs index 37c7178c56..93fe09a156 100644 --- a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs +++ b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reactive; using Avalonia.Collections; using Avalonia.Controls; using Avalonia.Controls.Primitives; +using ReactiveUI.Legacy; using ReactiveUI; using Avalonia.Layout; @@ -18,7 +18,7 @@ namespace VirtualizationDemo.ViewModels private int _itemCount = 200; private string _newItemString = "New Item"; private int _newItemIndex; - private AvaloniaList _items; + private IReactiveList _items; private string _prefix = "Item"; private ScrollBarVisibility _horizontalScrollBarVisibility = ScrollBarVisibility.Auto; private ScrollBarVisibility _verticalScrollBarVisibility = ScrollBarVisibility.Auto; @@ -28,12 +28,11 @@ namespace VirtualizationDemo.ViewModels public MainWindowViewModel() { this.WhenAnyValue(x => x.ItemCount).Subscribe(ResizeItems); + RecreateCommand = ReactiveCommand.Create(() => Recreate()); - RecreateCommand = ReactiveCommand.Create(Recreate); + AddItemCommand = ReactiveCommand.Create(() => AddItem()); - AddItemCommand = ReactiveCommand.Create(AddItem); - - RemoveItemCommand = ReactiveCommand.Create(Remove); + RemoveItemCommand = ReactiveCommand.Create(() => Remove()); SelectFirstCommand = ReactiveCommand.Create(() => SelectItem(0)); @@ -55,7 +54,7 @@ namespace VirtualizationDemo.ViewModels public AvaloniaList SelectedItems { get; } = new AvaloniaList(); - public AvaloniaList Items + public IReactiveList Items { get { return _items; } private set { this.RaiseAndSetIfChanged(ref _items, value); } @@ -94,11 +93,11 @@ namespace VirtualizationDemo.ViewModels public IEnumerable VirtualizationModes => Enum.GetValues(typeof(ItemVirtualizationMode)).Cast(); - public ReactiveCommand AddItemCommand { get; private set; } - public ReactiveCommand RecreateCommand { get; private set; } - public ReactiveCommand RemoveItemCommand { get; private set; } - public ReactiveCommand SelectFirstCommand { get; private set; } - public ReactiveCommand SelectLastCommand { get; private set; } + public ReactiveCommand AddItemCommand { get; private set; } + public ReactiveCommand RecreateCommand { get; private set; } + public ReactiveCommand RemoveItemCommand { get; private set; } + public ReactiveCommand SelectFirstCommand { get; private set; } + public ReactiveCommand SelectLastCommand { get; private set; } public void RandomizeSize() { @@ -124,7 +123,7 @@ namespace VirtualizationDemo.ViewModels { var items = Enumerable.Range(0, count) .Select(x => new ItemViewModel(x)); - Items = new AvaloniaList(items); + Items = new ReactiveList(items); } else if (count > Items.Count) { @@ -163,7 +162,7 @@ namespace VirtualizationDemo.ViewModels _prefix = _prefix == "Item" ? "Recreated" : "Item"; var items = Enumerable.Range(0, _itemCount) .Select(x => new ItemViewModel(x, _prefix)); - Items = new AvaloniaList(items); + Items = new ReactiveList(items); } private void SelectItem(int index) diff --git a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs index 5a4d625c41..cfa7a270be 100644 --- a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs +++ b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs @@ -27,7 +27,7 @@ namespace Avalonia.ReactiveUI /// /// Returns activation observable for activatable Avalonia view. /// - public IObservable GetActivationForView(IActivatableView view) + public IObservable GetActivationForView(IActivatable view) { if (!(view is IVisual visual)) return Observable.Return(false); if (view is WindowBase window) return GetActivationForWindowBase(window); diff --git a/src/Avalonia.ReactiveUI/RoutedViewHost.cs b/src/Avalonia.ReactiveUI/RoutedViewHost.cs index 5d96fd264a..05edeea683 100644 --- a/src/Avalonia.ReactiveUI/RoutedViewHost.cs +++ b/src/Avalonia.ReactiveUI/RoutedViewHost.cs @@ -53,7 +53,7 @@ namespace Avalonia.ReactiveUI /// ReactiveUI routing documentation website for more info. /// /// - public class RoutedViewHost : TransitioningContentControl, IActivatableView, IEnableLogger + public class RoutedViewHost : TransitioningContentControl, IActivatable, IEnableLogger { /// /// for the property. @@ -118,4 +118,4 @@ namespace Avalonia.ReactiveUI Content = viewInstance; } } -} +} \ No newline at end of file diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs index 643dd3efac..1d85312b1a 100644 --- a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs +++ b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs @@ -20,9 +20,9 @@ namespace Avalonia.ReactiveUI.UnitTests { public class AvaloniaActivationForViewFetcherTest { - public class TestUserControl : UserControl, IActivatableView { } + public class TestUserControl : UserControl, IActivatable { } - public class TestUserControlWithWhenActivated : UserControl, IActivatableView + public class TestUserControlWithWhenActivated : UserControl, IActivatable { public bool Active { get; private set; } @@ -38,7 +38,7 @@ namespace Avalonia.ReactiveUI.UnitTests } } - public class TestWindowWithWhenActivated : Window, IActivatableView + public class TestWindowWithWhenActivated : Window, IActivatable { public bool Active { get; private set; } @@ -54,7 +54,7 @@ namespace Avalonia.ReactiveUI.UnitTests } } - public class ActivatableViewModel : IActivatableViewModel + public class ActivatableViewModel : ISupportsActivation { public ViewModelActivator Activator { get; }