diff --git a/MaterialModernWPF/App.xaml.cs b/MaterialModernWPF/App.xaml.cs index 24f1189..33cd085 100644 --- a/MaterialModernWPF/App.xaml.cs +++ b/MaterialModernWPF/App.xaml.cs @@ -25,8 +25,8 @@ namespace MaterialModernWPF containerRegistry.Register(); containerRegistry.Register(); containerRegistry.RegisterSingleton(); - containerRegistry.RegisterSingleton(); - containerRegistry.RegisterSingleton(); + containerRegistry.RegisterSingleton(); + containerRegistry.RegisterSingleton(); containerRegistry.RegisterForNavigation(); } diff --git a/MaterialModernWPF/Module/MainViewModel.cs b/MaterialModernWPF/Module/MainViewModel.cs index 73d13fd..2ba255d 100644 --- a/MaterialModernWPF/Module/MainViewModel.cs +++ b/MaterialModernWPF/Module/MainViewModel.cs @@ -12,6 +12,6 @@ namespace MaterialModernWPF.Module _container = container; } - public IEnumerable Packages => _container.CalculationPackages; + public IEnumerable Packages => _container.CalculationPackages; } } \ No newline at end of file diff --git a/MaterialModernWPF/Service/AdditionalMoments.cs b/MaterialModernWPF/Service/AdditionalMoments.cs index 99c0710..74c13a6 100644 --- a/MaterialModernWPF/Service/AdditionalMoments.cs +++ b/MaterialModernWPF/Service/AdditionalMoments.cs @@ -3,7 +3,7 @@ using Prism.Events; namespace MaterialModernWPF.Service { - public class AdditionalMoments : CalculationPackage + public class AdditionalMoments : Package { public AdditionalMoments(IEventAggregator eventAggregator) : base(eventAggregator) { diff --git a/MaterialModernWPF/Service/CalculationPackage.cs b/MaterialModernWPF/Service/CalculationPackage.cs index a83ed39..08a7419 100644 --- a/MaterialModernWPF/Service/CalculationPackage.cs +++ b/MaterialModernWPF/Service/CalculationPackage.cs @@ -4,12 +4,12 @@ using Prism.Events; namespace MaterialModernWPF.Service { - public abstract class CalculationPackage + public abstract class Package { private readonly IEventAggregator _eventAggregator; private bool _isSelected; - protected CalculationPackage(IEventAggregator eventAggregator) + protected Package(IEventAggregator eventAggregator) { _eventAggregator = eventAggregator; } diff --git a/MaterialModernWPF/Service/CalculationPackageContainer.cs b/MaterialModernWPF/Service/CalculationPackageContainer.cs index 71b871d..0be73b4 100644 --- a/MaterialModernWPF/Service/CalculationPackageContainer.cs +++ b/MaterialModernWPF/Service/CalculationPackageContainer.cs @@ -9,7 +9,7 @@ namespace MaterialModernWPF.Service { private readonly IRegionManager _regionManager; private readonly IResolver _resolver; - public CalculationPackage[] CalculationPackages { get; } + public Package[] CalculationPackages { get; } public CalculationPackageContainer( IEventAggregator eventAggregator, IRegionManager regionManager, @@ -17,11 +17,11 @@ namespace MaterialModernWPF.Service { _regionManager = regionManager; _resolver = resolver; - CalculationPackages = resolver.ResolveMany().ToArray(); + CalculationPackages = resolver.ResolveMany().ToArray(); eventAggregator.GetEvent().Subscribe(SelectionChanged); } - private void SelectionChanged((CalculationPackage sender, bool isSelected) payload) + private void SelectionChanged((Package sender, bool isSelected) payload) { var viewKey = payload.sender.GetType().FullName; var region = _regionManager.Regions[Constants.PackagesRegion]; diff --git a/MaterialModernWPF/Service/CalculationPackageSelectionChangedEvent.cs b/MaterialModernWPF/Service/CalculationPackageSelectionChangedEvent.cs index e7470ff..a215b05 100644 --- a/MaterialModernWPF/Service/CalculationPackageSelectionChangedEvent.cs +++ b/MaterialModernWPF/Service/CalculationPackageSelectionChangedEvent.cs @@ -2,7 +2,7 @@ namespace MaterialModernWPF.Service { - public class CalculationPackageSelectionChangedEvent : PubSubEvent<(CalculationPackage, bool)> + public class CalculationPackageSelectionChangedEvent : PubSubEvent<(Package, bool)> { } diff --git a/MaterialModernWPF/Service/DetailedGeometryPackage.cs b/MaterialModernWPF/Service/DetailedGeometryPackage.cs index d4f6ef9..627a2fa 100644 --- a/MaterialModernWPF/Service/DetailedGeometryPackage.cs +++ b/MaterialModernWPF/Service/DetailedGeometryPackage.cs @@ -3,7 +3,7 @@ using Prism.Events; namespace MaterialModernWPF.Service { - public class DetailedGeometryPackage : CalculationPackage + public class DetailedGeometryPackage : Package { public DetailedGeometryPackage(IEventAggregator eventAggregator) : base(eventAggregator) { diff --git a/MaterialModernWPF/View/Shell.xaml b/MaterialModernWPF/View/Shell.xaml index a416983..add8554 100644 --- a/MaterialModernWPF/View/Shell.xaml +++ b/MaterialModernWPF/View/Shell.xaml @@ -13,6 +13,7 @@ Title="NiftyTool NG" Width="920" Height="600" + d:DataContext="{d:DesignInstance view:ShellViewModel}" modern:UIHooks.AutoDpiScale="True" prism:ViewModelLocator.AutoWireViewModel="True" Background="{DynamicResource MaterialDesignPaper}" @@ -85,7 +86,10 @@ IsChecked="False" Style="{StaticResource MaterialDesignHamburgerToggleButton}" /> -