diff --git a/Toolkit.Avalonia/FrameHandler.cs b/Toolkit.Avalonia/FrameHandler.cs index 68b0bd8..0a38126 100644 --- a/Toolkit.Avalonia/FrameHandler.cs +++ b/Toolkit.Avalonia/FrameHandler.cs @@ -1,5 +1,6 @@ using Avalonia.Controls; using Avalonia.Controls.Primitives; +using FluentAvalonia.UI.Media.Animation; using FluentAvalonia.UI.Navigation; using System.Reflection; using Toolkit.Foundation; @@ -183,7 +184,7 @@ public class FrameHandler(INavigationContext navigationContext) : navigationContext.Set(control); NavigatedTo(args.Sender, control); - frame.NavigateFromObject(control); + frame.NavigateFromObject(control, new FrameNavigationOptions { TransitionInfoOverride = new SuppressNavigationTransitionInfo() }); } } diff --git a/Toolkit.Foundation/Activated.cs b/Toolkit.Foundation/Activated.cs new file mode 100644 index 0000000..ca3d61c --- /dev/null +++ b/Toolkit.Foundation/Activated.cs @@ -0,0 +1,3 @@ +namespace Toolkit.Foundation; + +public record Activated; \ No newline at end of file diff --git a/Toolkit.Foundation/Deactivated.cs b/Toolkit.Foundation/Deactivated.cs new file mode 100644 index 0000000..5dc4ca6 --- /dev/null +++ b/Toolkit.Foundation/Deactivated.cs @@ -0,0 +1,3 @@ +namespace Toolkit.Foundation; + +public record Deactivated; \ No newline at end of file diff --git a/Toolkit.Foundation/IActivated.cs b/Toolkit.Foundation/IActivated.cs index 224ec70..079d435 100644 --- a/Toolkit.Foundation/IActivated.cs +++ b/Toolkit.Foundation/IActivated.cs @@ -8,4 +8,4 @@ public interface IActivated public interface IActivated { Task Activated(TResult result); -} \ No newline at end of file +} diff --git a/Toolkit.Foundation/Selected.cs b/Toolkit.Foundation/Selected.cs new file mode 100644 index 0000000..da3d5e7 --- /dev/null +++ b/Toolkit.Foundation/Selected.cs @@ -0,0 +1,12 @@ +namespace Toolkit.Foundation; + +public record Selected(TValue Value); + +public record Selected +{ + public static Selected As(TValue value) => + new(value); + + public static Selected As() where TValue : new() => + new(new TValue()); +} \ No newline at end of file diff --git a/Toolkit.UI.Avalonia/SelectNavigationViewItemAction.cs b/Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs similarity index 91% rename from Toolkit.UI.Avalonia/SelectNavigationViewItemAction.cs rename to Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs index 50c9fc1..db8f831 100644 --- a/Toolkit.UI.Avalonia/SelectNavigationViewItemAction.cs +++ b/Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs @@ -2,14 +2,12 @@ using Avalonia.Threading; using Avalonia.Xaml.Interactivity; using System.Collections; -using System.Collections.ObjectModel; -using System.Collections.Specialized; using Toolkit.Foundation; using Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Avalonia; -public class SelectNavigationViewItemAction : +public class InvokeNavigationViewItemAction : AvaloniaObject, IAction {