Merge pull request #1309 from unoplatform/mergify/bp/release/stable/2…

….3/pr-1304 feat: Adjusting background brush for specified theme (backport #1304)
unoplatform · Mar 21, 2023 · 8ea5886 · 8ea5886
2 parents 3f74c59 + c23d4ff
commit 8ea5886
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/template.json b/src/Uno.Extensions.Templates/content/unoapp-extensions/.template.config/template.json
@@ -525,6 +525,28 @@
       "datatype": "bool",
       "value": "(appTheme == 'cupertino')"
     },
+    "themeBackgroundBrush":{
+      "type": "generated",
+      "generator": "switch",
+      "replaces": "$themeBackgroundBrush$",
+      "parameters": {
+        "evaluator": "C++",
+        "cases": [
+          {
+            "condition": "(appThemeEvaluator == 'material')",
+            "value": "BackgroundBrush"
+          },
+          {
+            "condition": "(appThemeEvaluator == 'fluent')",
+            "value": "ApplicationPageBackgroundThemeBrush"
+          },
+          {
+            "condition": "(appTheme == 'cupertino')",
+            "value": "CupertinoSystemBackgroundBrush"
+          }
+        ]
+      }
+    },
     "presetDependencyInjectionDefault": {
       "type": "generated",
       "generator": "switch",

diff --git a/...tensions.Templates/content/unoapp-extensions/MyExtensionsApp.1/Presentation/MainPage.xaml b/...tensions.Templates/content/unoapp-extensions/MyExtensionsApp.1/Presentation/MainPage.xaml
@@ -9,7 +9,7 @@
 	  xmlns:utu="using:Uno.Toolkit.UI"
 	  xmlns:not_skia="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	  NavigationCacheMode="Required"
-	  Background="{ThemeResource BackgroundBrush}">
+	  Background="{ThemeResource $themeBackgroundBrush$}">
 
 	<Grid>
 		<Grid.RowDefinitions>

diff --git a/...nsions.Templates/content/unoapp-extensions/MyExtensionsApp.1/Presentation/SecondPage.xaml b/...nsions.Templates/content/unoapp-extensions/MyExtensionsApp.1/Presentation/SecondPage.xaml
@@ -6,7 +6,7 @@
 	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	  xmlns:uen="using:Uno.Extensions.Navigation.UI"
 	  xmlns:utu="using:Uno.Toolkit.UI"
-	  Background="{ThemeResource BackgroundBrush}">
+	  Background="{ThemeResource $themeBackgroundBrush$}">
 
 	<Grid>
 		<utu:NavigationBar Content="Second Page">