WinUI/UWP: Fix darkmode and basemap for compass samples

Esri · Aug 5, 2023 · 94a1529 · 94a1529
1 parent 8a43115
commit 94a1529
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/MapViewCompassSample.xaml b/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/MapViewCompassSample.xaml
@@ -6,16 +6,15 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:esri="using:Esri.ArcGISRuntime.UI.Controls"
     xmlns:esriToolkit="using:Esri.ArcGISRuntime.Toolkit.UI.Controls"
-    mc:Ignorable="d"
-    RequestedTheme="Light">
+    mc:Ignorable="d">
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <esri:MapView Map="{x:Bind Map}" x:Name="mapView"/>
 
         <esriToolkit:Compass x:Name="compass" GeoView="{x:Bind mapView, Mode=OneWay}" 
                              Margin="20" AutoHide="{x:Bind autohide.IsChecked.Value, Mode=OneWay}" />
 
-        <Border Margin="10" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="10" BorderBrush="Black" Background="#AAFFFFFF">
+        <Border Margin="10" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="10" BorderBrush="{ThemeResource ApplicationForegroundThemeBrush}" BorderThickness="1" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
             <StackPanel>
                 <CheckBox x:Name="autohide" Content="Auto-hide when North Up" />
                 <Button Content="Rotate Left" Click="RotateLeft_Click" HorizontalAlignment="Stretch"  Margin="2" />

diff --git a/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/SceneViewCompassSample.xaml b/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/SceneViewCompassSample.xaml
@@ -6,16 +6,15 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:esri="using:Esri.ArcGISRuntime.UI.Controls"
     xmlns:esriToolkit="using:Esri.ArcGISRuntime.Toolkit.UI.Controls"
-    mc:Ignorable="d"
-    RequestedTheme="Light">
+    mc:Ignorable="d">
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <esri:SceneView Scene="{x:Bind Scene}" x:Name="sceneView"/>
 
         <esriToolkit:Compass x:Name="compass" GeoView="{x:Bind sceneView, Mode=OneWay}" 
                              Margin="20" AutoHide="{x:Bind autohide.IsChecked.Value, Mode=OneWay}" />
 
-        <Border Margin="10" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="10" BorderBrush="Black" Background="#AAFFFFFF">
+        <Border Margin="10" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="10" BorderBrush="{ThemeResource ApplicationForegroundThemeBrush}" BorderThickness="1" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
             <StackPanel>
                 <CheckBox x:Name="autohide" Content="Auto-hide when North Up" />
                 <Button Content="Rotate Left" Click="RotateLeft_Click" HorizontalAlignment="Stretch"  Margin="2" />

diff --git a/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/SceneViewCompassSample.xaml.cs b/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/SceneViewCompassSample.xaml.cs
@@ -10,7 +10,7 @@ public sealed partial class SceneViewCompassSample : Page
     {
         public SceneViewCompassSample()
         {
-            Scene = new Scene(new Basemap(new Uri("https://www.arcgis.com/home/item.html?id=52bdc7ab7fb044d98add148764eaa30a")));
+            Scene = new Scene(new Basemap(new Uri("https://www.arcgis.com/home/item.html?id=86de95d4e0244cba80f0fa2c9403a7b2")));
             Scene.BaseSurface.ElevationSources.Add(new ArcGISTiledElevationSource(new Uri("http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer")));
             this.InitializeComponent();
         }