Skip to content

A Swiss Army knife for developers.

added smart detection for Number Base Converter (#91)

BenjaminT471da2b04d97
diff --git a/src/dev/impl/DevToys/DevToys.csproj b/src/dev/impl/DevToys/DevToys.csproj
index a9a5499d1..26c4ebbed 100644
--- a/src/dev/impl/DevToys/DevToys.csproj
+++ b/src/dev/impl/DevToys/DevToys.csproj
@@ -24,6 +24,7 @@
<Compile Include="Api\Core\OOP\IAppService.cs" />
<Compile Include="Core\OOP\AppService.cs" />
<Compile Include="Core\Threading\AsyncLazy.cs" />
+ <Compile Include="Helpers\NumberBaseHelper.cs" />
<Compile Include="Models\Radix.cs" />
<Compile Include="Models\NumberBaseFormat.cs" />
<Compile Include="UI\Converters\BooleanToDoubleConverter.cs" />
diff --git a/src/dev/impl/DevToys/Helpers/NumberBaseHelper.cs b/src/dev/impl/DevToys/Helpers/NumberBaseHelper.cs
new file mode 100644
index 000000000..d4c1b32ae
--- /dev/null
+++ b/src/dev/impl/DevToys/Helpers/NumberBaseHelper.cs
@@ -0,0 +1,53 @@
+#nullable enable
+
+using System.Globalization;
+using DevToys.Core.Formatter;
+
+namespace DevToys.Helpers
+{
+ internal static class NumberBaseHelper
+ {
+ /// <summary>
+ /// Detects whether the given string is a valid Hexadecimal Number or not.
+ /// </summary>
+ internal static bool IsValidHexadecimal(string? input)
+ {
+ if (string.IsNullOrWhiteSpace(input))
+ {
+ return false;
+ }
+
+ long.TryParse(input, NumberStyles.HexNumber, null, out long output);
+ if (output is not 0)
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ /// <summary>
+ /// Detects whether the given string is a valid Binary Number or not.
+ /// </summary>
+ internal static bool IsValidBinary(string? input)
+ {
+ if (string.IsNullOrWhiteSpace(input))
+ {
+ return false;
+ }
+
+ input = input!.Replace("\0", string.Empty);
+
+ foreach (char @char in input!)
+ {
+ if (@char is not '0' and not '1')
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ }
+}
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/NumberBaseConverter/NumberBaseConverterToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/NumberBaseConverter/NumberBaseConverterToolProvider.cs
index 77bed7568..f321b5863 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/NumberBaseConverter/NumberBaseConverterToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/NumberBaseConverter/NumberBaseConverterToolProvider.cs
@@ -3,7 +3,9 @@
using System.Composition;
using System.Threading.Tasks;
using DevToys.Api.Tools;
+using DevToys.Core.Formatter;
using DevToys.Core.Threading;
+using DevToys.Helpers;
using DevToys.Shared.Api.Core;
using Windows.UI.Xaml.Controls;
@@ -22,7 +24,6 @@ namespace DevToys.ViewModels.Tools.NumberBaseConverter
public string AccessibleName => LanguageManager.Instance.NumberBaseConverter.AccessibleName;
-
public object IconSource
=> new TaskCompletionNotifier<IconElement>(
ThreadHelper.RunOnUIThreadAsync(() =>
@@ -42,7 +43,8 @@ namespace DevToys.ViewModels.Tools.NumberBaseConverter
public bool CanBeTreatedByTool(string data)
{
- return false;
+ data = NumberBaseFormatter.RemoveFormatting(data).ToString();
+ return NumberBaseHelper.IsValidBinary(data) || NumberBaseHelper.IsValidHexadecimal(data);
}
public IToolViewModel CreateTool()
diff --git a/src/dev/impl/DevToys/Views/Tools/NumberBaseConverter/NumberBaseConverterToolPage.xaml.cs b/src/dev/impl/DevToys/Views/Tools/NumberBaseConverter/NumberBaseConverterToolPage.xaml.cs
index f5ac4ed19..d3e899371 100644
--- a/src/dev/impl/DevToys/Views/Tools/NumberBaseConverter/NumberBaseConverterToolPage.xaml.cs
+++ b/src/dev/impl/DevToys/Views/Tools/NumberBaseConverter/NumberBaseConverterToolPage.xaml.cs
@@ -1,6 +1,9 @@
#nullable enable
using DevToys.Api.Core.Navigation;
+using DevToys.Core.Formatter;
+using DevToys.Helpers;
+using DevToys.Models;
using DevToys.Shared.Core;
using DevToys.ViewModels.Tools.NumberBaseConverter;
using Windows.UI.Xaml;
@@ -34,16 +37,32 @@ namespace DevToys.Views.Tools.NumberBaseConverter
protected override void OnNavigatedTo(NavigationEventArgs e)
{
+ var parameters = (NavigationParameter)e.Parameter;
+
if (ViewModel is null)
{
- var parameters = (NavigationParameter)e.Parameter;
-
// Set the view model
Assumes.NotNull(parameters.ViewModel, nameof(parameters.ViewModel));
ViewModel = (NumberBaseConverterToolViewModel)parameters.ViewModel!;
DataContext = ViewModel;
}
+ if (!string.IsNullOrWhiteSpace(parameters.ClipBoardContent))
+ {
+ string clipBoardContent = NumberBaseFormatter.RemoveFormatting(parameters.ClipBoardContent).ToString();
+
+ if (NumberBaseHelper.IsValidBinary(clipBoardContent!))
+ {
+ ViewModel.InputBaseNumber = NumberBaseFormat.Binary;
+ }
+ else if (NumberBaseHelper.IsValidHexadecimal(clipBoardContent!))
+ {
+ ViewModel.InputBaseNumber = NumberBaseFormat.Hexadecimal;
+ }
+
+ ViewModel.InputValue = parameters.ClipBoardContent;
+ }
+
base.OnNavigatedTo(e);
}
}