Removed last reference to manual calcite fonts

Author: imalcolm1

src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj

@@ -46,7 +46,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <None Remove="Resources\Fonts\calcite-ui-icons-24.ttf" />
     <None Remove="Resources\github-mark.png" />
     <None Remove="ScreenshotTab.xaml" />
   </ItemGroup>
@@ -83,12 +82,6 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="Resources\Fonts\calcite-ui-icons-24.ttf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Assets\github-mark.png" />
   </ItemGroup>

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<int, string> _directionIcons = new()
+        private Dictionary<int, char> _directionIcons = new()
         {
-            {51, "\xe259"}, {52, "\xe2aa"}, {301, "\xe124"}, {200, "\xe122"}, {305, "\xe24e"},
-            {205, "\xe199"}, {50, "\xe25a"}
+            {51, (char)(int)CalciteIcon.RouteFrom}, {52, (char)(int)CalciteIcon.Straight}, {301, (char)(int)CalciteIcon.ForkRight}, {200, (char)(int)CalciteIcon.ForkLeft}, {305, (char)(int)CalciteIcon.Right},
+            {205, (char)(int)CalciteIcon.Left}, {50, (char)(int)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();
         }
     }
-}
+}

src/WinUI/ArcGIS.WinUI.Viewer/Resources/Fonts/calcite-ui-icons-24.ttf

@@ -6,7 +6,6 @@
 
     <UserControl.Resources>
         <converters:DirectionPointTypeToIconConverter x:Key="Converter" />
-        <FontFamily x:Key="Calcite">/Resources/Fonts/calcite-ui-icons-24.ttf#calcite-ui-icons-24</FontFamily>
     </UserControl.Resources>
     <Grid>
         <esriUI:MapView x:Name="MyMapView" />
@@ -28,8 +27,8 @@
                                     <TextBlock Grid.Column="1" Text="." />
                                     <TextBlock Grid.Column="2"
                                                Margin="0,0,0,10"
-                                               FontFamily="{StaticResource Calcite}"
-                                               FontSize="20"
+                                               FontFamily="{StaticResource CalciteUIIconsMediumFontFamily}"
+                                               FontSize="24"
                                                Text="{Binding Attributes[DirectionPointType], Converter={StaticResource Converter}}" />
                                     <TextBlock Grid.Column="3"
                                                Text="{Binding Attributes[DisplayText]}"
@@ -42,5 +41,4 @@
             </ScrollViewer>
         </Border>
     </Grid>
-
 </UserControl>