Save a few bytes by removing icon packs

automuteus · Jan 25, 2021 · 74f0589 · 74f0589
1 parent 75de0b1
commit 74f0589
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 91 deletions.
diff --git a/AUCapture-WPF/AUCapture-WPF.csproj b/AUCapture-WPF/AUCapture-WPF.csproj
@@ -79,8 +79,6 @@
     <PackageReference Include="Humanizer.Core" Version="2.8.26" />
     <PackageReference Include="LoadingIndicators.WPF.Core" Version="1.0.1" />
     <PackageReference Include="MahApps.Metro" Version="2.4.3" />
-    <PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="4.8.0" />
-    <PackageReference Include="MahApps.Metro.IconPacks.Unicons" Version="4.8.0" />
     <PackageReference Include="NLog" Version="4.7.6" />
     <PackageReference Include="Octokit" Version="0.48.0" />
     <PackageReference Include="SharedMemory" Version="2.2.3" />

diff --git a/AUCapture-WPF/Controls/ConnectionStatusControl.xaml b/AUCapture-WPF/Controls/ConnectionStatusControl.xaml
diff --git a/AUCapture-WPF/Controls/ConnectionStatusControl.xaml.cs b/AUCapture-WPF/Controls/ConnectionStatusControl.xaml.cs
diff --git a/AUCapture-WPF/MainWindow.xaml b/AUCapture-WPF/MainWindow.xaml
@@ -1,6 +1,5 @@
 <mah:MetroWindow x:Class="AUCapture_WPF.MainWindow"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -54,8 +53,13 @@
                 <Button.ContentTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
-                            <iconPacks:PackIconModern Width="22" Height="22" VerticalAlignment="Center" Kind="Settings" />
-                            <TextBlock Margin="4 0 0 0" VerticalAlignment="Center" Text="{Binding}" />
+                            <Path Width="22" Height="22" Fill="{DynamicResource MahApps.Brushes.Text}"  StrokeThickness="1">
+                                <Path.Data>
+                                    <PathGeometry>
+                                        M 38,23.5C 38.8643,23.5 39.7109,23.5756 40.5337,23.7206L 42.6275,18.5381L 48.1901,20.787L 46.0964,25.9692C 47.6473,27.0149 48.9851,28.3527 50.0308,29.9036L 55.213,27.8099L 57.4619,33.3725L 52.2794,35.4664C 52.4244,36.2891 52.5,37.1357 52.5,38C 52.5,38.8643 52.4244,39.7109 52.2794,40.5337L 57.4619,42.6275L 55.213,48.1901L 50.0308,46.0964C 49.0795,47.5073 47.8865,48.7418 46.5112,49.7405L 48.7844,54.8462L 43.3041,57.2891L 41.0307,52.1828C 40.0533,52.3906 39.0394,52.5 38,52.5C 37.1357,52.5 36.2891,52.4244 35.4664,52.2794L 33.3725,57.462L 27.8099,55.213L 29.9036,50.0309C 28.3527,48.9851 27.0149,47.6473 25.9691,46.0964L 20.787,48.1901L 18.538,42.6275L 23.7206,40.5336C 23.5756,39.7109 23.5,38.8643 23.5,38C 23.5,37.1357 23.5756,36.2891 23.7206,35.4664L 18.538,33.3725L 20.787,27.8099L 25.9691,29.9036C 26.9205,28.4927 28.1135,27.2582 29.4889,26.2594L 27.2157,21.1537L 32.6959,18.7109L 34.9694,23.8172C 35.9468,23.6094 36.9606,23.5 38,23.5 Z M 38,28C 32.4771,28 28,32.4772 28,38C 28,43.5229 32.4771,48 38,48C 43.5228,48 48,43.5229 48,38C 48,32.4772 43.5228,28 38,28 Z 
+                                    </PathGeometry>
+                                </Path.Data>
+                            </Path>
                         </StackPanel>
                     </DataTemplate>
                 </Button.ContentTemplate>
@@ -65,7 +69,13 @@
                 <Button.ContentTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
