diff --git a/SmartAquaViewer/App.xaml b/SmartAquaViewer/App.xaml index 7961e0e..a0a735b 100644 --- a/SmartAquaViewer/App.xaml +++ b/SmartAquaViewer/App.xaml @@ -2,31 +2,34 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:SmartAquaViewer" + xmlns:classes="clr-namespace:SmartAquaViewer.Classes" xmlns:view="clr-namespace:SmartAquaViewer.View" xmlns:vm="clr-namespace:SmartAquaViewer.ViewModel" StartupUri="MainWindow.xaml"> + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -41,6 +44,7 @@ + diff --git a/SmartAquaViewer/Classes/Converter.cs b/SmartAquaViewer/Classes/Converter.cs index 9023b12..4e2b20c 100644 --- a/SmartAquaViewer/Classes/Converter.cs +++ b/SmartAquaViewer/Classes/Converter.cs @@ -4,6 +4,7 @@ using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows; using System.Windows.Data; namespace SmartAquaViewer.Classes @@ -78,4 +79,32 @@ namespace SmartAquaViewer.Classes public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException(); } + + public class BoolToVisibilityConverter : IValueConverter + { + public bool Inverse { get; set; } + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + bool flag = false; + + if (value is bool b) + flag = b; + + if (Inverse) + flag = !flag; + + return flag ? Visibility.Visible : Visibility.Collapsed; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value is Visibility visibility) + { + bool flag = visibility == Visibility.Visible; + return Inverse ? !flag : flag; + } + return false; + } + } } diff --git a/SmartAquaViewer/Resources/Generic.xaml b/SmartAquaViewer/Resources/Generic.xaml index 18947f5..57cb6c4 100644 --- a/SmartAquaViewer/Resources/Generic.xaml +++ b/SmartAquaViewer/Resources/Generic.xaml @@ -1,11 +1,15 @@  + + pack://application:,,,/Fonts/#S-Core Dream 1 Thin pack://application:,,,/Fonts/#S-Core Dream 2 ExtraLight pack://application:,,,/Fonts/#S-Core Dream 3 Light @@ -192,6 +196,8 @@ + + + + + \ No newline at end of file diff --git a/SmartAquaViewer/View/MonitoringView.xaml b/SmartAquaViewer/View/MonitoringView.xaml index 8b5cec8..9884b1d 100644 --- a/SmartAquaViewer/View/MonitoringView.xaml +++ b/SmartAquaViewer/View/MonitoringView.xaml @@ -22,509 +22,520 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -585,17 +596,30 @@ - + + Style="{StaticResource MaterialDesignChoiceChipListBox}" + ItemContainerStyle="{StaticResource TransparentListBoxItemStyle}" + Background="Transparent"> + + + + + + + +