Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions samples/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,13 @@
<PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
<PackageVersion Include="ReactiveUI.WinUI" Version="23.2.28" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageVersion Include="SkiaSharp" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0.2" />
<PackageVersion Include="ReactiveUI.Avalonia" Version="12.1.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.6" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="2.3.1" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.2526" />
<PackageVersion Include="Pipboy.Avalonia" Version="1.0.0" />
<PackageVersion Include="ReactiveUI" Version="23.2.28" />
<PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.5.1" />
<PackageVersion Include="ReactiveUI.WPF" Version="23.2.28" />
</ItemGroup>
</Project>
</Project>
3 changes: 1 addition & 2 deletions samples/Sample.Avalonia.Android/Application.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Android.Runtime;
using Avalonia;
using Avalonia.Android;
using ReactiveUI.Avalonia;

namespace Sample.Avalonia.Android;

Expand All @@ -14,6 +13,6 @@ protected Application(nint javaReference, JniHandleOwnership transfer) : base(ja
}
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
{
return base.CustomizeAppBuilder(builder).UseReactiveUI(_ => { });
return base.CustomizeAppBuilder(builder);
}
}
4 changes: 1 addition & 3 deletions samples/Sample.Avalonia.Browser/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Avalonia;
using Avalonia.Browser;
using ReactiveUI.Avalonia;
using Sample.Avalonia;
using System.Runtime.Versioning;
using System.Threading.Tasks;
Expand All @@ -11,9 +10,8 @@ internal sealed partial class Program
{
private static Task Main(string[] args) => BuildAvaloniaApp()
.WithInterFont()
.UseReactiveUI(_ => { })
.StartBrowserAppAsync("out");

public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>();
}
}
4 changes: 1 addition & 3 deletions samples/Sample.Avalonia.Desktop/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Avalonia;
using ReactiveUI.Avalonia;
using System;
using System.Runtime.InteropServices;

Expand All @@ -21,9 +20,8 @@ public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.WithInterFont()
.UseReactiveUI(_ => { })
.LogToTrace();

[DllImport("kernel32", SetLastError = true, CharSet = CharSet.Unicode)]
private static extern bool SetDllDirectory(string lpPathName);
}
}
4 changes: 1 addition & 3 deletions samples/Sample.Avalonia.iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Avalonia;
using Avalonia.iOS;
using Foundation;
using ReactiveUI.Avalonia;

namespace Sample.Avalonia.iOS;

Expand All @@ -16,7 +15,6 @@ public partial class AppDelegate : AvaloniaAppDelegate<App>
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
{
return base.CustomizeAppBuilder(builder)
.WithInterFont()
.UseReactiveUI(_ => { });
.WithInterFont();
}
}
1 change: 0 additions & 1 deletion samples/Sample.Avalonia/Sample.Avalonia.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="ReactiveUI.Avalonia" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions samples/Sample.Common/ChildContentRegionViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using AsyncNavigation.Abstractions;
using ReactiveUI.SourceGenerators;
using CommunityToolkit.Mvvm.Input;

namespace Sample.Common;

Expand All @@ -11,13 +11,13 @@ public ChildContentRegionViewModel(IRegionManager regionManager)
_regionManager = regionManager;
}