-                            <iconPacks:PackIconModern Width="22" Height="22" VerticalAlignment="Center" Kind="Connect" />
+                            <Path Width="22" Height="22" Fill="{DynamicResource MahApps.Brushes.Text}"  StrokeThickness="1">
+                                <Path.Data>
+                                    <PathGeometry>
+                                        M 25.7639,28.0031L 20.0866,22.3258C 19.4683,21.7075 19.4683,20.705 20.0866,20.0866C 20.705,19.4683 21.7075,19.4683 22.3258,20.0867L 28.0031,25.7639C 32.3443,22.5092 38.5302,22.856 42.4783,26.8042L 26.8041,42.4784C 22.856,38.5302 22.5092,32.3443 25.7639,28.0031 Z M 49.1958,33.5217C 53.144,37.4699 53.4908,43.6557 50.2361,47.9969L 55.9133,53.6742C 56.5317,54.2925 56.5317,55.295 55.9133,55.9134C 55.295,56.5317 54.2925,56.5317 53.6742,55.9134L 47.9969,50.2361C 43.6557,53.4908 37.4698,53.1441 33.5216,49.1959L 36.8804,45.8371L 34.0814,43.0381C 33.1539,42.1107 33.1539,40.6069 34.0814,39.6794C 35.0089,38.7519 36.5127,38.7519 37.4402,39.6794L 40.2392,42.4784L 42.4783,40.2392L 39.6794,37.4402C 38.7519,36.5127 38.7519,35.009 39.6794,34.0815C 40.6069,33.154 42.1106,33.154 43.0381,34.0815L 45.8371,36.8804L 49.1958,33.5217 Z 
+                                    </PathGeometry>
+                                </Path.Data>
+                            </Path>
                         </StackPanel>
                     </DataTemplate>
                 </Button.ContentTemplate>
@@ -74,7 +84,13 @@
                 <Button.ContentTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
-                            <iconPacks:PackIconModern Width="22" Height="22" VerticalAlignment="Center" Kind="Crown" Foreground="#FFD700"/>
+                            <Path Width="22" Height="22"  Fill="#FFD700" StrokeThickness="1">
+                                <Path.Data>
+                                    <PathGeometry>
+                                        M 38.0333,18.5C 39.4877,18.5 40.6667,19.679 40.6667,21.1333C 40.6667,22.5877 39.4877,23.7667 38.0333,23.7667C 36.579,23.7667 35.4,22.5877 35.4,21.1333C 35.4,19.679 36.579,18.5 38.0333,18.5 Z M 56.4666,26.4C 57.921,26.4 59.1,27.579 59.1,29.0333C 59.1,30.4877 57.921,31.6667 56.4666,31.6667C 55.0123,31.6667 53.8333,30.4877 53.8333,29.0333C 53.8333,27.579 55.0123,26.4 56.4666,26.4 Z M 19.6,26.4C 21.0543,26.4 22.2333,27.579 22.2333,29.0333C 22.2333,30.4877 21.0543,31.6667 19.6,31.6667C 18.1456,31.6667 16.9667,30.4877 16.9667,29.0333C 16.9667,27.579 18.1456,26.4 19.6,26.4 Z M 27.5,40.8833L 31.45,54.05L 44.6167,54.05L 48.5667,40.8833C 41.9833,40.8833 38.0333,34.3 38.0333,34.3C 38.0333,34.3 34.0833,40.8833 27.5,40.8833 Z M 38.0333,25.0833C 38.0333,25.0833 41.9833,46.15 55.15,32.9833L 47.25,58L 28.8167,58C 25.7444,50.1 20.9167,32.9833 20.9167,32.9833C 34.0833,46.15 38.0333,25.0833 38.0333,25.0833 Z M 32,51L 31.25,49L 44.75,49L 44,51L 32,51 Z
+                                    </PathGeometry>
+                                </Path.Data>
+                            </Path>
                         </StackPanel>
                     </DataTemplate>
                 </Button.ContentTemplate>
@@ -155,10 +171,18 @@
                                                      mah:ControlsHelper.FocusBorderBrush="{DynamicResource MahApps.Brushes.Accent}"
                                                      mah:TextBoxHelper.SelectAllOnFocus="True"
                                                      mah:TextBoxHelper.Watermark="Paste token here"
