diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 69227aafe3..d2a9ac2a63 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -16,6 +16,7 @@
+
@@ -36,4 +37,4 @@
-
+
\ No newline at end of file
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/ApiKeyPrompt.xaml b/src/WinUI/ArcGIS.WinUI.Viewer/ApiKeyPrompt.xaml
index 9a30f6b7b2..8199a47007 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/ApiKeyPrompt.xaml
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/ApiKeyPrompt.xaml
@@ -32,10 +32,12 @@
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/App.xaml b/src/WinUI/ArcGIS.WinUI.Viewer/App.xaml
index a61b4f2219..572266c2c1 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/App.xaml
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/App.xaml
@@ -5,9 +5,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #8F53CA
+ #7938B6
+ #652E98
+
+
+ #7938B6
+ #652E98
+ #51247A
+
+
+
+
+
+
-
+
800
756
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj b/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
index 14744d4837..b34049815f 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
@@ -46,7 +46,6 @@
-
@@ -63,6 +62,7 @@
+
@@ -82,12 +82,6 @@
-
-
- PreserveNewest
-
-
-
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Converters/DirectionPointTypeToIconConverter.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Converters/DirectionPointTypeToIconConverter.cs
index 043a1924d8..a29bcae66e 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Converters/DirectionPointTypeToIconConverter.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Converters/DirectionPointTypeToIconConverter.cs
@@ -1,15 +1,17 @@
using Microsoft.UI.Xaml.Data;
using System;
using System.Collections.Generic;
+using Esri.Calcite.WinUI;
+
namespace ArcGIS.WinUI.Viewer.Converters
{
internal class DirectionPointTypeToIconConverter : IValueConverter
{
// Create a dictionary of direction point type and corresponding icons.
- private Dictionary _directionIcons = new()
+ private Dictionary _directionIcons = new()
{
- {51, "\xe259"}, {52, "\xe2aa"}, {301, "\xe124"}, {200, "\xe122"}, {305, "\xe24e"},
- {205, "\xe199"}, {50, "\xe25a"}
+ {51, (char)CalciteIcon.RouteFrom}, {52, (char)CalciteIcon.Straight}, {301, (char)CalciteIcon.ForkRight}, {200, (char)CalciteIcon.ForkLeft}, {305, (char)CalciteIcon.Right},
+ {205, (char)CalciteIcon.Left}, {50, (char)CalciteIcon.RouteTo}
};
public object Convert(object value, Type targetType, object parameter, string language)
@@ -22,4 +24,4 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
throw new NotImplementedException();
}
}
-}
+}
\ No newline at end of file
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/MainPage.xaml b/src/WinUI/ArcGIS.WinUI.Viewer/MainPage.xaml
index cd1c9c5c9e..a021b29620 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/MainPage.xaml
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/MainPage.xaml
@@ -4,7 +4,8 @@
xmlns:arcgisruntime="using:ArcGIS"
xmlns:models="using:ArcGIS.Samples.Shared.Models"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
- xmlns:viewer="using:ArcGIS.WinUI.Viewer">
+ xmlns:viewer="using:ArcGIS.WinUI.Viewer"
+ xmlns:cal="using:Esri.Calcite.WinUI">
-
+
-