ViewModel updates

UserInterface/ViewModels/AddCommandViewModel.cs

@@ -1,33 +1,23 @@
 using hass_workstation_service.Communication.InterProcesCommunication.Models;
 using ReactiveUI;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace UserInterface.ViewModels
 {
     public class AddCommandViewModel : ViewModelBase
     {
-        private AvailableCommands selectedType;
+        private AvailableCommands _selectedType;
-        private string description;
+        private string _name;
+        private string _description;
+        private bool _showCommandInput;
+        private bool _showKeyInput;
+        private string _moreInfoLink;
 
-        public string Description { get => description; set => this.RaiseAndSetIfChanged(ref description, value); }
+        public AvailableCommands SelectedType { get => _selectedType; set => this.RaiseAndSetIfChanged(ref _selectedType, value); }
-        public bool ShowCommandInput { get => showCommandInput; set => this.RaiseAndSetIfChanged(ref showCommandInput, value); }
+        public string Name { get => _name; set => this.RaiseAndSetIfChanged(ref _name, value); }
-        public bool ShowKeyInput { get => showKeyInput; set => this.RaiseAndSetIfChanged(ref showKeyInput, value); }
+        public string Description { get => _description; set => this.RaiseAndSetIfChanged(ref _description, value); }
-
+        public bool ShowCommandInput { get => _showCommandInput; set => this.RaiseAndSetIfChanged(ref _showCommandInput, value); }
-        private string moreInfoLink;
+        public bool ShowKeyInput { get => _showKeyInput; set => this.RaiseAndSetIfChanged(ref _showKeyInput, value); }
-        private bool showCommandInput;
+        public string MoreInfoLink { get => _moreInfoLink; set => this.RaiseAndSetIfChanged(ref _moreInfoLink, value); }
-        private bool showKeyInput;
-
-        public string MoreInfoLink
-        {
-            get { return moreInfoLink; }
-            set { this.RaiseAndSetIfChanged(ref moreInfoLink, value); }
-        }
-
-        public AvailableCommands SelectedType { get => selectedType; set => this.RaiseAndSetIfChanged(ref selectedType, value); }
-
-        public string Name { get; set; }
         public string Command { get; set; }
         public string Key { get; set; }
     }

UserInterface/ViewModels/AddSensorViewModel.cs

@@ -1,40 +1,28 @@
 using hass_workstation_service.Communication.InterProcesCommunication.Models;
 using ReactiveUI;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace UserInterface.ViewModels
 {
     public class AddSensorViewModel : ViewModelBase
     {
-        private AvailableSensors selectedType;
+        private AvailableSensors _selectedType;
-        private string description;
+        private string _name;
-        private bool showQueryInput;
+        private int _updateInterval;
-
+        private string _description;
-        public string Description { get => description; set => this.RaiseAndSetIfChanged(ref description, value); }
+        private bool _showQueryInput;
-        public bool ShowQueryInput { get => showQueryInput; set => this.RaiseAndSetIfChanged(ref showQueryInput, value); }
+        private bool _showWindowNameInput;
-        public bool ShowWindowNameInput { get => showWindowNameInput; set => this.RaiseAndSetIfChanged(ref showWindowNameInput, value); }
+        private bool _showDetectionModeOptions;
-
+        private string _moreInfoLink;
-        public bool ShowDetectionModeOptions { get => showDetectionModeOptions; set => this.RaiseAndSetIfChanged(ref showDetectionModeOptions, value); }
+
-
+        public AvailableSensors SelectedType { get => _selectedType; set => this.RaiseAndSetIfChanged(ref _selectedType, value); }
-        private string moreInfoLink;
+        public string Name { get => _name; set => this.RaiseAndSetIfChanged(ref _name, value); }
-        private int updateInterval;
+        public int UpdateInterval { get => _updateInterval; set => this.RaiseAndSetIfChanged(ref _updateInterval, value); }
-        private bool showWindowNameInput;
+        public string Description { get => _description; set => this.RaiseAndSetIfChanged(ref _description, value); }
-        private bool showDetectionModeOptions;
+        public bool ShowQueryInput { get => _showQueryInput; set => this.RaiseAndSetIfChanged(ref _showQueryInput, value); }
-
+        public bool ShowWindowNameInput { get => _showWindowNameInput; set => this.RaiseAndSetIfChanged(ref _showWindowNameInput, value); }
-        public string MoreInfoLink
+        public bool ShowDetectionModeOptions { get => _showDetectionModeOptions; set => this.RaiseAndSetIfChanged(ref _showDetectionModeOptions, value); }
-        {
+        public string MoreInfoLink { get => _moreInfoLink; set => this.RaiseAndSetIfChanged(ref _moreInfoLink, value); }
-            get { return moreInfoLink; }
-            set { this.RaiseAndSetIfChanged(ref moreInfoLink, value); }
-        }
-
-
-        public AvailableSensors SelectedType { get => selectedType; set => this.RaiseAndSetIfChanged(ref selectedType, value); }
-
-        public string Name { get; set; }
         public string Query { get; set; }
         public string WindowName { get; set; }
-        public int UpdateInterval { get => updateInterval; set => this.RaiseAndSetIfChanged(ref updateInterval, value); }
     }
 }

UserInterface/ViewModels/CommandSettingsViewModel.cs

@@ -1,15 +1,20 @@
-using ReactiveUI;
+using hass_workstation_service.Communication.InterProcesCommunication.Models;
+using ReactiveUI;
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace UserInterface.ViewModels
 {
     public class CommandSettingsViewModel : ViewModelBase
     {
-        private ICollection<CommandViewModel> configuredCommands;
+        private ICollection<CommandViewModel> _configuredCommands;
+
+        public ICollection<CommandViewModel> ConfiguredCommands
+        {
+            get => _configuredCommands;
+            set => this.RaiseAndSetIfChanged(ref _configuredCommands, value);
+        }
 
-        public ICollection<CommandViewModel> ConfiguredCommands { get => configuredCommands; set => this.RaiseAndSetIfChanged(ref configuredCommands, value); }
         public void TriggerUpdate()
         {
             this.RaisePropertyChanged();
@@ -19,7 +24,7 @@ namespace UserInterface.ViewModels
     public class CommandViewModel : ViewModelBase
     {
         public Guid Id { get; set; }
-        public string Type { get; set; }
+        public AvailableCommands Type { get; set; }
         public string Name { get; set; }
     }
 }

UserInterface/ViewModels/SensorSettingsViewModel.cs

@@ -1,15 +1,20 @@
-using ReactiveUI;
+using hass_workstation_service.Communication.InterProcesCommunication.Models;
+using ReactiveUI;
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace UserInterface.ViewModels
 {
     public class SensorSettingsViewModel : ViewModelBase
     {
-        private ICollection<SensorViewModel> configuredSensors;
+        private ICollection<SensorViewModel> _configuredSensors;
+
+        public ICollection<SensorViewModel> ConfiguredSensors
+        {
+            get => _configuredSensors;
+            set => this.RaiseAndSetIfChanged(ref _configuredSensors, value);
+        }
 
-        public ICollection<SensorViewModel> ConfiguredSensors { get => configuredSensors; set => this.RaiseAndSetIfChanged(ref configuredSensors, value); }
         public void TriggerUpdate()
         {
             this.RaisePropertyChanged();
@@ -21,30 +26,21 @@ namespace UserInterface.ViewModels
         private string _value;
 
         public Guid Id { get; set; }
-        public string Type { get; set; }
+        public AvailableSensors Type { get; set; }
         public string Name { get; set; }
         public int UpdateInterval { get; set; }
         public string Value
         {
-            get => _value; set
+            get => _value;
+            set
             {
                 this.RaiseAndSetIfChanged(ref _value, value);
-                this.RaisePropertyChanged("ValueString");
+                this.RaisePropertyChanged(nameof(ValueString));
             }
         }
-        public string UnitOfMeasurement { get; set; }
 
-        public string ValueString
+        public string UnitOfMeasurement { get; set; }
-        {
-            get
-            {
-                if (!string.IsNullOrWhiteSpace(_value))
-                {
-                    return _value + " " + UnitOfMeasurement;
-                }
-                else return "";
 
-            }
+        public string ValueString => string.IsNullOrWhiteSpace(_value) ? string.Empty : $"{_value} {UnitOfMeasurement}";
-        }
     }
 }