Skip to content

Commit e7bc4d3

Browse files
greuelpiratgreuelpirat
authored
Fix namespace for DesignInstances in MaterialDesignDemo.Shared.Domain (#3855)
1 parent db64576 commit e7bc4d3

File tree

8 files changed

+16
-14
lines changed

8 files changed

+16
-14
lines changed

‎src/MainDemo.Wpf/Buttons.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
5+
xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
66
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
77
xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
1010
xmlns:system="clr-namespace:System;assembly=mscorlib"
11-
d:DataContext="{d:DesignInstance domain:ButtonsViewModel}"
11+
d:DataContext="{d:DesignInstance sharedDomain:ButtonsViewModel}"
1212
d:DesignHeight="2000"
1313
d:DesignWidth="800"
1414
mc:Ignorable="d">

‎src/MainDemo.Wpf/ColorTool.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:converters="clr-namespace:MaterialDesignDemo.Shared.Converters;assembly=MaterialDesignDemo.Shared"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
6+
xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
77
xmlns:local="clr-namespace:MaterialDesignDemo"
88
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
99
xmlns:materialDesignColors="clr-namespace:MaterialDesignColors;assembly=MaterialDesignColors"
1010
xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
1111
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
12-
d:DataContext="{d:DesignInstance Type=domain:ColorToolViewModel}"
12+
d:DataContext="{d:DesignInstance Type=sharedDomain:ColorToolViewModel}"
1313
d:DesignHeight="600"
1414
d:DesignWidth="600"
1515
mc:Ignorable="d">

‎src/MainDemo.Wpf/ComboBoxes.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<UserControl x:Class="MaterialDesignDemo.ComboBoxes"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:colorsDomain="clr-namespace:MaterialDesignDemo.Domain"
4+
xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
55
xmlns:converters="clr-namespace:MaterialDesignDemo.Shared.Converters;assembly=MaterialDesignDemo.Shared"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
77
xmlns:demoAppDomain="clr-namespace:MaterialDesignDemo.Domain"
88
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
99
xmlns:materialDesignDemo="clr-namespace:MaterialDesignDemo"
1010
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1111
xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
12-
d:DataContext="{d:DesignInstance colorsDomain:ComboBoxesViewModel,
12+
d:DataContext="{d:DesignInstance sharedDomain:ComboBoxesViewModel,
1313
IsDesignTimeCreatable=False}"
1414
d:DesignHeight="1080"
1515
d:DesignWidth="1920"

‎src/MainDemo.Wpf/Domain/DocumentationLinks.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
6+
xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain"
67
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
78
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8-
d:DataContext="{d:DesignInstance domain:DemoItem,
9+
d:DataContext="{d:DesignInstance sharedDomain:DemoItem,
910
IsDesignTimeCreatable=True}"
1011
d:DesignHeight="300"
1112
d:DesignWidth="300"

‎src/MainDemo.Wpf/MainWindow.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:system="clr-namespace:System;assembly=mscorlib"
10+
xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain"
1011
Title="Material Design in XAML"
1112
Width="1150"
1213
d:DataContext="{d:DesignInstance domain:MainWindowViewModel}"
@@ -78,7 +79,7 @@
7879
<Style TargetType="ScrollBar" BasedOn="{StaticResource MaterialDesignScrollBarMinimal}" />
7980
</ListBox.Resources>
8081
<ListBox.ItemTemplate>
81-
<DataTemplate DataType="domain:DemoItem">
82+
<DataTemplate DataType="sharedDomain:DemoItem">
8283
<TextBlock Margin="24,4,0,4"
8384
AutomationProperties.AutomationId="DemoItemPage"
8485
Text="{Binding Name}" />

‎src/MaterialDesign3.Demo.Wpf/Buttons.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:domain="clr-namespace:MaterialDesign3Demo.Domain"
5+
xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
66
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
77
xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
1010
xmlns:system="clr-namespace:System;assembly=mscorlib"
11-
d:DataContext="{d:DesignInstance domain:ButtonsViewModel}"
11+
d:DataContext="{d:DesignInstance sharedDomain:ButtonsViewModel}"
1212
d:DesignHeight="1200"
1313
d:DesignWidth="800"
1414
mc:Ignorable="d">

‎src/MaterialDesign3.Demo.Wpf/ColorTool.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:converters="clr-namespace:MaterialDesignDemo.Shared.Converters;assembly=MaterialDesignDemo.Shared"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:domain="clr-namespace:MaterialDesign3Demo.Domain"
6+
xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
77
xmlns:local="clr-namespace:MaterialDesign3Demo"
88
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
99
xmlns:materialDesignColors="clr-namespace:MaterialDesignColors;assembly=MaterialDesignColors"
1010
xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
1111
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
12-
d:DataContext="{d:DesignInstance Type=domain:ColorToolViewModel}"
12+
d:DataContext="{d:DesignInstance Type=sharedDomain:ColorToolViewModel}"
1313
d:DesignHeight="600"
1414
d:DesignWidth="600"
1515
mc:Ignorable="d">

‎src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<UserControl x:Class="MaterialDesign3Demo.ComboBoxes"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:colorsDomain="clr-namespace:MaterialDesign3Demo.Domain"
4+
xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:demoAppDomain="clr-namespace:MaterialDesign3Demo.Domain"
77
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
10-
d:DataContext="{d:DesignInstance colorsDomain:ComboBoxesViewModel,
10+
d:DataContext="{d:DesignInstance sharedDomain:ComboBoxesViewModel,
1111
IsDesignTimeCreatable=False}"
1212
d:DesignHeight="300"
1313
d:DesignWidth="600"

0 commit comments

Comments
 (0)