diff --git a/SewerStammGen/Enum/EMainWindowViewType.cs b/SewerStammGen/Enum/EMainWindowViewType.cs index 4064bd1..dd490ec 100644 --- a/SewerStammGen/Enum/EMainWindowViewType.cs +++ b/SewerStammGen/Enum/EMainWindowViewType.cs @@ -10,7 +10,7 @@ namespace SewerStammGen.Enum { Home, Projects, - Manholes, + EditSchacht, Sewer } } diff --git a/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs b/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs index 325671f..e910fce 100644 --- a/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs +++ b/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs @@ -23,6 +23,11 @@ namespace SewerStammGen.HostBuilders return () => new HomeViewModel(); }); + services.AddSingleton>(services => + { + return () => new EditManHoleViewModel(); + }); + services.AddSingleton(); diff --git a/SewerStammGen/MainWindow.xaml b/SewerStammGen/MainWindow.xaml index 53ac263..b1f25a5 100644 --- a/SewerStammGen/MainWindow.xaml +++ b/SewerStammGen/MainWindow.xaml @@ -5,9 +5,21 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:my="clr-namespace:SewerStammGen.Views" xmlns:local="clr-namespace:SewerStammGen" + xmlns:view="clr-namespace:SewerStammGen.Views" + xmlns:viewmodel="clr-namespace:SewerStammGen.ViewModel" xmlns:controls="clr-namespace:SewerStammGen.Views.Controls" mc:Ignorable="d" - Title="MainWindow" Height="450" Width="800"> + Title="{Binding ApplicationTitle}" Height="450" Width="800"> + + + + + + + + + + diff --git a/SewerStammGen/SewerStammGen.csproj.user b/SewerStammGen/SewerStammGen.csproj.user index e8337de..32373c9 100644 --- a/SewerStammGen/SewerStammGen.csproj.user +++ b/SewerStammGen/SewerStammGen.csproj.user @@ -10,10 +10,10 @@ Code - + Code - + Code @@ -30,15 +30,15 @@ Designer - - Designer - Designer Designer + + Designer + Designer diff --git a/SewerStammGen/ViewModel/EditManHoleViewModel.cs b/SewerStammGen/ViewModel/EditManHoleViewModel.cs new file mode 100644 index 0000000..c4c38ae --- /dev/null +++ b/SewerStammGen/ViewModel/EditManHoleViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SewerStammGen.ViewModel +{ + public class EditManHoleViewModel : BaseViewModel + { + } +} diff --git a/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs b/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs index c64c3a5..f9823e0 100644 --- a/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs +++ b/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs @@ -11,12 +11,15 @@ namespace SewerStammGen.ViewModel.Factories public class MainWindowViewModelFactory : IViewModelAbstractFactory { private CreateViewModel _createHomeViewModel; + private CreateViewModel _createEditManholeViewModel; public MainWindowViewModelFactory( - CreateViewModel createHomeViewModel + CreateViewModel createHomeViewModel, + CreateViewModel createEditManholeViewModel ) { _createHomeViewModel = createHomeViewModel; + _createEditManholeViewModel = createEditManholeViewModel; } public BaseViewModel CreateViewModel(EMainWindowViewType viewType) @@ -26,6 +29,9 @@ namespace SewerStammGen.ViewModel.Factories case EMainWindowViewType.Home: return _createHomeViewModel(); + case EMainWindowViewType.EditSchacht: + return _createEditManholeViewModel(); + default: throw new NotImplementedException(); } diff --git a/SewerStammGen/ViewModel/MainWindowViewModel.cs b/SewerStammGen/ViewModel/MainWindowViewModel.cs index 766becc..56d3e9f 100644 --- a/SewerStammGen/ViewModel/MainWindowViewModel.cs +++ b/SewerStammGen/ViewModel/MainWindowViewModel.cs @@ -19,6 +19,11 @@ namespace SewerStammGen.ViewModel public ICommand UpdateCurrentViewModelCommand { get; } + public static string ApplicationTitle + { + get => "Stammdatengenerator Version 0.1"; + } + public MainWindowViewModel( IMainWindowNavigator navigator, IViewModelAbstractFactory viewModelFactory @@ -29,6 +34,15 @@ namespace SewerStammGen.ViewModel UpdateCurrentViewModelCommand = new UpdateCurrentViewModelCommand(navigator, viewModelFactory); UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Home); + + + + Navigator.StateChanged += Navigator_StateChanged; + } + + private void Navigator_StateChanged() + { + OnPropertyChanged(nameof(CurrentViewModel)); } } } diff --git a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml b/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml index d7eec9b..445fef4 100644 --- a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml +++ b/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml @@ -16,8 +16,8 @@ - - + + diff --git a/SewerStammGen/Views/EditSchacht.xaml b/SewerStammGen/Views/EditSchacht.xaml deleted file mode 100644 index d3ae6ec..0000000 --- a/SewerStammGen/Views/EditSchacht.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/SewerStammGen/Views/HomeView.xaml b/SewerStammGen/Views/HomeView.xaml index 8230e6b..90ca2ed 100644 --- a/SewerStammGen/Views/HomeView.xaml +++ b/SewerStammGen/Views/HomeView.xaml @@ -7,6 +7,6 @@ mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800"> - + diff --git a/SewerStammGen/Views/UCEditSchacht.xaml b/SewerStammGen/Views/UCEditSchacht.xaml new file mode 100644 index 0000000..5162173 --- /dev/null +++ b/SewerStammGen/Views/UCEditSchacht.xaml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + +