Merge pull request #522 from United600/font

chore: add media type disabled icons
huynhsontung · Jan 6, 2025 · f622247 · f622247
2 parents f15bbd4 + 8a51369
commit f622247
Show file tree

Hide file tree

Showing 36 changed files with 972 additions and 99 deletions.
diff --git a/Screenbox/App.xaml b/Screenbox/App.xaml
@@ -3,8 +3,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:commands="using:Screenbox.Commands"
-    xmlns:contract13NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,13)"
-    xmlns:contract13Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,13)"
     xmlns:converters="using:Screenbox.Converters"
     xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
@@ -56,18 +54,9 @@
                         FalseValue="{strings:Resources Key=Play}"
                         TrueValue="{strings:Resources Key=Pause}" />
 
-                    <!--  Custom Icons  -->
-                    <contract13NotPresent:FontFamily x:Key="ScreenboxSymbolThemeFontFamily">ms-appx:///Assets/Fonts/ScreenboxMDL2Assets.ttf#Screenbox MDL2 Assets</contract13NotPresent:FontFamily>
-                    <contract13Present:FontFamily x:Key="ScreenboxSymbolThemeFontFamily">ms-appx:///Assets/Fonts/ScreenboxFluentIcons.ttf#Screenbox Fluent Icons</contract13Present:FontFamily>
                     <!--  Font sizes  -->
                     <x:Double x:Key="TopNavigationViewItemFontSize">18</x:Double>
                     <x:Double x:Key="TitleMediumTextBlockFontSize">32</x:Double>
-                    <!--  Icon font sizes  -->
-                    <x:Double x:Key="StandardIconFontSize">16</x:Double>
-                    <x:Double x:Key="GridItemPlaceholderIconFontSize">56</x:Double>
-                    <x:Double x:Key="WideGridItemPlaceholderIconFontSize">44</x:Double>
-                    <x:Double x:Key="NoContentPanelIconFontSize">128</x:Double>
-                    <x:Double x:Key="NoContentPanelMinimalIconFontSize">96</x:Double>
 
                     <!--  Standardize header height with or without top nav  -->
                     <x:Double x:Key="PageHeaderMinHeight">48</x:Double>
@@ -108,11 +97,6 @@
                             Duration="{StaticResource ControlFasterAnimationDuration}" />
                     </ctAnimations:ImplicitAnimationSet>
 
-                    <!--  Styles  -->
-                    <Style TargetType="FontIcon">
-                        <Setter Property="FontSize" Value="{StaticResource StandardIconFontSize}" />
-                    </Style>
-
                     <Style
                         x:Key="TitleMediumTextBlockStyle"
                         BasedOn="{StaticResource BaseTextBlockStyle}"
@@ -142,6 +126,7 @@
                 </ResourceDictionary>
 
                 <ResourceDictionary Source="ms-appx:///Styles/Button.xaml" />
+                <ResourceDictionary Source="ms-appx:///Styles/Icon.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/ItemContainer.xaml" />
 
             </muxc:XamlControlsResources.MergedDictionaries>

diff --git a/Screenbox/Assets/Fonts/ScreenboxFluentIcons.ttf b/Screenbox/Assets/Fonts/ScreenboxFluentIcons.ttf
diff --git a/Screenbox/Assets/Fonts/ScreenboxMDL2Assets.ttf b/Screenbox/Assets/Fonts/ScreenboxMDL2Assets.ttf
diff --git a/Screenbox/Controls/CommonGridViewItem.xaml b/Screenbox/Controls/CommonGridViewItem.xaml
@@ -53,7 +53,7 @@
                 Fill="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
                 Stroke="{ThemeResource ControlElevationBorderBrush}"
                 StrokeThickness="0.8" />
-            <FontIcon FontSize="{StaticResource StandardIconFontSize}" Glyph="&#xE769;" />
+            <FontIcon FontFamily="{StaticResource ScreenboxSymbolThemeFontFamily}" Glyph="{StaticResource PauseGlyph}" />
         </Grid>
         <Button
             x:Name="PlayButton"
