From 0e452d1fd68e8bb01cb56283e2e6b787bc90c534 Mon Sep 17 00:00:00 2001
From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com>
Date: Tue, 27 Jun 2023 22:35:52 -0500
Subject: [PATCH] Added static resource for settings font

---
 .../ResourceDictionaries/CustomStyles.xaml                | 2 ++
 Rise Media Player Dev/Settings/WindowsBehavioursPage.xaml | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Rise Media Player Dev/ResourceDictionaries/CustomStyles.xaml b/Rise Media Player Dev/ResourceDictionaries/CustomStyles.xaml
index 5ac427b3..4456fac8 100644
--- a/Rise Media Player Dev/ResourceDictionaries/CustomStyles.xaml	
+++ b/Rise Media Player Dev/ResourceDictionaries/CustomStyles.xaml	
@@ -31,6 +31,8 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
+    <FontFamily x:Key="SettingsIconsFontFamily">ms-appx:///Assets/SettingsIcons.ttf#Settings Fluent Icons</FontFamily>
+
     <!--  Title bar resources  -->
     <Thickness x:Key="TitleBarIconMargin">0,0,0,0</Thickness>
     <BitmapIconSource
diff --git a/Rise Media Player Dev/Settings/WindowsBehavioursPage.xaml b/Rise Media Player Dev/Settings/WindowsBehavioursPage.xaml
index 58e4e40a..89b3e5f7 100644
--- a/Rise Media Player Dev/Settings/WindowsBehavioursPage.xaml	
+++ b/Rise Media Player Dev/Settings/WindowsBehavioursPage.xaml	
@@ -3,11 +3,11 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:markup="using:Rise.Common.Extensions.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
-    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     mc:Ignorable="d">
     <ScrollViewer Padding="48,4,48,0" VerticalScrollBarVisibility="Auto">
         <StackPanel Orientation="Vertical" Spacing="4">
@@ -16,14 +16,14 @@
                     <RepositionThemeTransition IsStaggeringEnabled="False" />
                 </TransitionCollection>
             </StackPanel.ChildrenTransitions>
-            
+
             <Border Margin="0,4,0,0" Style="{StaticResource BorderCardStyle}">
                 <RelativePanel Margin="0,4,0,0">
                     <FontIcon
                         x:Name="WindowsLogo"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        FontFamily="ms-appx:///Assets/SettingsIcons.ttf#Settings Fluent Icons"
+                        FontFamily="{StaticResource SettingsIconsFontFamily}"
                         FontSize="56"
                         Glyph="&#xE336;" />
                     <StackPanel
@@ -78,8 +78,8 @@
             </muxc:InfoBar>
 
             <labs:SettingsCard
-                Header="{markup:ResourceHelper Name=OpenRiseOnStartupH}"
                 Description="{markup:ResourceHelper Name=OpenRiseOnStartup}"
+                Header="{markup:ResourceHelper Name=OpenRiseOnStartupH}"
                 HeaderIcon="{ui:FontIcon Glyph=&#xE102;}">
                 <ToggleSwitch
                     x:Name="OpenAtStartup"