Fix font references in UWP and WinUI (#611)

Esri · Nov 14, 2024 · f6107fc · f6107fc
1 parent 99db864
commit f6107fc
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/src/Toolkit/Toolkit.UWP/Esri.ArcGISRuntime.Toolkit.UWP.csproj b/src/Toolkit/Toolkit.UWP/Esri.ArcGISRuntime.Toolkit.UWP.csproj
@@ -31,7 +31,7 @@
     </Page>
     <Content Include="$(MSBuildThisFileDirectory)..\Toolkit.WinUI\Assets\**\*.*" Link="Assets\%(RecursiveDir)%(Filename)%(Extension)" />
     <Compile Include="$(MSBuildThisFileDirectory)..\Toolkit.WinUI\**\*.cs" Exclude="$(MSBuildThisFileDirectory)..\Toolkit.WinUI\obj\**\*.*" Link="%(RecursiveDir)%(Filename)%(Extension)" />
-    <Page Include="$(MSBuildThisFileDirectory)..\Toolkit.WinUI\**\*.xaml" Exclude="$(MSBuildThisFileDirectory)..\Toolkit.WinUI\obj\**\*.*;$(MSBuildThisFileDirectory)..\Toolkit.WinUI\bin\**\*.*;$(MSBuildThisFileDirectory)..\Toolkit.WinUI\Themes\Generic.xaml;$(MSBuildThisFileDirectory)..\Toolkit.WinUI\UI\Controls\**\*.Resources.xaml;$(MSBuildThisFileDirectory)..\Toolkit.WinUI\**\*.WinUI.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)..\Toolkit.WinUI\**\*.xaml" Exclude="$(MSBuildThisFileDirectory)..\Toolkit.WinUI\obj\**\*.*;$(MSBuildThisFileDirectory)..\Toolkit.WinUI\bin\**\*.*;$(MSBuildThisFileDirectory)..\Toolkit.WinUI\Themes\*.xaml;$(MSBuildThisFileDirectory)..\Toolkit.WinUI\UI\Controls\**\*.Resources.xaml;$(MSBuildThisFileDirectory)..\Toolkit.WinUI\**\*.WinUI.xaml">
         <Generator>MSBuild:Compile</Generator>
         <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Page>

diff --git a/src/Toolkit/Toolkit.UWP/Themes/SharedResources.xaml b/src/Toolkit/Toolkit.UWP/Themes/SharedResources.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <FontFamily x:Key="calcite-ui-icons-24">ms-appx:///Esri.ArcGISRuntime.Toolkit.UWP/Assets/calcite-ui-icons-24.ttf#calcite-ui-icons-24</FontFamily>
+ </ResourceDictionary>
diff --git a/src/Toolkit/Toolkit.WinUI/Themes/SharedResources.xaml b/src/Toolkit/Toolkit.WinUI/Themes/SharedResources.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <FontFamily x:Key="calcite-ui-icons-24">ms-appx:///Esri.ArcGISRuntime.Toolkit.WinUI/Assets/calcite-ui-icons-24.ttf#calcite-ui-icons-24</FontFamily>
+ </ResourceDictionary>
diff --git a/src/Toolkit/Toolkit.WinUI/UI/Controls/BasemapGallery/BasemapGallery.Theme.xaml b/src/Toolkit/Toolkit.WinUI/UI/Controls/BasemapGallery/BasemapGallery.Theme.xaml
@@ -3,6 +3,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:basemapgallery="using:Esri.ArcGISRuntime.Toolkit.UI.Controls"
     xmlns:controls="using:Esri.ArcGISRuntime.Toolkit.UI.Controls">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../../Themes/SharedResources.xaml" />
+    </ResourceDictionary.MergedDictionaries>
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="ItemTextForegroundUnselected" Color="#6a6a6a" />
@@ -144,7 +147,7 @@
                             BorderBrush="#4d6e6e6e"
                             BorderThickness="1">
                             <Grid>
-                                <FontIcon FontFamily="calcite-ui-icons-24" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Glyph="&#xE032;" />
+                                <FontIcon FontFamily="{StaticResource calcite-ui-icons-24}" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Glyph="&#xE032;" />
                                 <Image
                                     Width="62"
                                     Height="62"
@@ -184,7 +187,7 @@
                             BorderBrush="#4d6e6e6e"
                             BorderThickness="1">
                             <Grid>
-                                <FontIcon FontFamily="calcite-ui-icons-24" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Glyph="&#xE032;" />
+                                <FontIcon FontFamily="{StaticResource calcite-ui-icons-24}" FontSize="32" HorizontalAlignment="Center" VerticalAlignment="Center" Glyph="&#xE032;" />
                                 <Image
                                     Width="62"
                                     Height="62"

diff --git a/src/Toolkit/Toolkit.WinUI/UI/Controls/MeasureToolbar/MeasureToolbar.Theme.xaml b/src/Toolkit/Toolkit.WinUI/UI/Controls/MeasureToolbar/MeasureToolbar.Theme.xaml
@@ -2,6 +2,10 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Esri.ArcGISRuntime.Toolkit.UI.Controls">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../../Themes/SharedResources.xaml" />
+    </ResourceDictionary.MergedDictionaries>
     <Style TargetType="controls:MeasureToolbar">
         <Setter Property="Background"
                 Value="{ThemeResource ComboBoxBackground}" />
@@ -43,7 +47,7 @@
                                           VerticalContentAlignment="Center"
                                           ToolTipService.ToolTip="Length">
                                 <ToggleButton.Content>
-                                    <FontIcon FontFamily="calcite-ui-icons-24" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Glyph="&#xE1C6;" />
+                                    <FontIcon FontFamily="{StaticResource calcite-ui-icons-24}" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Glyph="&#xE1C6;" />
                                 </ToggleButton.Content>
                             </ToggleButton>
                             <ToggleButton x:Name="MeasureArea"
@@ -54,7 +58,7 @@
                                           ToolTipService.ToolTip="Area"
                                           Grid.Column="1">
                                 <ToggleButton.Content>
-                                    <FontIcon FontFamily="calcite-ui-icons-24" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Glyph="&#xE1C2;" />
+                                    <FontIcon FontFamily="{StaticResource calcite-ui-icons-24}" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Glyph="&#xE1C2;" />
                                 </ToggleButton.Content>
                             </ToggleButton>
                             <ToggleButton x:Name="MeasureFeature"
@@ -65,7 +69,7 @@
                                           ToolTipService.ToolTip="Feature"
                                           Grid.Column="2">
                                 <ToggleButton.Content>
-                                    <FontIcon FontFamily="calcite-ui-icons-24" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Glyph="&#xE1C7;" />
+                                    <FontIcon FontFamily="{StaticResource calcite-ui-icons-24}" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Glyph="&#xE1C7;" />
                                 </ToggleButton.Content>
                             </ToggleButton>
                             <Border Background="{TemplateBinding Background}"