@@ -70,7 +70,7 @@
             Opacity="0"
             Style="{StaticResource AccentButtonStyle}"
             Visibility="{x:Bind CanPlay, Mode=OneWay}">
-            <FontIcon FontSize="{StaticResource StandardIconFontSize}" Glyph="{x:Bind IsPlaying, Converter={StaticResource PlayPauseGlyphConverter}, Mode=OneWay}" />
+            <FontIcon FontFamily="{StaticResource ScreenboxSymbolThemeFontFamily}" Glyph="{x:Bind IsPlaying, Converter={StaticResource PlayPauseGlyphConverter}, Mode=OneWay}" />
         </Button>
 
         <!--

diff --git a/Screenbox/Controls/PlayerControls.xaml b/Screenbox/Controls/PlayerControls.xaml
@@ -35,8 +35,8 @@
             <converters:ToggleButtonCheckToRepeatModeConverter x:Key="ToggleButtonCheckToRepeatModeConverter" />
             <toolkitConverters:BoolToObjectConverter
                 x:Key="ShuffleModeGlyphConverter"
-                FalseValue="&#xF002A;"
-                TrueValue="&#xE8B1;" />
+                FalseValue="{StaticResource ShuffleOffGlyph}"
+                TrueValue="{StaticResource ShuffleGlyph}" />
 
             <Flyout x:Key="VolumeControlFlyout">
                 <Flyout.FlyoutPresenterStyle>
@@ -122,7 +122,8 @@
                 <MenuFlyoutItem
                     AccessKey="{strings:KeyboardResources Key=MenuItemFileKey}"
                     Command="{x:Bind Common.OpenFilesCommand}"
-                    Icon="{ui:FontIcon Glyph=&#xE838;}"
+                    Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
+                                       Glyph={StaticResource FolderOpenGlyph}}"
                     KeyTipPlacementMode="Left"
                     Text="{strings:Resources Key=OpenFiles}">
                     <MenuFlyoutItem.KeyboardAccelerators>
@@ -217,7 +218,7 @@
                     AccessKey="{strings:KeyboardResources Key=MenuItemSaveSnapshotKey}"
                     Command="{x:Bind ViewModel.SaveSnapshotCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
-                                       Glyph=&#xEE71;}"
+                                       Glyph={StaticResource ImageExportGlyph}}"
                     Text="{x:Bind strings:Resources.SaveCurrentFrame}"
                     Visibility="{x:Bind helpers:SystemInformation.IsDesktop}" />
                 <MenuFlyoutItem
@@ -311,7 +312,7 @@
                     AccessKey="{strings:KeyboardResources Key=MenuItemCompactOverlayKey}"
                     Command="{x:Bind ViewModel.ToggleCompactLayoutCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
-                                       Glyph=&#xEE49;}"
+                                       Glyph={StaticResource MiniContract2MirroredGlyph}}"
                     Text="{x:Bind strings:Resources.CompactOverlayToggle(ViewModel.IsCompact), Mode=OneWay}"
                     Visibility="Collapsed">
                     <MenuFlyoutItem.KeyboardAccelerators>
@@ -532,7 +533,7 @@
                 <FontIcon
                     x:Name="CompactOverlayButtonIcon"
                     FontFamily="{StaticResource ScreenboxSymbolThemeFontFamily}"
-                    Glyph="&#xEE49;"
+                    Glyph="{StaticResource MiniContract2MirroredGlyph}"
                     MirroredWhenRightToLeft="True" />
                 <Button.KeyboardAccelerators>
                     <KeyboardAccelerator Key="M" Modifiers="Control" />
@@ -637,7 +638,7 @@
                         <Setter Target="RepeatButton.Visibility" Value="Collapsed" />
                         <Setter Target="ShuffleButton.Visibility" Value="Collapsed" />
                         <Setter Target="CompactOverlayButton.Style" Value="{StaticResource SmallPlayerButtonStyle}" />
