Use materialDesign:BooleanToVisibilityConverter on SAM_SE key store UI

leosac · Mar 9, 2024 · 1ae7904 · 1ae7904
1 parent 75180c9
commit 1ae7904
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 35 deletions.
diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/Domain/SAM_SEConverters.cs b/KeyManager.Library.KeyStore.SAM_SE.UI/Domain/SAM_SEConverters.cs
diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SEKeyStorePropertiesControl.xaml b/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SEKeyStorePropertiesControl.xaml
@@ -13,11 +13,12 @@
  d:DataContext="{d:DesignInstance domain:SAM_SEKeyStorePropertiesControlViewModel}"
  d:DesignHeight="300" d:DesignWidth="500">
  <UserControl.Resources>
- <domain:BooleanToVisibilityConverter x:Key="VisibleIfTrueConverter" />
+ <materialDesign:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed" />
+ <materialDesign:BooleanToVisibilityConverter x:Key="ReverseBooleanToVisibilityConverter" TrueValue="Collapsed" FalseValue="Visible" />
  </UserControl.Resources>
  <StackPanel>
  <TextBlock HorizontalAlignment="Left" Margin="5,5,5,5" Text="{x:Static properties:Resources.KeyStoreErrorSelection}"
- Visibility="{Binding KeyStorePropertiesErrorEnable, Converter={StaticResource VisibleIfTrueConverter}}"
+ Visibility="{Binding KeyStorePropertiesErrorEnable, Converter={StaticResource BooleanToVisibilityConverter}}"
  Foreground="OrangeRed" TextWrapping="WrapWithOverflow"/>
  <Grid>
  <Grid.ColumnDefinitions>
@@ -45,6 +46,6 @@
  materialDesign:TextFieldAssist.HasClearButton="True"
  materialDesign:PasswordBoxAssist.Password="{Binding Properties.Secret, UpdateSourceTrigger=PropertyChanged}"
  Style="{StaticResource MaterialDesignFloatingHintRevealPasswordBox}"
- Visibility="{Binding SAM_SEProperties.DefaultKey, Converter={StaticResource VisibleIfTrueConverter}, ConverterParameter='negate'}" />
+ Visibility="{Binding SAM_SEProperties.DefaultKey, Converter={StaticResource ReverseBooleanToVisibilityConverter}}" />
  </StackPanel>
 </UserControl>
diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SEKeyStoreToolsControl.xaml b/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SEKeyStoreToolsControl.xaml
@@ -13,7 +13,7 @@
  d:DataContext="{d:DesignInstance domain:SAM_SEKeyStoreToolsControlViewModel}"
  d:DesignHeight="450" d:DesignWidth="800">
  <UserControl.Resources>
- <domain:BooleanToVisibilityConverter x:Key="VisibleIfTrueConverter" />
+ <materialDesign:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
  </UserControl.Resources>
  <StackPanel Orientation="Vertical">
  <materialDesign:Card Margin="5">

diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SESymmetricKeyEntryPropertiesControl.xaml b/KeyManager.Library.KeyStore.SAM_SE.UI/SAM_SESymmetricKeyEntryPropertiesControl.xaml
@@ -15,7 +15,7 @@
  d:DataContext="{d:DesignInstance domain:SAM_SESymmetricKeyEntryPropertiesControlViewModel}"
  d:DesignHeight="800" d:DesignWidth="500">
  <UserControl.Resources>
- <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+ <materialDesign:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed" />
  <libuidomain:NullToBooleanConverter x:Key="NullToBooleanConverter" />
  </UserControl.Resources>
  <StackPanel>