close #361

src/Shared/HandyControlDemo_Shared/App.xaml

@@ -8,24 +8,15 @@
              xmlns:data="clr-namespace:HandyControlDemo.Data"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+             xmlns:resources="clr-namespace:HandyControlDemo.Resources"
              d1P1:Ignorable="d" 
              StartupUri="MainWindow.xaml">
     <Application.Resources>
 
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary>
-                    <ResourceDictionary.MergedDictionaries>
-                        <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
-                        <ResourceDictionary Source="Resources/Themes/SkinDefault.xaml"/>
-                    </ResourceDictionary.MergedDictionaries>
-                </ResourceDictionary>
-                <ResourceDictionary>
-                    <ResourceDictionary.MergedDictionaries>
-                        <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
-                        <ResourceDictionary Source="Resources/Themes/Theme.xaml"/>
-                    </ResourceDictionary.MergedDictionaries>
-                </ResourceDictionary>
+                <hc:Theme Name="HandyTheme"/>
+                <resources:DemoTheme Name="DemoTheme"/>
             </ResourceDictionary.MergedDictionaries>
 
             <langs:LangDecorator x:Key="DemoLangs"/>