Skip to content

A Swiss Army knife for developers.

Can now navigate from group page to a tool.

Etienne Baudoux7b70f04caf50
diff --git a/src/app/dev/DevToys.UI/Models/ChangeSelectedMenuItemMessage.cs b/src/app/dev/DevToys.UI/Models/ChangeSelectedMenuItemMessage.cs
new file mode 100644
index 000000000..0e3c922fe
--- /dev/null
+++ b/src/app/dev/DevToys.UI/Models/ChangeSelectedMenuItemMessage.cs
@@ -0,0 +1,11 @@
+using CommunityToolkit.Mvvm.Messaging.Messages;
+
+namespace DevToys.UI.Models;
+
+internal sealed class ChangeSelectedMenuItemMessage : ValueChangedMessage<object>
+{
+ internal ChangeSelectedMenuItemMessage(object value)
+ : base(value)
+ {
+ }
+}
diff --git a/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs b/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs
index 6ef868438..ee2a6e875 100644
--- a/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs
+++ b/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs
@@ -1,10 +1,10 @@
using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
-using DevToys.Api.Core;
+using CommunityToolkit.Mvvm.Messaging;
using DevToys.Core.Tools;
using DevToys.Core.Tools.ViewItems;
-using FuzzySharp;
+using DevToys.UI.Models;
using Microsoft.UI.Xaml.Controls;
namespace DevToys.UI.ViewModels;
@@ -20,6 +20,7 @@ internal sealed partial class MainWindowViewModel : ObservableRecipient
public MainWindowViewModel(GuiToolProvider guiToolProvider)
{
_guiToolProvider = guiToolProvider;
+ Messenger.Register<MainWindowViewModel, ChangeSelectedMenuItemMessage>(this, OnChangeSelectedMenuItemMessageReceived);
}
/// <summary>
@@ -129,18 +130,19 @@ internal sealed partial class MainWindowViewModel : ObservableRecipient
[RelayCommand]
private void SearchBoxQuerySubmitted(AutoSuggestBoxQuerySubmittedEventArgs parameters)
{
- var selectedApp = parameters.ChosenSuggestion as GuiToolViewItem;
- if (selectedApp is null && SearchResults.Count > 0)
+ var selectedSearchResultItem = parameters.ChosenSuggestion as GuiToolViewItem;
+ if (selectedSearchResultItem is null && SearchResults.Count > 0)
{
- selectedApp = SearchResults[0];
+ selectedSearchResultItem = SearchResults[0];
}
- if (selectedApp is null || selectedApp == GuiToolProvider.NoResultFoundItem)
+ if (selectedSearchResultItem is null || selectedSearchResultItem == GuiToolProvider.NoResultFoundItem)
{
return;
}
- // TODO: Navigate to the tool.
+ // Select the actual menu item in the navigation view. This will trigger the navigation.
+ SelectedMenuItem = GetBestMenuItemToSelect(selectedSearchResultItem);
}
/// <summary>
@@ -156,14 +158,24 @@ internal sealed partial class MainWindowViewModel : ObservableRecipient
}
}
- private INotifyPropertyChanged GetBestMenuItemToSelect(INotifyPropertyChanged currentSelectedMenuItem)
+ private INotifyPropertyChanged GetBestMenuItemToSelect(object currentSelectedMenuItem)
{
Guard.IsNotEmpty((IReadOnlyList<INotifyPropertyChanged>)HeaderAndBodyToolViewItems);
Guard.IsNotNull(currentSelectedMenuItem);
+ GuiToolInstance? guiToolInstance = null;
if (currentSelectedMenuItem is GuiToolViewItem guiToolViewItem)
{
- GuiToolViewItem? itemToSelect = _guiToolProvider.GetViewItemFromTool(guiToolViewItem.ToolInstance).FirstOrDefault();
+ guiToolInstance = guiToolViewItem.ToolInstance;
+ }
+ else if (currentSelectedMenuItem is GuiToolInstance instance)
+ {
+ guiToolInstance = instance;
+ }
+
+ if (guiToolInstance is not null)
+ {
+ GuiToolViewItem? itemToSelect = _guiToolProvider.GetViewItemFromTool(guiToolInstance).FirstOrDefault();
if (itemToSelect is not null)
{
return itemToSelect;
@@ -172,4 +184,10 @@ internal sealed partial class MainWindowViewModel : ObservableRecipient
return HeaderAndBodyToolViewItems[0];
}
+
+ private void OnChangeSelectedMenuItemMessageReceived(MainWindowViewModel vm, ChangeSelectedMenuItemMessage message)
+ {
+ // Select the actual menu item in the navigation view. This will trigger the navigation.
+ SelectedMenuItem = GetBestMenuItemToSelect(message.Value);
+ }
}
diff --git a/src/app/dev/DevToys.UI/ViewModels/ToolGroupPageViewModel.cs b/src/app/dev/DevToys.UI/ViewModels/ToolGroupPageViewModel.cs
index 4c0ebf49f..cb45b0cc6 100644
--- a/src/app/dev/DevToys.UI/ViewModels/ToolGroupPageViewModel.cs
+++ b/src/app/dev/DevToys.UI/ViewModels/ToolGroupPageViewModel.cs
@@ -1,10 +1,12 @@
using CommunityToolkit.Mvvm.Collections;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
using DevToys.Core.Tools;
using DevToys.Core.Tools.Metadata;
using DevToys.Core.Tools.ViewItems;
using DevToys.Localization.Strings.MainMenu;
+using DevToys.UI.Models;
using Microsoft.UI.Xaml.Controls;
namespace DevToys.UI.ViewModels;
@@ -49,16 +51,11 @@ internal sealed partial class ToolGroupPageViewModel : ObservableRecipient
}
[RelayCommand]
- private static void ToolSelected(ItemClickEventArgs args)
+ private void ToolSelected(ItemClickEventArgs args)
{
if (args.ClickedItem is not null && args.ClickedItem is GuiToolInstance tool)
{
- //WeakReferenceMessenger.Default.Send(
- // new TrainingWindowNavigateToPageMessage(
- // typeof(AppDetailPageViewModel),
- // app.Model,
- // NavigationTransition.Entrance,
- // referenceConnectedAnimationObject: app));
+ Messenger.Send(new ChangeSelectedMenuItemMessage(tool));
}
}
diff --git a/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.cs b/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.cs
new file mode 100644
index 000000000..da3d58210
--- /dev/null
+++ b/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.cs
@@ -0,0 +1,19 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using DevToys.Core.Tools.ViewItems;
+
+namespace DevToys.UI.ViewModels;
+
+[Export]
+[PartCreationPolicy(CreationPolicy.NonShared)]
+internal sealed partial class ToolPageViewModel : ObservableRecipient
+{
+ [ObservableProperty]
+ private string _headerText = string.Empty;
+
+ internal void Load(GuiToolViewItem guiToolViewItem)
+ {
+ Guard.IsNotNull(guiToolViewItem);
+
+ HeaderText = guiToolViewItem.ToolInstance.LongDisplayTitle;
+ }
+}
diff --git a/src/app/dev/DevToys.UI/Views/ToolPage.xaml b/src/app/dev/DevToys.UI/Views/ToolPage.xaml
index 29133f2db..dc6e3a216 100644
--- a/src/app/dev/DevToys.UI/Views/ToolPage.xaml
+++ b/src/app/dev/DevToys.UI/Views/ToolPage.xaml
@@ -2,11 +2,44 @@
x:Class="DevToys.UI.Views.ToolPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:local="using:DevToys.UI.Views"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- mc:Ignorable="d"
- Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+ xmlns:collections="using:CommunityToolkit.Mvvm.Collections"
+ xmlns:ix="using:Microsoft.Xaml.Interactions.Core"
+ xmlns:i="using:Microsoft.Xaml.Interactivity"
+ xmlns:tools="using:DevToys.Core.Tools"
+ xmlns:strings="using:DevToys.Localization.Strings.MainWindow"
+ mc:Ignorable="d">
- <Grid></Grid>
+ <Grid>
+ <Grid
+ x:Name="ToolHeader"
+ Margin="0,0,0,5">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="1*"/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
+ <TextBlock
+ Grid.Column="0"
+ VerticalAlignment="Center"
+ Text="{x:Bind ViewModel.HeaderText, Mode=OneWay}"
+ TextTrimming="CharacterEllipsis"
+ FontSize="24"/>
+ <win:Border
+ Grid.Column="1">
+ <win:CommandBar
+ IsOpen="False"
+ DefaultLabelPosition="Right">
+ <win:AppBarButton
+ Label="{x:Bind strings:MainWindow.PinToStart}">
+ <win:AppBarButton.Icon>
+ <win:FontIcon Glyph="&#xF602;"/>
+ </win:AppBarButton.Icon>
+ </win:AppBarButton>
+ </win:CommandBar>
+ </win:Border>
+ </Grid>
+ </Grid>
</Page>
diff --git a/src/app/dev/DevToys.UI/Views/ToolPage.xaml.cs b/src/app/dev/DevToys.UI/Views/ToolPage.xaml.cs
index 449cf59d4..14de492c4 100644
--- a/src/app/dev/DevToys.UI/Views/ToolPage.xaml.cs
+++ b/src/app/dev/DevToys.UI/Views/ToolPage.xaml.cs
@@ -1,6 +1,10 @@
-using DevToys.UI.Framework.Controls;
+using DevToys.Core.Tools.ViewItems;
+using DevToys.UI.Framework.Controls;
+using DevToys.UI.Models;
+using DevToys.UI.ViewModels;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
namespace DevToys.UI.Views;
@@ -14,6 +18,22 @@ public sealed partial class ToolPage : Page, IVisualStateListener
this.InitializeComponent();
}
+ /// <summary>
+ /// Gets the page's view model.
+ /// </summary>
+ internal ToolPageViewModel ViewModel => (ToolPageViewModel)DataContext;
+
+ protected override void OnNavigatedTo(NavigationEventArgs e)
+ {
+ base.OnNavigatedTo(e);
+
+ Guard.IsOfType(e.Parameter, typeof(NavigationParameters<GuiToolViewItem>));
+ var parameter = (NavigationParameters<GuiToolViewItem>)e.Parameter;
+
+ DataContext = parameter.MefProvider.Import<ToolPageViewModel>();
+ ViewModel.Load(parameter.Parameter);
+ }
+
public void SetVisualState(string visualStateName)
{
Guard.IsNotNullOrWhiteSpace(visualStateName);