Replaced all encoder/decoder tools dropdown with a toggle switch (#169)

* Replaced html encoder/decoder tool dropdown with a toggle switch * Replaced base64 encoder/decoder tool dropdown with a toggle switch * Replaced url encoder/decoder tool dropdown with a toggle switch * Fix base64 encoder/decoder test
DevToys-app · Jan 21, 2022 · bd8d279 · bd8d279
1 parent a9844c3
commit bd8d279
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 57 deletions.
diff --git a/...ewModels/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs b/...ewModels/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs
@@ -22,11 +22,11 @@ public class Base64EncoderDecoderToolViewModel : ObservableRecipient, IToolViewM
         /// <summary>
         /// Whether the tool should encode or decode Base64.
         /// </summary>
-        private static readonly SettingDefinition<string> Conversion
+        private static readonly SettingDefinition<bool> EncodeMode
             = new(
-                name: $"{nameof(Base64EncoderDecoderToolViewModel)}.{nameof(Conversion)}",
+                name: $"{nameof(Base64EncoderDecoderToolViewModel)}.{nameof(EncodeMode)}",
                 isRoaming: true,
-                defaultValue: DefaultConversion);
+                defaultValue: true);
 
         /// <summary>
         /// Whether the tool should encode/decode in Unicode or ASCII.
@@ -38,8 +38,6 @@ public class Base64EncoderDecoderToolViewModel : ObservableRecipient, IToolViewM
                 defaultValue: DefaultEncoding);
 
         private const string DefaultEncoding = "UTF-8";
-        private const string DefaultConversion = "Encode";
-        internal const string DecodeConversion = "Decode";
 
         private readonly IMarketingService _marketingService;
         private readonly ISettingsProvider _settingsProvider;
@@ -81,18 +79,18 @@ public class Base64EncoderDecoderToolViewModel : ObservableRecipient, IToolViewM
         /// <summary>
         /// Gets or sets the conversion mode.
         /// </summary>