-                        <Setter Target="CompactOverlayButtonIcon.Glyph" Value="&#xEE47;" />
+                        <Setter Target="CompactOverlayButtonIcon.Glyph" Value="{StaticResource MiniExpand2MirroredGlyph}" />
                         <Setter Target="MoreButton.Visibility" Value="Collapsed" />
                         <Setter Target="SeekBar.(Grid.Row)" Value="2" />
                         <Setter Target="SeekBar.Margin" Value="0" />

diff --git a/Screenbox/Controls/PlaylistView.xaml b/Screenbox/Controls/PlaylistView.xaml
@@ -38,19 +38,20 @@
                     <MenuFlyoutItem
                         Command="{x:Bind ViewModel.Playlist.PlaySingleCommand}"
                         CommandParameter="{Binding}"
-                        Icon="{ui:FontIcon Glyph=&#xE768;}"
+                        Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
+                                           Glyph={StaticResource PlayGlyph}}"
                         Text="{strings:Resources Key=Play}" />
                     <MenuFlyoutItem
                         Command="{x:Bind ViewModel.PlayNextCommand}"
                         CommandParameter="{Binding}"
                         Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
-                                           Glyph=&#xF5EB;}"
+                                           Glyph={StaticResource PlayAddGlyph}}"
                         Text="{strings:Resources Key=PlayNext}" />
                     <MenuFlyoutSeparator />
                     <MenuFlyoutItem
                         Command="{x:Bind ViewModel.RemoveCommand}"
                         CommandParameter="{Binding}"
-                        Icon="{ui:FontIcon Glyph=&#xE74D;}"
+                        Icon="{ui:FontIcon Glyph=&#xE894;}"
                         Text="{strings:Resources Key=Remove}" />
                     <MenuFlyoutItem
                         Command="{x:Bind ViewModel.MoveItemUpCommand}"
@@ -112,7 +113,10 @@
                 Command="{x:Bind ViewModel.AddFilesCommand}"
                 Visibility="Collapsed">
                 <StackPanel Orientation="Horizontal">
-                    <FontIcon Margin="{StaticResource IconButtonStandardIconMargin}" Glyph="&#xE838;" />
+                    <FontIcon
+                        Margin="{StaticResource IconButtonStandardIconMargin}"
+                        FontFamily="{StaticResource ScreenboxSymbolThemeFontFamily}"
+                        Glyph="{StaticResource FolderOpenGlyph}" />
                     <TextBlock Margin="8,0,0,0" Text="{strings:Resources Key=AddFiles}" />
                 </StackPanel>
             </Button>
@@ -126,7 +130,10 @@
                 IsEnabled="{x:Bind ViewModel.HasItems, Mode=OneWay}"
                 KeyTipPlacementMode="Bottom">
                 <StackPanel Orientation="Horizontal">
-                    <FontIcon Margin="{StaticResource IconButtonStandardIconMargin}" Glyph="&#xE74D;" />
+                    <FontIcon
+                        Margin="{StaticResource IconButtonStandardIconMargin}"
+                        FontFamily="{StaticResource ScreenboxSymbolThemeFontFamily}"
+                        Glyph="{StaticResource DeleteGlyph}" />
                     <TextBlock
                         x:Name="ClearButtonLabel"
                         Margin="8,0,0,0"
@@ -193,13 +200,13 @@
                     Command="{x:Bind ViewModel.PlaySelectedNextCommand}"
                     CommandParameter="{x:Bind PlaylistListView.SelectedItems}"
                     Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
-                                       Glyph=&#xF5EB;}"
+                                       Glyph={StaticResource PlayAddGlyph}}"
                     Label="{strings:Resources Key=PlayNext}" />
                 <AppBarButton
                     x:Name="RemoveSelectedButton"
                     Command="{x:Bind ViewModel.RemoveSelectedCommand}"
                     CommandParameter="{x:Bind PlaylistListView.SelectedItems}"
-                    Icon="Delete"
+                    Icon="{ui:FontIcon Glyph=&#xE894;}"
                     Label="{strings:Resources Key=Remove}">
                     <AppBarButton.KeyboardAccelerators>
                         <KeyboardAccelerator Key="Delete" />