-                                                     mah:TextBoxHelper.ButtonContent="{iconPacks:Unicons Kind=Question}"
                                                      Style="{DynamicResource MahApps.Styles.PasswordBox.Button}"
                                                      mah:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonHelpCmd, Mode=OneWay}"
-                                                     mah:TextBoxHelper.ButtonsAlignment="Right" />
+                                                     mah:TextBoxHelper.ButtonsAlignment="Right" >
+                                            <mah:TextBoxHelper.ButtonContent>
+                                                <Path Width="22" Height="22" Fill="{DynamicResource MahApps.Brushes.Text}"  StrokeThickness="1">
+                                                    <Path.Data>
+                                                        <PathGeometry>
+                                                            M15.33252,9.5A3.5001,3.5001,0,0,0,8.80127,7.75a1.00016,1.00016,0,0,0,1.73242,1A1.50266,1.50266,0,0,1,11.83252,8a1.5,1.5,0,1,1,0,3h-.00244a.94984.94984,0,0,0-.18927.0387,1.03181,1.03181,0,0,0-.19861.04065.98275.98275,0,0,0-.15552.10485,1.00813,1.00813,0,0,0-.162.10975,1.00464,1.00464,0,0,0-.11706.1737.97789.97789,0,0,0-.09668.14417,1.02252,1.02252,0,0,0-.04285.21191A.94847.94847,0,0,0,10.83252,12v1l.00232.01135.0011.49109a1.00016,1.00016,0,0,0,1,.99756h.00244a1.00006,1.00006,0,0,0,.99756-1.00244l-.00153-.66138A3.49363,3.49363,0,0,0,15.33252,9.5Zm-4.20264,6.79A1,1,0,0,0,11.82959,18a1.036,1.036,0,0,0,.71045-.29,1.01517,1.01517,0,0,0,0-1.41992A1.03425,1.03425,0,0,0,11.12988,16.29Z</PathGeometry>
+                                                    </Path.Data>
+                                                </Path>
+                                            </mah:TextBoxHelper.ButtonContent>
+                                        </PasswordBox>
                                         <StackPanel Grid.Row="3"
                                                     MinHeight="85"
                                                     HorizontalAlignment="Right"
@@ -188,7 +212,16 @@
                                                     <Button.ContentTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal">
-                                                                <iconPacks:PackIconModern Width="22" Height="22" VerticalAlignment="Center" Kind="Heart" Foreground="Red"/>
+
+                                                                <StackPanel Orientation="Horizontal">
+                                                                    <Path Width="22" Height="22" Fill="Red"  StrokeThickness="1">
+                                                                        <Path.Data>
+                                                                            <PathGeometry>
+                                                                                M 52.2716,27.8072C 48.9356,24.164 42.0671,25.7204 38.0992,31.3618C 33.0737,25.3024 27.0713,24.164 23.7257,27.8072C 14.4142,37.9485 34.3451,52.5246 37.9599,54.1634L 38.0438,54.2109L 38.0438,54.1634C 41.6554,52.5246 61.5832,37.9485 52.2716,27.8072 Z 
+                                                                            </PathGeometry>
+                                                                        </Path.Data>
+                                                                    </Path>
+                                                                </StackPanel>
                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </Button.ContentTemplate>
@@ -260,7 +293,13 @@
                     Command="{Binding OpenAmongUsCMD, Mode=OneWay}">
                 <Button.Content>
                     <StackPanel Orientation="Horizontal">