[ReactiveCommand]
[RelayCommand]
private async Task AsyncNavigate(string param)
{
var (viewName, parameters) = SampleHelper.ParseNavigationParam(param);
await _regionManager.RequestNavigateAsync("ChildContentRegion", viewName, parameters);
}
[ReactiveCommand]
[RelayCommand]
private Task UnloadView(string param)
{
return RequestUnloadAsync(CancellationToken.None);
Expand Down
7 changes: 4 additions & 3 deletions samples/Sample.Common/FrontDialogViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
using AsyncNavigation.Abstractions;
using AsyncNavigation.Core;
using ReactiveUI.SourceGenerators;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;

namespace Sample.Common;
public partial class FrontDialogViewModel : InstanceCounterViewModel<FrontDialogViewModel>, IDialogAware
{
[Reactive]
[ObservableProperty]
private int _ratio;
private CancellationTokenSource? _cts;
public event AsyncEventHandler<DialogCloseEventArgs>? RequestCloseAsync;
public string Title => $"{nameof(LightViewModel)}:{InstanceNumber}";

[ReactiveCommand]
[RelayCommand]
private Task CloseDialog(string param)
{
if (RequestCloseAsync != null)
Expand Down
6 changes: 3 additions & 3 deletions samples/Sample.Common/HeavyViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using AsyncNavigation;
using AsyncNavigation.Abstractions;
using AsyncNavigation.Core;
using ReactiveUI.SourceGenerators;
using CommunityToolkit.Mvvm.Input;
using System.Collections.ObjectModel;

namespace Sample.Common;
Expand All @@ -19,13 +19,13 @@ public ObservableCollection<byte> HeavyItems

public event AsyncEventHandler<DialogCloseEventArgs>? RequestCloseAsync;

[ReactiveCommand]
[RelayCommand]
private Task UnloadView(string param)
{
return RequestUnloadAsync(CancellationToken.None);
}

[ReactiveCommand]
[RelayCommand]
private Task CloseDialog(string param)
{
return RequestCloseAsync!.Invoke(this,
Expand Down
13 changes: 6 additions & 7 deletions samples/Sample.Common/InfinityViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
using AsyncNavigation;
using AsyncNavigation.Abstractions;
using ReactiveUI;
using ReactiveUI.SourceGenerators;
using System.Reactive.Concurrency;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;

namespace Sample.Common;

public partial class InfinityViewModel : InstanceCounterViewModel<InfinityViewModel>
{
[Reactive]
[ObservableProperty]
private string _nextRegionName = "";
[Reactive]
[ObservableProperty]
private string _buttonText = "Next";
[Reactive]
[ObservableProperty]
private bool _isActive = true;
private readonly IRegionManager _regionManager;

Expand All @@ -22,7 +21,7 @@ public InfinityViewModel(IRegionManager regionManager)
_regionManager = regionManager;
}

[ReactiveCommand]
[RelayCommand]
private async Task AsyncNavigate(string param)
{
await _regionManager.RequestNavigateAsync(NextRegionName, param);
Expand Down
9 changes: 4 additions & 5 deletions samples/Sample.Common/ItemsRegionViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using AsyncNavigation;
using AsyncNavigation.Abstractions;
using ReactiveUI;
using ReactiveUI.SourceGenerators;
using CommunityToolkit.Mvvm.Input;
using System.Diagnostics;

namespace Sample.Common;
Expand All @@ -13,14 +12,14 @@ public ItemsRegionViewModel(IRegionManager regionManager)
{
_regionManager = regionManager;
}
[ReactiveCommand]
[RelayCommand]
private async Task AsyncNavigate(string param)
{
var (viewName, parameters) = SampleHelper.ParseNavigationParam(param);
var ret = await _regionManager.RequestNavigateAsync("ItemsRegion", viewName, parameters);
Debug.WriteLine(ret);
}
[ReactiveCommand]
[RelayCommand]
private Task AsyncNavigateAndForget(string param)
{
var (viewName, parameters) = SampleHelper.ParseNavigationParam(param);
Expand All @@ -31,7 +30,7 @@ private Task AsyncNavigateAndForget(string param)
});
return Task.CompletedTask;
}
[ReactiveCommand]
[RelayCommand]
private Task UnloadView(string param)
{
return RequestUnloadAsync(CancellationToken.None);
Expand Down
12 changes: 6 additions & 6 deletions samples/Sample.Common/LightViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using AsyncNavigation.Abstractions;
using AsyncNavigation.Core;
using ReactiveUI.SourceGenerators;
using CommunityToolkit.Mvvm.Input;

namespace Sample.Common;

Expand All @@ -20,33 +20,33 @@ public LightViewModel(IRegionManager regionManager)
}


[ReactiveCommand]
[RelayCommand]
private Task UnloadView(string param)
{
return RequestUnloadAsync(CancellationToken.None);
}

[ReactiveCommand]
[RelayCommand]
private Task CloseDialog(string param)
{
return RequestCloseAsync!.Invoke(this,
new DialogCloseEventArgs(new DialogResult(DialogButtonResult.OK),
CancellationToken.None));
}
[ReactiveCommand]
[RelayCommand]
private Task CloseDialogWithCancelling(string param)
{
var cts = new CancellationTokenSource();
cts.CancelAfter(TimeSpan.FromSeconds(2));
return RequestCloseAsync!.Invoke(this, new DialogCloseEventArgs(new DialogResult(DialogButtonResult.OK), cts.Token));
}
[ReactiveCommand]
[RelayCommand]
private async Task AsyncPageNavigate(string param)
{
var (viewName, parameters) = SampleHelper.ParseNavigationParam(param);
var ret = await _regionManager.RequestNavigateAsync("NavigationPageRegion", viewName);
}
[ReactiveCommand]
[RelayCommand]
private async Task AsyncTabbedPageNavigate(string param)
{
var (viewName, parameters) = SampleHelper.ParseNavigationParam(param);
Expand Down
8 changes: 4 additions & 4 deletions samples/Sample.Common/ListBoxRegionViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using AsyncNavigation.Abstractions;
using ReactiveUI.SourceGenerators;
using CommunityToolkit.Mvvm.Input;

namespace Sample.Common;

Expand All @@ -10,20 +10,20 @@ public ListBoxRegionViewModel(IRegionManager regionManager)
{
_regionManager = regionManager;
}
[ReactiveCommand]
[RelayCommand]
private async Task AsyncNavigate(string param)
{
var (viewName, parameters) = SampleHelper.ParseNavigationParam(param);
await _regionManager.RequestNavigateAsync("CustomListBoxRegion", viewName, parameters);
}

[ReactiveCommand]
[RelayCommand]
private async Task GoForward()
{
await _regionManager.GoForwardAsync("CustomListBoxRegion");
}

[ReactiveCommand]
[RelayCommand]
private async Task GoBack()
{
await _regionManager.GoBackAsync("CustomListBoxRegion");
Expand Down
Loading
Loading