diff --git a/Screenbox/Pages/AlbumDetailsPage.xaml b/Screenbox/Pages/AlbumDetailsPage.xaml
@@ -29,13 +29,14 @@
                 <MenuFlyoutItem
                     Command="{x:Bind ViewModel.PlayCommand}"
                     CommandParameter="{Binding}"
-                    Icon="{ui:SymbolIcon Symbol=Play}"
+                    Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
+                                       Glyph={StaticResource PlayGlyph}}"
                     Text="{strings:Resources Key=Play}" />
                 <MenuFlyoutItem
                     Command="{x:Bind Common.PlayNextCommand}"
                     CommandParameter="{Binding}"
                     Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
-                                       Glyph=&#xF5EB;}"
+                                       Glyph={StaticResource PlayAddGlyph}}"
                     Text="{strings:Resources Key=PlayNext}" />
                 <MenuFlyoutSeparator />
                 <MenuFlyoutItem
@@ -196,7 +197,8 @@
                                 BorderBrush="{StaticResource AccentButtonBorderBrush}"
                                 Command="{x:Bind ViewModel.PlayCommand}"
                                 CommandParameter="{x:Bind ViewModel.SortedItems, Mode=OneWay, Converter={StaticResource FirstOrDefaultConverter}}"
-                                Icon="{ui:FontIcon Glyph=&#xE768;}"
+                                Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
+                                                   Glyph={StaticResource PlayGlyph}}"
                                 Label="{strings:Resources Key=Play}"
                                 Style="{StaticResource AppBarButtonAccentButtonStyle}"
                                 XYFocusDown="{x:Bind ItemList}">
@@ -209,7 +211,8 @@
                                 HorizontalAlignment="Stretch"
                                 BorderBrush="{ThemeResource ButtonBorderBrush}"
                                 Command="{x:Bind ViewModel.ShuffleAndPlayCommand}"
-                                Icon="{ui:FontIcon Glyph=&#xE8B1;,
+                                Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
+                                                   Glyph={StaticResource ShuffleGlyph},
                                                    MirroredWhenRightToLeft=True}"
                                 Label="{strings:Resources Key=ShuffleAndPlay}"
                                 Style="{StaticResource AppBarButtonDefaultButtonStyle}"

diff --git a/Screenbox/Pages/AlbumsPage.xaml b/Screenbox/Pages/AlbumsPage.xaml
@@ -35,7 +35,7 @@
             <MenuFlyout x:Key="AlbumFlyout">
                 <MenuFlyoutItem Command="{Binding PlayAlbumCommand}" Text="{Binding IsPlaying, Converter={StaticResource BoolToPlayPauseTextConverter}}">
                     <MenuFlyoutItem.Icon>
-                        <FontIcon Glyph="{Binding IsPlaying, Converter={StaticResource PlayPauseGlyphConverter}}" />
+                        <FontIcon FontFamily="{StaticResource ScreenboxSymbolThemeFontFamily}" Glyph="{Binding IsPlaying, Converter={StaticResource PlayPauseGlyphConverter}}" />
                     </MenuFlyoutItem.Icon>
                 </MenuFlyoutItem>
                 <MenuFlyoutSeparator />
@@ -69,7 +69,8 @@
             <StackPanel Orientation="Horizontal">
                 <FontIcon
                     Margin="{StaticResource IconButtonStandardIconMargin}"
-                    Glyph="&#xE8B1;"
+                    FontFamily="{StaticResource ScreenboxSymbolThemeFontFamily}"
+                    Glyph="{StaticResource ShuffleGlyph}"
                     MirroredWhenRightToLeft="True" />
                 <TextBlock Margin="8,0,0,0" Text="{strings:Resources Key=ShuffleAndPlay}" />
             </StackPanel>

diff --git a/Screenbox/Pages/AllVideosPage.xaml b/Screenbox/Pages/AllVideosPage.xaml
@@ -23,13 +23,14 @@
                 <MenuFlyoutItem
                     Command="{x:Bind ViewModel.PlayCommand}"
                     CommandParameter="{Binding}"