-        internal string ConversionMode
+        internal bool IsEncodeMode
         {
-            get => _settingsProvider.GetSetting(Conversion);
+            get => _settingsProvider.GetSetting(EncodeMode);
             set
             {
                 if (!_setPropertyInProgress)
                 {
                     _setPropertyInProgress = true;
                     ThreadHelper.ThrowIfNotOnUIThread();
-                    if (!string.Equals(_settingsProvider.GetSetting(Conversion), value, StringComparison.Ordinal))
+                    if (_settingsProvider.GetSetting(EncodeMode) != value)
                     {
-                        _settingsProvider.SetSetting(Conversion, value);
+                        _settingsProvider.SetSetting(EncodeMode, value);
                         OnPropertyChanged();
                     }
                     InputValue = OutputValue;
@@ -146,7 +144,7 @@ private async Task TreatQueueAsync()
             while (_conversionQueue.TryDequeue(out string? text))
             {
                 string conversionResult;
-                if (string.Equals(ConversionMode, DefaultConversion, StringComparison.Ordinal))
+                if (IsEncodeMode)
                 {
                     conversionResult = await EncodeBase64DataAsync(text).ConfigureAwait(false);
                 }

diff --git a/...s/ViewModels/Tools/EncodersDecoders/HtmlEncoderDecoder/HtmlEncoderDecoderToolViewModel.cs b/...s/ViewModels/Tools/EncodersDecoders/HtmlEncoderDecoder/HtmlEncoderDecoderToolViewModel.cs
@@ -22,14 +22,11 @@ public class HtmlEncoderDecoderToolViewModel : ObservableRecipient, IToolViewMod
         /// <summary>
         /// Whether the tool should encode or decode Html.
         /// </summary>
-        private static readonly SettingDefinition<string> Conversion
+        private static readonly SettingDefinition<bool> EncodeMode
             = new(
-                name: $"{nameof(HtmlEncoderDecoderToolViewModel)}.{nameof(Conversion)}",
+                name: $"{nameof(HtmlEncoderDecoderToolViewModel)}.{nameof(EncodeMode)}",
                 isRoaming: true,
-                defaultValue: DefaultConversion);
-
-        private const string DefaultConversion = "Encode";
-        internal const string DecodeConversion = "Decode";
+                defaultValue: true);
 
         private readonly IMarketingService _marketingService;
         private readonly ISettingsProvider _settingsProvider;
@@ -71,20 +68,20 @@ public class HtmlEncoderDecoderToolViewModel : ObservableRecipient, IToolViewMod
         /// <summary>
         /// Gets or sets the conversion mode.
         /// </summary>
-        internal string ConversionMode
+        internal bool IsEncodeMode
         {
-            get => _settingsProvider.GetSetting(Conversion);
+            get => _settingsProvider.GetSetting(EncodeMode);
             set
             {
                 if (!_setPropertyInProgress)
                 {
                     _setPropertyInProgress = true;
                     ThreadHelper.ThrowIfNotOnUIThread();
-                    if (!string.Equals(_settingsProvider.GetSetting(Conversion), value, StringComparison.Ordinal))
+                    if (_settingsProvider.GetSetting(EncodeMode) != value)
                     {
-                        _settingsProvider.SetSetting(Conversion, value);
+                        _settingsProvider.SetSetting(EncodeMode, value);
                         OnPropertyChanged();
-                    }
+                    }                 
                     InputValue = OutputValue;
                     _setPropertyInProgress = false;
                 }
@@ -118,7 +115,7 @@ private async Task TreatQueueAsync()
             while (_conversionQueue.TryDequeue(out string? text))
             {
                 string conversionResult;
-                if (string.Equals(ConversionMode, DefaultConversion, StringComparison.Ordinal))
+                if (IsEncodeMode)
                 {
                     conversionResult = await EncodeHtmlDataAsync(text).ConfigureAwait(false);
                 }

diff --git a/...oys/ViewModels/Tools/EncodersDecoders/UrlEncoderDecoder/UrlEncoderDecoderToolViewModel.cs b/...oys/ViewModels/Tools/EncodersDecoders/UrlEncoderDecoder/UrlEncoderDecoderToolViewModel.cs
@@ -21,14 +21,12 @@ public class UrlEncoderDecoderToolViewModel : ObservableRecipient, IToolViewMode
         /// <summary>
         /// Whether the tool should encode or decode Url.
         /// </summary>
-        private static readonly SettingDefinition<string> Conversion
+        private static readonly SettingDefinition<bool> EncodeMode
             = new(
-                name: $"{nameof(UrlEncoderDecoderToolViewModel)}.{nameof(Conversion)}",
+                name: $"{nameof(UrlEncoderDecoderToolViewModel)}.{nameof(EncodeMode)}",
                 isRoaming: true,
-                defaultValue: DefaultConversion);
+                defaultValue: true);
 
-        private const string DefaultConversion = "Encode";
-        internal const string DecodeConversion = "Decode";
 
         private readonly IMarketingService _marketingService;
         private readonly ISettingsProvider _settingsProvider;
@@ -70,18 +68,18 @@ public class UrlEncoderDecoderToolViewModel : ObservableRecipient, IToolViewMode
         /// <summary>
         /// Gets or sets the conversion mode.
         /// </summary>
-        internal string ConversionMode
+        internal bool IsEncodeMode
         {
-            get => _settingsProvider.GetSetting(Conversion);
+            get => _settingsProvider.GetSetting(EncodeMode);
             set
             {
                 if (!_setPropertyInProgress)
                 {
                     _setPropertyInProgress = true;
                     ThreadHelper.ThrowIfNotOnUIThread();
-                    if (!string.Equals(_settingsProvider.GetSetting(Conversion), value, StringComparison.Ordinal))
+                    if (_settingsProvider.GetSetting(EncodeMode) != value)
                     {
-                        _settingsProvider.SetSetting(Conversion, value);
+                        _settingsProvider.SetSetting(EncodeMode, value);
                         OnPropertyChanged();
                     }
                     InputValue = OutputValue;
@@ -117,7 +115,7 @@ private async Task TreatQueueAsync()
             while (_conversionQueue.TryDequeue(out string? text))
             {
                 string conversionResult;
-                if (string.Equals(ConversionMode, DefaultConversion, StringComparison.Ordinal))
+                if (IsEncodeMode)
                 {
                     conversionResult = await EncodeUrlDataAsync(text).ConfigureAwait(false);
                 }

diff --git a/...vToys/Views/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml b/...vToys/Views/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml
@@ -44,12 +44,10 @@
                 <controls:ExpandableSettingControl.Icon>
                     <FontIcon Glyph="&#xF18D;" />
                 </controls:ExpandableSettingControl.Icon>
-                <ComboBox
-                    SelectedValuePath="Tag"
-                    SelectedValue="{x:Bind ViewModel.ConversionMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
-                    <ComboBoxItem Tag="Encode" Content="{x:Bind ViewModel.Strings.ConversionEncode}" />
-                    <ComboBoxItem Tag="Decode" Content="{x:Bind ViewModel.Strings.ConversionDecode}"/>
-                </ComboBox>
+                <ToggleSwitch 
+                    Style="{StaticResource RightAlignedToggleSwitchStyle}"
+                    OnContent="{x:Bind ViewModel.Strings.ConversionEncode}" OffContent="{x:Bind ViewModel.Strings.ConversionDecode}"
+                    IsOn="{x:Bind ViewModel.IsEncodeMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </controls:ExpandableSettingControl>
             <controls:ExpandableSettingControl
                 x:Name="EncodingSetting"

diff --git a/...ys/Views/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs b/...ys/Views/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml.cs
@@ -46,7 +46,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
             if (!string.IsNullOrWhiteSpace(parameters.ClipBoardContent))
             {
-                ViewModel.ConversionMode = Base64EncoderDecoderToolViewModel.DecodeConversion;
+                ViewModel.IsEncodeMode = false;
                 ViewModel.InputValue = parameters.ClipBoardContent;
             }
 

diff --git a/...l/DevToys/Views/Tools/EncodersDecoders/HtmlEncoderDecoder/HtmlEncoderDecoderToolPage.xaml b/...l/DevToys/Views/Tools/EncodersDecoders/HtmlEncoderDecoder/HtmlEncoderDecoderToolPage.xaml
@@ -5,7 +5,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:DevToys.UI.Controls"
-    xmlns:ex="using:DevToys.UI.Extensions"
+    xmlns:ex="using:DevToys.UI.Extensions" 
     mc:Ignorable="d"
     NavigationCacheMode="Required">
 
@@ -31,12 +31,10 @@
                 <controls:ExpandableSettingControl.Icon>
                     <FontIcon Glyph="&#xF18D;" />
                 </controls:ExpandableSettingControl.Icon>
-                <ComboBox
-                    SelectedValuePath="Tag"
-                    SelectedValue="{x:Bind ViewModel.ConversionMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
-                    <ComboBoxItem Tag="Encode" Content="{x:Bind ViewModel.Strings.ConversionEncode}" />
-                    <ComboBoxItem Tag="Decode" Content="{x:Bind ViewModel.Strings.ConversionDecode}"/>
-                </ComboBox>
+                <ToggleSwitch 
+                    Style="{StaticResource RightAlignedToggleSwitchStyle}"
+                    OnContent="{x:Bind ViewModel.Strings.ConversionEncode}" OffContent="{x:Bind ViewModel.Strings.ConversionDecode}"
+                    IsOn="{x:Bind ViewModel.IsEncodeMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </controls:ExpandableSettingControl>
         </StackPanel>
 

diff --git a/...evToys/Views/Tools/EncodersDecoders/HtmlEncoderDecoder/HtmlEncoderDecoderToolPage.xaml.cs b/...evToys/Views/Tools/EncodersDecoders/HtmlEncoderDecoder/HtmlEncoderDecoderToolPage.xaml.cs
@@ -46,7 +46,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
             if (!string.IsNullOrWhiteSpace(parameters.ClipBoardContent))
             {
-                ViewModel.ConversionMode = HtmlEncoderDecoderToolViewModel.DecodeConversion;
+                ViewModel.IsEncodeMode = false;
                 ViewModel.InputValue = parameters.ClipBoardContent;
             }
 

diff --git a/...mpl/DevToys/Views/Tools/EncodersDecoders/URLEncoderDecoder/UrlEncoderDecoderToolPage.xaml b/...mpl/DevToys/Views/Tools/EncodersDecoders/URLEncoderDecoder/UrlEncoderDecoderToolPage.xaml
@@ -15,7 +15,7 @@
                 <EntranceThemeTransition IsStaggeringEnabled="True" FromVerticalOffset="50"/>
             </TransitionCollection>
         </Grid.ChildrenTransitions>
-        
+
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
@@ -31,12 +31,10 @@
                 <controls:ExpandableSettingControl.Icon>
                     <FontIcon Glyph="&#xF18D;" />
                 </controls:ExpandableSettingControl.Icon>
-                <ComboBox
-                    SelectedValuePath="Tag"
-                    SelectedValue="{x:Bind ViewModel.ConversionMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
-                    <ComboBoxItem Tag="Encode" Content="{x:Bind ViewModel.Strings.ConversionEncode}" />
-                    <ComboBoxItem Tag="Decode" Content="{x:Bind ViewModel.Strings.ConversionDecode}"/>
-                </ComboBox>
+                <ToggleSwitch 
+                    Style="{StaticResource RightAlignedToggleSwitchStyle}"
+                    OnContent="{x:Bind ViewModel.Strings.ConversionEncode}" OffContent="{x:Bind ViewModel.Strings.ConversionDecode}"
+                    IsOn="{x:Bind ViewModel.IsEncodeMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </controls:ExpandableSettingControl>
         </StackPanel>
 

diff --git a/.../DevToys/Views/Tools/EncodersDecoders/URLEncoderDecoder/UrlEncoderDecoderToolPage.xaml.cs b/.../DevToys/Views/Tools/EncodersDecoders/URLEncoderDecoder/UrlEncoderDecoderToolPage.xaml.cs
@@ -46,7 +46,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
             if (!string.IsNullOrWhiteSpace(parameters.ClipBoardContent))
             {
-                ViewModel.ConversionMode = UrlEncoderDecoderToolViewModel.DecodeConversion;
+                ViewModel.IsEncodeMode = false;
                 ViewModel.InputValue = parameters.ClipBoardContent;
             }
 

diff --git a/src/tests/DevToys.Tests/Providers/Tools/Base64EncoderDecoderTests.cs b/src/tests/DevToys.Tests/Providers/Tools/Base64EncoderDecoderTests.cs
@@ -40,7 +40,7 @@ public async Task EncoderAsync(string input, string expectedResult)
 
             await ThreadHelper.RunOnUIThreadAsync(() =>
             {
-                viewModel.ConversionMode = "Encode";
+                viewModel.IsEncodeMode = true;
                 viewModel.InputValue = input;
             });
 
@@ -60,7 +60,7 @@ public async Task DecodeAsync(string input, string expectedResult)
 
             await ThreadHelper.RunOnUIThreadAsync(() =>
             {
-                viewModel.ConversionMode = "Decode";
+                viewModel.IsEncodeMode = false;
                 viewModel.InputValue = input;
             });