From 47ddaa4db02fa0e7ce38dd4585240e6afc88bcb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Ehrenm=C3=BCller?= Date: Thu, 29 May 2025 14:08:03 +0200 Subject: [PATCH] Fix namespace for DesignInstances in MaterialDesignDemo.Shared.Domain --- src/MainDemo.Wpf/Buttons.xaml | 4 ++-- src/MainDemo.Wpf/ColorTool.xaml | 4 ++-- src/MainDemo.Wpf/ComboBoxes.xaml | 4 ++-- src/MainDemo.Wpf/Domain/DocumentationLinks.xaml | 3 ++- src/MainDemo.Wpf/MainWindow.xaml | 3 ++- src/MaterialDesign3.Demo.Wpf/Buttons.xaml | 4 ++-- src/MaterialDesign3.Demo.Wpf/ColorTool.xaml | 4 ++-- src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/MainDemo.Wpf/Buttons.xaml b/src/MainDemo.Wpf/Buttons.xaml index 7702f7878e..c5a8b6b33f 100644 --- a/src/MainDemo.Wpf/Buttons.xaml +++ b/src/MainDemo.Wpf/Buttons.xaml @@ -2,13 +2,13 @@ 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:domain="clr-namespace:MaterialDesignDemo.Domain" + xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML" xmlns:system="clr-namespace:System;assembly=mscorlib" - d:DataContext="{d:DesignInstance domain:ButtonsViewModel}" + d:DataContext="{d:DesignInstance sharedDomain:ButtonsViewModel}" d:DesignHeight="2000" d:DesignWidth="800" mc:Ignorable="d"> diff --git a/src/MainDemo.Wpf/ColorTool.xaml b/src/MainDemo.Wpf/ColorTool.xaml index e5c14dc92e..582b92f14c 100644 --- a/src/MainDemo.Wpf/ColorTool.xaml +++ b/src/MainDemo.Wpf/ColorTool.xaml @@ -3,13 +3,13 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:converters="clr-namespace:MaterialDesignDemo.Shared.Converters;assembly=MaterialDesignDemo.Shared" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:domain="clr-namespace:MaterialDesignDemo.Domain" + xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared" xmlns:local="clr-namespace:MaterialDesignDemo" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesignColors="clr-namespace:MaterialDesignColors;assembly=MaterialDesignColors" xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - d:DataContext="{d:DesignInstance Type=domain:ColorToolViewModel}" + d:DataContext="{d:DesignInstance Type=sharedDomain:ColorToolViewModel}" d:DesignHeight="600" d:DesignWidth="600" mc:Ignorable="d"> diff --git a/src/MainDemo.Wpf/ComboBoxes.xaml b/src/MainDemo.Wpf/ComboBoxes.xaml index 77a6a6c8cb..386e7e92b4 100644 --- a/src/MainDemo.Wpf/ComboBoxes.xaml +++ b/src/MainDemo.Wpf/ComboBoxes.xaml @@ -1,7 +1,7 @@  - + diff --git a/src/MaterialDesign3.Demo.Wpf/Buttons.xaml b/src/MaterialDesign3.Demo.Wpf/Buttons.xaml index e9febec682..265bb03e9b 100644 --- a/src/MaterialDesign3.Demo.Wpf/Buttons.xaml +++ b/src/MaterialDesign3.Demo.Wpf/Buttons.xaml @@ -2,13 +2,13 @@ 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:domain="clr-namespace:MaterialDesign3Demo.Domain" + xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML" xmlns:system="clr-namespace:System;assembly=mscorlib" - d:DataContext="{d:DesignInstance domain:ButtonsViewModel}" + d:DataContext="{d:DesignInstance sharedDomain:ButtonsViewModel}" d:DesignHeight="1200" d:DesignWidth="800" mc:Ignorable="d"> diff --git a/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml b/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml index 40800b0f76..2042d4a322 100644 --- a/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml +++ b/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml @@ -3,13 +3,13 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:converters="clr-namespace:MaterialDesignDemo.Shared.Converters;assembly=MaterialDesignDemo.Shared" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:domain="clr-namespace:MaterialDesign3Demo.Domain" + xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared" xmlns:local="clr-namespace:MaterialDesign3Demo" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesignColors="clr-namespace:MaterialDesignColors;assembly=MaterialDesignColors" xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - d:DataContext="{d:DesignInstance Type=domain:ColorToolViewModel}" + d:DataContext="{d:DesignInstance Type=sharedDomain:ColorToolViewModel}" d:DesignHeight="600" d:DesignWidth="600" mc:Ignorable="d"> diff --git a/src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml b/src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml index e3117e3f47..a5101a2923 100644 --- a/src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml +++ b/src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml @@ -1,13 +1,13 @@