diff --git a/.idea/.idea.MaterialModernWPF/.idea/workspace.xml b/.idea/.idea.MaterialModernWPF/.idea/workspace.xml index 21d4a9d..c5de0b8 100644 --- a/.idea/.idea.MaterialModernWPF/.idea/workspace.xml +++ b/.idea/.idea.MaterialModernWPF/.idea/workspace.xml @@ -31,7 +31,7 @@ - + @@ -77,6 +77,9 @@ 1575410043658 + + + @@ -88,25 +91,29 @@ - + - - + + - - + + - - + + - - + + - + + + + + \ No newline at end of file diff --git a/src/App.xaml b/src/App.xaml index eddcb74..eb41d23 100644 --- a/src/App.xaml +++ b/src/App.xaml @@ -10,10 +10,6 @@ - - - - - + \ No newline at end of file diff --git a/src/App.xaml.cs b/src/App.xaml.cs index 33cd085..9ed3ad8 100644 --- a/src/App.xaml.cs +++ b/src/App.xaml.cs @@ -1,10 +1,10 @@ -using System.Windows; -using DryIoc; +using DryIoc; using MaterialModernWPF.Module; using MaterialModernWPF.Service; using MaterialModernWPF.View; using Prism.Ioc; using Prism.Modularity; +using System.Windows; namespace MaterialModernWPF { diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs index 2211234..4f943de 100644 --- a/src/AssemblyInfo.cs +++ b/src/AssemblyInfo.cs @@ -1,10 +1,10 @@ using System.Windows; -[assembly:ThemeInfo( +[assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located //(used if a resource is not found in the page, // or application resource dictionaries) ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located //(used if a resource is not found in the page, // app, or any theme specific resource dictionaries) -)] +)] \ No newline at end of file diff --git a/src/MaterialModernWPF.csproj b/src/MaterialModernWPF.csproj index fbb8761..f0e2296 100644 --- a/src/MaterialModernWPF.csproj +++ b/src/MaterialModernWPF.csproj @@ -4,6 +4,7 @@ WinExe netcoreapp3.1 true + airballoon.ico diff --git a/src/Module/MainModule.cs b/src/Module/MainModule.cs index 58dca02..615e475 100644 --- a/src/Module/MainModule.cs +++ b/src/Module/MainModule.cs @@ -1,7 +1,7 @@ -using System; -using Prism.Ioc; +using Prism.Ioc; using Prism.Modularity; using Prism.Regions; +using System; namespace MaterialModernWPF.Module { diff --git a/src/Module/MainView.xaml b/src/Module/MainView.xaml index a131e1b..57e47dc 100644 --- a/src/Module/MainView.xaml +++ b/src/Module/MainView.xaml @@ -30,4 +30,4 @@ - + \ No newline at end of file diff --git a/src/Module/MainView.xaml.cs b/src/Module/MainView.xaml.cs index cebf07a..f5b84f3 100644 --- a/src/Module/MainView.xaml.cs +++ b/src/Module/MainView.xaml.cs @@ -10,4 +10,4 @@ InitializeComponent(); } } -} +} \ No newline at end of file diff --git a/src/Module/MainViewModel.cs b/src/Module/MainViewModel.cs index 2ba255d..aba6fe5 100644 --- a/src/Module/MainViewModel.cs +++ b/src/Module/MainViewModel.cs @@ -1,5 +1,5 @@ -using System.Collections.Generic; -using MaterialModernWPF.Service; +using MaterialModernWPF.Service; +using System.Collections.Generic; namespace MaterialModernWPF.Module { diff --git a/src/Service/AdditionalMoments.cs b/src/Service/AdditionalMoments.cs index 74c13a6..72c2838 100644 --- a/src/Service/AdditionalMoments.cs +++ b/src/Service/AdditionalMoments.cs @@ -1,5 +1,5 @@ -using System; -using Prism.Events; +using Prism.Events; +using System; namespace MaterialModernWPF.Service { diff --git a/src/Service/CalculationPackage.cs b/src/Service/CalculationPackage.cs index 08a7419..5282e57 100644 --- a/src/Service/CalculationPackage.cs +++ b/src/Service/CalculationPackage.cs @@ -1,6 +1,6 @@ -using System; +using Prism.Events; +using System; using System.Windows.Controls; -using Prism.Events; namespace MaterialModernWPF.Service { @@ -32,6 +32,5 @@ namespace MaterialModernWPF.Service public class CalculationView : UserControl { - } } \ No newline at end of file diff --git a/src/Service/CalculationPackageContainer.cs b/src/Service/CalculationPackageContainer.cs index 0be73b4..2e44321 100644 --- a/src/Service/CalculationPackageContainer.cs +++ b/src/Service/CalculationPackageContainer.cs @@ -1,7 +1,7 @@ -using System.Linq; -using DryIoc; +using DryIoc; using Prism.Events; using Prism.Regions; +using System.Linq; namespace MaterialModernWPF.Service { diff --git a/src/Service/CalculationPackageSelectionChangedEvent.cs b/src/Service/CalculationPackageSelectionChangedEvent.cs index a215b05..701c072 100644 --- a/src/Service/CalculationPackageSelectionChangedEvent.cs +++ b/src/Service/CalculationPackageSelectionChangedEvent.cs @@ -4,6 +4,5 @@ namespace MaterialModernWPF.Service { public class CalculationPackageSelectionChangedEvent : PubSubEvent<(Package, bool)> { - } } \ No newline at end of file diff --git a/src/Service/DetailedGeometryPackage.cs b/src/Service/DetailedGeometryPackage.cs index 627a2fa..d857e4d 100644 --- a/src/Service/DetailedGeometryPackage.cs +++ b/src/Service/DetailedGeometryPackage.cs @@ -1,5 +1,5 @@ -using System; -using Prism.Events; +using Prism.Events; +using System; namespace MaterialModernWPF.Service { diff --git a/src/Service/DetailedGeometryView.xaml b/src/Service/DetailedGeometryView.xaml index c65b95a..22c8c3f 100644 --- a/src/Service/DetailedGeometryView.xaml +++ b/src/Service/DetailedGeometryView.xaml @@ -11,4 +11,4 @@ - + \ No newline at end of file diff --git a/src/Service/DetailedGeometryView.xaml.cs b/src/Service/DetailedGeometryView.xaml.cs index 97b6906..e58a08c 100644 --- a/src/Service/DetailedGeometryView.xaml.cs +++ b/src/Service/DetailedGeometryView.xaml.cs @@ -10,4 +10,4 @@ InitializeComponent(); } } -} +} \ No newline at end of file diff --git a/src/View/InfoDialog.xaml b/src/View/InfoDialog.xaml index 9750e12..24757fc 100644 --- a/src/View/InfoDialog.xaml +++ b/src/View/InfoDialog.xaml @@ -27,4 +27,4 @@ - + \ No newline at end of file diff --git a/src/View/ShellViewModel.cs b/src/View/ShellViewModel.cs index ad3bda9..58e9656 100644 --- a/src/View/ShellViewModel.cs +++ b/src/View/ShellViewModel.cs @@ -1,6 +1,6 @@ -using System.Windows.Input; -using Prism.Commands; +using Prism.Commands; using Prism.Mvvm; +using System.Windows.Input; namespace MaterialModernWPF.View { @@ -11,6 +11,6 @@ namespace MaterialModernWPF.View GcCollectCommand = new DelegateCommand(System.GC.Collect); } - public ICommand GcCollectCommand {get; } + public ICommand GcCollectCommand { get; } } } \ No newline at end of file