Namensrefactory

This commit is contained in:
2023-03-29 16:31:48 +02:00
parent a1f5b8437c
commit 29e1801cee
41 changed files with 124 additions and 61 deletions

View File

@@ -1,4 +1,4 @@
<Application x:Class="SewerStammGen.App"
<Application x:Class="SewerStammGen.WPF.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:SewerStammGen"

View File

@@ -1,7 +1,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using SewerStammGen.HostBuilders;
using SewerStammGen.ViewModel;
using SewerStammGen.WPF.ViewModel;
using System;
using System.Collections.Generic;
using System.Configuration;
@@ -10,7 +10,7 @@ using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace SewerStammGen
namespace SewerStammGen.WPF
{
/// <summary>
/// Interaction logic for App.xaml

View File

@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace SewerStammGen.Commands
namespace SewerStammGen.WPF.Commands
{
internal abstract class AsyncCommandBase : ICommand
{

View File

@@ -1,13 +1,13 @@
using SewerStammGen.Enum;
using SewerStammGen.Interface;
using SewerStammGen.Interface.Navigator;
using SewerStammGen.WPF.Interface;
using SewerStammGen.WPF.Interface.Navigator;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.Commands
namespace SewerStammGen.WPF.Commands
{
internal class UpdateCurrentViewModelCommand : AsyncCommandBase
{

View File

@@ -1,7 +1,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using SewerStammGen.Interface.Navigator;
using SewerStammGen.ViewModel.State.Navigation;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel.State.Navigation;
using System;
using System.Collections.Generic;
using System.Linq;

View File

@@ -1,8 +1,8 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using SewerStammGen.Interface;
using SewerStammGen.ViewModel;
using SewerStammGen.ViewModel.Factories;
using SewerStammGen.WPF.Interface;
using SewerStammGen.WPF.ViewModel;
using SewerStammGen.WPF.ViewModel.Factories;
using System;
using System.Collections.Generic;
using System.Linq;

View File

@@ -1,12 +1,12 @@
using SewerStammGen.Enum;
using SewerStammGen.ViewModel;
using SewerStammGen.WPF.ViewModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.Interface
namespace SewerStammGen.WPF.Interface
{
public interface IViewModelAbstractFactory
{

View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.Interface.Navigator
namespace SewerStammGen.WPF.Interface.Navigator
{
public interface IMainWindowNavigator : INavigator
{

View File

@@ -1,11 +1,11 @@
using SewerStammGen.ViewModel;
using SewerStammGen.WPF.ViewModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.Interface.Navigator
namespace SewerStammGen.WPF.Interface.Navigator
{
public interface INavigator
{

View File

@@ -1,13 +1,13 @@
<Window x:Class="SewerStammGen.MainWindow"
<Window x:Class="SewerStammGen.WPF.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
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"
xmlns:my="clr-namespace:SewerStammGen.WPF.Views"
xmlns:local="clr-namespace:SewerStammGen.WPF"
xmlns:view="clr-namespace:SewerStammGen.WPF.Views"
xmlns:viewmodel="clr-namespace:SewerStammGen.WPF.ViewModel"
xmlns:controls="clr-namespace:SewerStammGen.WPF.Views.Controls"
mc:Ignorable="d"
Title="{Binding ApplicationTitle}" Height="450" Width="800">
<Window.Resources>

View File

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace SewerStammGen
namespace SewerStammGen.WPF
{
/// <summary>
/// Interaction logic for MainWindow.xaml

View File

@@ -13,6 +13,9 @@
<Compile Update="Views\HomeView.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="Views\Projekte\ProjektListView.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="Views\UCEditSchacht.xaml.cs">
<SubType>Code</SubType>
</Compile>
@@ -33,6 +36,9 @@
<Page Update="Views\HomeView.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Views\Projekte\ProjektListView.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Views\styles\my_controls.xaml">
<SubType>Designer</SubType>
</Page>

View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.ViewModel
namespace SewerStammGen.WPF.ViewModel
{
public delegate TViewModel CreateViewModel<TViewModel>() where TViewModel : BaseViewModel;
public class BaseViewModel : ObservableObject

View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.ViewModel
namespace SewerStammGen.WPF.ViewModel
{
public class EditManHoleViewModel : BaseViewModel
{

View File

@@ -1,12 +1,12 @@
using SewerStammGen.Enum;
using SewerStammGen.Interface;
using SewerStammGen.WPF.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.ViewModel.Factories
namespace SewerStammGen.WPF.ViewModel.Factories
{
public class MainWindowViewModelFactory : IViewModelAbstractFactory
{

View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.ViewModel
namespace SewerStammGen.WPF.ViewModel
{
public class HomeViewModel : BaseViewModel
{

View File

@@ -1,7 +1,7 @@
using SewerStammGen.Commands;
using SewerStammGen.WPF.Commands;
using SewerStammGen.Enum;
using SewerStammGen.Interface;
using SewerStammGen.Interface.Navigator;
using SewerStammGen.WPF.Interface;
using SewerStammGen.WPF.Interface.Navigator;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -10,7 +10,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace SewerStammGen.ViewModel
namespace SewerStammGen.WPF.ViewModel
{
public class MainWindowViewModel : BaseViewModel
{

View File

@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Runtime.CompilerServices;
namespace SewerStammGen.ViewModel
namespace SewerStammGen.WPF.ViewModel
{
public class ObservableObject : INotifyPropertyChanged
{

View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.ViewModel
namespace SewerStammGen.WPF.ViewModel
{
public class ProjectListViewModel : BaseViewModel
{

View File

@@ -0,0 +1,13 @@
using SewerStammGen.WPF.ViewModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.WPF.ViewModel
{
public class ProjektListViewModel : BaseViewModel
{
}
}

View File

@@ -6,7 +6,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace SewerStammGen.ViewModel
namespace SewerStammGen.WPF.ViewModel
{
[Serializable]
class RelayCommand : ICommand

View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.ViewModel
namespace SewerStammGen.WPF.ViewModel
{
public class SewerConnectorViewModel : BaseViewModel
{

View File

@@ -1,11 +1,11 @@
using SewerStammGen.Interface.Navigator;
using SewerStammGen.WPF.Interface.Navigator;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.ViewModel.State.Navigation
namespace SewerStammGen.WPF.ViewModel.State.Navigation
{
internal class MainWindowNavigator : ObservableObject, IMainWindowNavigator
{

View File

@@ -1,12 +1,12 @@
<UserControl x:Class="SewerStammGen.Views.Controls.UCMainWindowNavigationBar"
<UserControl x:Class="SewerStammGen.WPF.Views.Controls.UCMainWindowNavigationBar"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:nav="clr-namespace:SewerStammGen.Enum"
xmlns:viewmodel="clr-namespace:SewerStammGen.ViewModel"
xmlns:converter="clr-namespace:SewerStammGen.Views.Converters"
xmlns:local="clr-namespace:SewerStammGen.Views.Controls"
xmlns:viewmodel="clr-namespace:SewerStammGen.WPF.ViewModel"
xmlns:converter="clr-namespace:SewerStammGen.WPF.Views.Converters"
xmlns:local="clr-namespace:SewerStammGen.WPF.Views.Controls"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
d:DesignHeight="450" d:DesignWidth="800">

View File

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace SewerStammGen.Views.Controls
namespace SewerStammGen.WPF.Views.Controls
{
/// <summary>
/// Interaktionslogik für UCMainWindowNavigationBar.xaml

View File

@@ -7,7 +7,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
namespace SewerStammGen.Views.Converters
namespace SewerStammGen.WPF.Views.Converters
{
public class EqualValueToParameterConverter : IValueConverter
{

View File

@@ -1,9 +1,9 @@
<UserControl x:Class="SewerStammGen.Views.HomeView"
<UserControl x:Class="SewerStammGen.WPF.Views.HomeView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SewerStammGen.Views"
xmlns:local="clr-namespace:SewerStammGen.WPF.Views"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

View File

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace SewerStammGen.Views
namespace SewerStammGen.WPF.Views
{
/// <summary>
/// Interaktionslogik für HomeView.xaml

View File

@@ -0,0 +1,15 @@
<UserControl x:Class="SewerStammGen.WPF.Views.Projekte.ProjektListView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SewerStammGen.WPF.Views.Projekte"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<DataGrid ItemsSource="{Binding Projekte}">
</DataGrid>
</Grid>
</UserControl>

View File

@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace SewerStammGen.WPF.Views.Projekte
{
/// <summary>
/// Interaktionslogik für ProjektListView.xaml
/// </summary>
public partial class ProjektListView : UserControl
{
public ProjektListView()
{
InitializeComponent();
}
}
}

View File

@@ -1,9 +1,9 @@
<UserControl x:Class="SewerStammGen.Views.UCEditSchacht"
<UserControl x:Class="SewerStammGen.WPF.Views.UCEditSchacht"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SewerStammGen.Views"
xmlns:local="clr-namespace:SewerStammGen.WPF.Views"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

View File

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace SewerStammGen.Views
namespace SewerStammGen.WPF.Views
{
/// <summary>
/// Interaktionslogik für UCEditSchacht.xaml

View File

@@ -1,9 +1,9 @@
<UserControl x:Class="SewerStammGen.Views.UCNormXML"
<UserControl x:Class="SewerStammGen.WPF.Views.UCNormXML"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SewerStammGen.Views"
xmlns:local="clr-namespace:SewerStammGen.WPF.Views"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

View File

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace SewerStammGen.Views
namespace SewerStammGen.WPF.Views
{
/// <summary>
/// Interaktionslogik für UCNormXML.xaml

View File

@@ -1,10 +1,10 @@
<UserControl x:Class="SewerStammGen.Views.UCSewerConnector"
<UserControl x:Class="SewerStammGen.WPF.Views.UCSewerConnector"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:syncfusion="http://schemas.syncfusion.com/wpf"
xmlns:local="clr-namespace:SewerStammGen.Views"
xmlns:local="clr-namespace:SewerStammGen.WPF.Views"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>

View File

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace SewerStammGen.Views
namespace SewerStammGen.WPF.Views
{
/// <summary>
/// Interaktionslogik für UCSewerConnector.xaml