chore: fixing template resources

unoplatform · Nov 6, 2023 · 28d071f · 28d071f
1 parent 928639a
commit 28d071f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json
@@ -1551,8 +1551,8 @@
         "evaluator": "C++",
         "cases": [
           {
-            "condition": "(useToolkit)",
-            "value": "\n      xmlns:utum=\"using:Uno.Toolkit.UI.Material\""
+            "condition": "(useToolkit && useMaterial)",
+            "value": "\n                    xmlns:utum=\"using:Uno.Toolkit.UI.Material\""
           },
           {
             "condition": "true",
@@ -1569,7 +1569,7 @@
         "evaluator": "C++",
         "cases": [
           {
-            "condition": "(useMaterial)",
+            "condition": "(useMaterial && !useToolkit)",
             "value": "\n                    xmlns:um=\"using:Uno.Material\""
           },
           {
@@ -1587,7 +1587,7 @@
         "evaluator": "C++",
         "cases": [
           {
-            "condition": "(useMaterial)",
+            "condition": "(useCupertino)",
             "value": "\n                    xmlns:uc=\"using:Uno.Cupertino\""
           },
           {

diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/AppResources.xaml b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/AppResources.xaml
@@ -6,8 +6,7 @@
     <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
 <!--#if (useMaterial)-->
 <!--#if (useToolkit)-->
-    <utum:MaterialToolkitTheme xmlns="using:Uno.Toolkit.UI.Material"
-      ColorOverrideSource="ms-appx:///MyExtensionsApp._1/Styles/ColorPaletteOverride.xaml">
+    <utum:MaterialToolkitTheme ColorOverrideSource="ms-appx:///MyExtensionsApp._1/Styles/ColorPaletteOverride.xaml">
       <!-- NOTE: You can override the default Roboto font by providing your font assets here. -->
       <!-- <utum:MaterialToolkitTheme.FontOverrideDictionary>
         <ResourceDictionary>
@@ -18,8 +17,7 @@
       </utum:MaterialToolkitTheme.FontOverrideDictionary> -->
     </utum:MaterialToolkitTheme>
 <!--#else-->
-    <um:MaterialTheme  xmlns="using:Uno.Material"
-      ColorOverrideSource="ms-appx:///MyExtensionsApp._1/Styles/ColorPaletteOverride.xaml">
+    <um:MaterialTheme ColorOverrideSource="ms-appx:///MyExtensionsApp._1/Styles/ColorPaletteOverride.xaml">
       <!-- NOTE: You can override the default Roboto font by providing your font assets here. -->
       <!-- <um:MaterialTheme.FontOverrideDictionary>
         <ResourceDictionary>