Skip to content

A Swiss Army knife for developers.

updated navigation property

Benjamin Titeux70fb6653a3e0
diff --git a/src/dev/def/DevTools.Core/Navigation/NavigationParameter.cs b/src/dev/def/DevTools.Core/Navigation/NavigationParameter.cs
index a8c1528b2..6970ff50c 100644
--- a/src/dev/def/DevTools.Core/Navigation/NavigationParameter.cs
+++ b/src/dev/def/DevTools.Core/Navigation/NavigationParameter.cs
@@ -9,12 +9,18 @@ namespace DevTools.Core.Navigation
{
public IMefProvider ExportProvider { get; }
- public object[] Parameter { get; }
+ public string? Query { get; }
- public NavigationParameter(IMefProvider exportProvider, params object[] parameter)
+ public object? ViewModel { get; }
+
+ public string? ClipBoardContent { get; }
+
+ public NavigationParameter(IMefProvider exportProvider, object? viewModel, string? clipBoardContent = null, string? query = null)
{
ExportProvider = Arguments.NotNull(exportProvider, nameof(exportProvider));
- Parameter = parameter;
+ ViewModel = viewModel;
+ ClipBoardContent = clipBoardContent;
+ Query = query;
}
}
}
diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs
index 925d0ad3f..757b79ac9 100644
--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs
+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs
@@ -57,7 +57,7 @@ namespace DevTools.Impl.Views
ViewModel = parameters.ExportProvider.Import<MainPageViewModel>();
DataContext = ViewModel;
- ViewModel.OnNavigatedToAsync(parameters.Parameter).Forget();
+ ViewModel.OnNavigatedToAsync(parameters.ViewModel).Forget();
base.OnNavigatedTo(e);
}
diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml.cs b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml.cs
index 30dbccd31..ff62e6ff9 100644
--- a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml.cs
+++ b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml.cs
@@ -35,7 +35,7 @@ namespace DevTools.Impl.Views.Settings
var parameters = (NavigationParameter)e.Parameter;
// Set the view model
- ViewModel = (SettingsToolViewModel)parameters.Parameter[0]!;
+ ViewModel = (SettingsToolViewModel)parameters.ViewModel;
DataContext = ViewModel;
base.OnNavigatedTo(e);
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs
index 47b3d9420..d106bfe19 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs
@@ -35,12 +35,12 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
var parameters = (NavigationParameter)e.Parameter;
// Set the view model
- ViewModel = (Base64EncoderDecoderToolViewModel)parameters.Parameter[0]!;
+ ViewModel = (Base64EncoderDecoderToolViewModel)parameters.ViewModel;
DataContext = ViewModel;
- if (!string.IsNullOrWhiteSpace((string)parameters.Parameter[1]))
+ if (!string.IsNullOrWhiteSpace(parameters.ClipBoardContent))
{
ViewModel.ConversionMode = "Decode";
- ViewModel.InputValue = (string)parameters.Parameter[1];
+ ViewModel.InputValue = parameters.ClipBoardContent;
}
base.OnNavigatedTo(e);
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs
index 07b063b78..69ecd5d73 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml.cs
@@ -35,7 +35,7 @@ namespace DevTools.Providers.Impl.Tools.HashGenerator
var parameters = (NavigationParameter)e.Parameter;
// Set the view model
- ViewModel = (HashGeneratorToolViewModel)parameters.Parameter[0]!;
+ ViewModel = (HashGeneratorToolViewModel)parameters.ViewModel;
DataContext = ViewModel;
base.OnNavigatedTo(e);
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs
index ff328f302..026e28c4f 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml.cs
@@ -35,13 +35,13 @@ namespace DevTools.Providers.Impl.Tools.JsonFormatter
var parameters = (NavigationParameter)e.Parameter;
// Set the view model
- ViewModel = (JsonFormatterToolViewModel)parameters.Parameter[0]!;
+ ViewModel = (JsonFormatterToolViewModel)parameters.ViewModel;
DataContext = ViewModel;
ViewModel.OutputTextBlock = OutputTextBlock;
- if (!string.IsNullOrWhiteSpace((string)parameters.Parameter[1]))
+ if (!string.IsNullOrWhiteSpace(parameters.ClipBoardContent))
{
- ViewModel.InputValue = (string)parameters.Parameter[1];
+ ViewModel.InputValue = parameters.ClipBoardContent;
}
base.OnNavigatedTo(e);
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.cs
index cb5a9b1ad..95bd4bfa8 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/RegEx/RegExToolPage.xaml.cs
@@ -35,7 +35,7 @@ namespace DevTools.Providers.Impl.Tools.RegEx
var parameters = (NavigationParameter)e.Parameter;
// Set the view model
- ViewModel = (RegExToolViewModel)parameters.Parameter[0]!;
+ ViewModel = (RegExToolViewModel)parameters.ViewModel;
DataContext = ViewModel;
ViewModel.MatchTextBox = MatchTextBox;
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.cs
index 5b2d712e4..f6362640d 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml.cs
@@ -35,7 +35,7 @@ namespace DevTools.Providers.Impl.Tools.TextDiff
var parameters = (NavigationParameter)e.Parameter;
// Set the view model
- ViewModel = (TextDiffToolViewModel)parameters.Parameter[0]!;
+ ViewModel = (TextDiffToolViewModel)parameters.ViewModel;
DataContext = ViewModel;
ViewModel.OutputTextBlock = OuputTextEditor;
diff --git a/src/dev/startup/DevTools/App.xaml.cs b/src/dev/startup/DevTools/App.xaml.cs
index e3d3b749c..47009f5dc 100644
--- a/src/dev/startup/DevTools/App.xaml.cs
+++ b/src/dev/startup/DevTools/App.xaml.cs
@@ -104,7 +104,8 @@ namespace DevTools
typeof(MainPage),
new NavigationParameter(
_mefComposer.ExportProvider.GetExport<IMefProvider>(),
- e.Arguments));
+ viewModel: null,
+ query: e.Arguments));
}
// Ensure the current window is active