-                    Icon="{ui:SymbolIcon Symbol=Play}"
+                    Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
+                                       Glyph={StaticResource PlayGlyph}}"
                     Text="{strings:Resources Key=Play}" />
                 <MenuFlyoutItem
                     Command="{x:Bind Common.PlayNextCommand}"
                     CommandParameter="{Binding}"
                     Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
-                                       Glyph=&#xF5EB;}"
+                                       Glyph={StaticResource PlayAddGlyph}}"
                     Text="{strings:Resources Key=PlayNext}" />
                 <MenuFlyoutSeparator />
                 <MenuFlyoutItem

diff --git a/Screenbox/Pages/ArtistDetailsPage.xaml b/Screenbox/Pages/ArtistDetailsPage.xaml
@@ -117,13 +117,14 @@
                 <MenuFlyoutItem
                     Command="{x:Bind ViewModel.PlayCommand}"
                     CommandParameter="{Binding}"
-                    Icon="{ui:SymbolIcon Symbol=Play}"
+                    Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
+                                       Glyph={StaticResource PlayGlyph}}"
                     Text="{strings:Resources Key=Play}" />
                 <MenuFlyoutItem
                     Command="{x:Bind Common.PlayNextCommand}"
                     CommandParameter="{Binding}"
                     Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
-                                       Glyph=&#xF5EB;}"
+                                       Glyph={StaticResource PlayAddGlyph}}"
                     Text="{strings:Resources Key=PlayNext}" />
                 <MenuFlyoutSeparator />
                 <MenuFlyoutItem
@@ -276,7 +277,8 @@
                                 BackgroundSizing="OuterBorderEdge"
                                 BorderBrush="{ThemeResource AccentButtonBorderBrush}"
                                 Command="{x:Bind ViewModel.PlayCommand}"
-                                Icon="{ui:FontIcon Glyph=&#xE768;}"
+                                Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
+                                                   Glyph={StaticResource PlayGlyph}}"
                                 Label="{strings:Resources Key=Play}"
                                 Style="{StaticResource AppBarButtonAccentButtonStyle}"
                                 XYFocusDown="{x:Bind ItemList}">
@@ -289,7 +291,8 @@
                                 HorizontalAlignment="Stretch"
                                 BorderBrush="{ThemeResource ButtonBorderBrush}"
                                 Command="{x:Bind ViewModel.ShuffleAndPlayCommand}"
-                                Icon="{ui:FontIcon Glyph=&#xE8B1;,
+                                Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
+                                                   Glyph={StaticResource ShuffleGlyph},
                                                    MirroredWhenRightToLeft=True}"
                                 Label="{strings:Resources Key=ShuffleAndPlay}"
                                 Style="{StaticResource AppBarButtonDefaultButtonStyle}"

diff --git a/Screenbox/Pages/ArtistsPage.xaml b/Screenbox/Pages/ArtistsPage.xaml
@@ -30,7 +30,7 @@
             <MenuFlyout x:Key="ArtistFlyout">
                 <MenuFlyoutItem Command="{Binding PlayArtistCommand}" Text="{Binding IsPlaying, Converter={StaticResource BoolToPlayPauseTextConverter}}">
                     <MenuFlyoutItem.Icon>
-                        <FontIcon Glyph="{Binding IsPlaying, Converter={StaticResource PlayPauseGlyphConverter}}" />
+                        <FontIcon FontFamily="{StaticResource ScreenboxSymbolThemeFontFamily}" Glyph="{Binding IsPlaying, Converter={StaticResource PlayPauseGlyphConverter}}" />
                     </MenuFlyoutItem.Icon>
                 </MenuFlyoutItem>
                 <MenuFlyoutSeparator />
@@ -64,7 +64,8 @@
             <StackPanel Orientation="Horizontal">
                 <FontIcon
                     Margin="{StaticResource IconButtonStandardIconMargin}"
-                    Glyph="&#xE8B1;"
+                    FontFamily="{StaticResource ScreenboxSymbolThemeFontFamily}"
+                    Glyph="{StaticResource ShuffleGlyph}"
                     MirroredWhenRightToLeft="True" />
                 <TextBlock Margin="8,0,0,0" Text="{strings:Resources Key=ShuffleAndPlay}" />
             </StackPanel>