Fixing Dark mode for SymbolDisplay on WinUI and UWP sample apps

Esri · Sep 20, 2024 · 22eef9e · 22eef9e
1 parent 34a3607
commit 22eef9e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml b/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml
@@ -45,7 +45,7 @@
                 </ListView>
             </SplitView.Pane>
             <Grid>
-                <Frame x:Name="rootFrame" Background="{ThemeResource ApplicationForegroundThemeBrush}" />
+                <Frame x:Name="rootFrame" />
 
 
                 <Border  x:Name="ApiKeyWindow" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" d:Visibility="Visible" Visibility="Collapsed">

diff --git a/src/Samples/Toolkit.SampleApp.UWP/Samples/SymbolDisplay/SymbolDisplaySample.xaml b/src/Samples/Toolkit.SampleApp.UWP/Samples/SymbolDisplay/SymbolDisplaySample.xaml
@@ -6,10 +6,9 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:esri="using:Esri.ArcGISRuntime.Toolkit.UI.Controls"
-    mc:Ignorable="d"
-    RequestedTheme="Light">
+    mc:Ignorable="d">
 
-    <Grid x:Name="SymbolGrid" Background="LightGray">
+    <Grid x:Name="SymbolGrid">
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
             <ColumnDefinition />

diff --git a/src/Samples/Toolkit.SampleApp.UWP/Samples/SymbolDisplay/SymbolEditorSample.xaml b/src/Samples/Toolkit.SampleApp.UWP/Samples/SymbolDisplay/SymbolEditorSample.xaml
@@ -6,11 +6,9 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:esri="using:Esri.ArcGISRuntime.Toolkit.UI.Controls"
-    mc:Ignorable="d"
-    RequestedTheme="Light">
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    mc:Ignorable="d">
 
+    <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition />

diff --git a/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml b/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml
@@ -37,7 +37,7 @@
                 </ListView>
             </SplitView.Pane>
             <Grid>
-                <Frame x:Name="rootFrame" Background="{ThemeResource ApplicationForegroundThemeBrush}" >
+                <Frame x:Name="rootFrame" >
                     <local:WelcomePage />
                 </Frame>