From 94a1529f97ef051a2938a2367771e87503b650f9 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mnielsen@esri.com>
Date: Fri, 4 Aug 2023 18:11:51 -0700
Subject: [PATCH] WinUI/UWP: Fix darkmode and basemap for compass samples

---
 .../Samples/Compass/MapViewCompassSample.xaml                | 5 ++---
 .../Samples/Compass/SceneViewCompassSample.xaml              | 5 ++---
 .../Samples/Compass/SceneViewCompassSample.xaml.cs           | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/MapViewCompassSample.xaml b/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/MapViewCompassSample.xaml
index 25f39b509..03c88229d 100644
--- a/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/MapViewCompassSample.xaml
+++ b/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/MapViewCompassSample.xaml
@@ -6,8 +6,7 @@
     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"/>
@@ -15,7 +14,7 @@
         <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
index 183d1ec44..614d82956 100644
--- a/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/SceneViewCompassSample.xaml
+++ b/src/Samples/Toolkit.SampleApp.UWP/Samples/Compass/SceneViewCompassSample.xaml
@@ -6,8 +6,7 @@
     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"/>
@@ -15,7 +14,7 @@
         <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
index 32c7fcfc2..e25089504 100644
--- 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();
         }