-                        <iconPacks:PackIconUnicons Kind="Rocket" />
+                        <Path Width="22" Height="22" Fill="{DynamicResource MahApps.Brushes.Text}"  StrokeThickness="1">
+                            <Path.Data>
+                                <PathGeometry>
+                                    M22.60107,2.062a1.00088,1.00088,0,0,0-.71289-.71289A11.25224,11.25224,0,0,0,10.46924,4.97217L9.35431,6.296l-2.6048-.62848A2.77733,2.77733,0,0,0,3.36279,7.0249L1.1626,10.9248A.99989.99989,0,0,0,1.82422,12.394l3.07275.65869a13.41952,13.41952,0,0,0-.55517,2.43409,1.00031,1.00031,0,0,0,.28466.83642l3.1001,3.1001a.99941.99941,0,0,0,.707.293c.02881,0,.05762-.00147.08692-.00391a12.16892,12.16892,0,0,0,2.49157-.49l.64368,3.00318a1.0003,1.0003,0,0,0,1.46924.66162l3.90527-2.20264a3.03526,3.03526,0,0,0,1.375-3.30371l-.6687-2.759,1.23706-1.13751A11.20387,11.20387,0,0,0,22.60107,2.062ZM3.57227,10.72314,5.12842,7.96338a.82552.82552,0,0,1,1.06982-.37549l1.71741.4162-.65.77179A13.09523,13.09523,0,0,0,5.67633,11.174Zm12.47021,8.22217L13.32666,20.477l-.4295-2.00464a11.33992,11.33992,0,0,0,2.41339-1.61987l.74353-.68366.40344,1.66462A1.041,1.041,0,0,1,16.04248,18.94531ZM17.65674,11.98l-3.68457,3.38623a9.77348,9.77348,0,0,1-5.17041,2.3042l-2.4043-2.4043a10.932,10.932,0,0,1,2.40088-5.206l1.67834-1.99268a.9635.9635,0,0,0,.07813-.09277L11.98975,6.271a9.27757,9.27757,0,0,1,8.80957-3.12012A9.21808,9.21808,0,0,1,17.65674,11.98Zm-.923-6.16376a1.5,1.5,0,1,0,1.5,1.5A1.49992,1.49992,0,0,0,16.7337,5.81622Z
+                                </PathGeometry>
+                            </Path.Data>
+                        </Path>
                         <TextBlock Margin="5 0 0 0"> Launch Among Us</TextBlock>
                     </StackPanel>
 
@@ -360,12 +399,21 @@
                          AllowDrop="False"
                          ToolTip="Game code"
                          HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-                         mah:TextBoxHelper.ButtonContent="{iconPacks:Unicons Kind=Copy}"
                          Style="{DynamicResource MahApps.Styles.TextBox.Button}"
                          mah:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCopyCmd, Mode=OneWay}"
                          dialogs:TextBoxHelper.WatermarkAlignment="Right" VerticalContentAlignment="Stretch"
                          dialogs:TextBoxHelper.AutoWatermark="True"
-                         BorderBrush="{DynamicResource MahApps.Brushes.Accent}" />
+                         BorderBrush="{DynamicResource MahApps.Brushes.Accent}">
+                    <mah:TextBoxHelper.ButtonContent>
+                        <Path Width="22" Height="22" Fill="{DynamicResource MahApps.Brushes.Text}"  StrokeThickness="1">
+                            <Path.Data>
+                                <PathGeometry>
+                                    M16,20H8a3,3,0,0,1-3-3V7A1,1,0,0,0,3,7V17a5,5,0,0,0,5,5h8a1,1,0,0,0,0-2ZM21,8.94a1.31,1.31,0,0,0-.06-.27l0-.09a1.07,1.07,0,0,0-.19-.28h0l-6-6h0a1.07,1.07,0,0,0-.28-.19l-.09,0L14.06,2H10A3,3,0,0,0,7,5V15a3,3,0,0,0,3,3h8a3,3,0,0,0,3-3V9S21,9,21,8.94ZM15,5.41,17.59,8H16a1,1,0,0,1-1-1ZM19,15a1,1,0,0,1-1,1H10a1,1,0,0,1-1-1V5a1,1,0,0,1,1-1h3V7a3,3,0,0,0,3,3h3Z
+                                </PathGeometry>
+                            </Path.Data>
+                        </Path>
+                    </mah:TextBoxHelper.ButtonContent>
+                </TextBox>
                 <TextBox Grid.Column="2" x:Name="MapBox" mah:TextBoxHelper.Watermark="Map"
                          Text="{Binding GameMap, Converter={StaticResource EnumToStringConverter}}"
                          VerticalAlignment="Center" IsManipulationEnabled="False" Focusable="False"