refactor: IconPacks.Avalonia.BoxIcons

punker76 · Oct 27, 2024 · 6cc985c · 6cc985c
1 parent d3b8736
commit 6cc985c
Show file tree

Hide file tree

Showing 19 changed files with 1,782 additions and 2,660 deletions.
diff --git a/src/AvaloniaApp/App.axaml b/src/AvaloniaApp/App.axaml
@@ -28,6 +28,7 @@
                                        ListLow="#ff134b82" ListMedium="#ff2f7bad" RegionColor="#ff0d2644" />
             </FluentTheme.Palettes>
         </FluentTheme>
-         <StyleInclude Source="avares://AvaloniaIconPacks/BoxIcons.xaml"/> 
+
+        <StyleInclude Source="avares://IconPacks.Avalonia.BoxIcons/BoxIcons.xaml"/> 
     </Application.Styles>
 </Application>
diff --git a/src/AvaloniaApp/AvaloniaApp.csproj b/src/AvaloniaApp/AvaloniaApp.csproj
@@ -19,7 +19,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\AvaloniaIconPacks\AvaloniaIconPacks.csproj" />
+        <ProjectReference Include="..\IconPacks.Avalonia.BoxIcons\IconPacks.Avalonia.BoxIcons.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/AvaloniaApp/MainWindow.axaml b/src/AvaloniaApp/MainWindow.axaml
@@ -4,7 +4,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:avaloniaApp="clr-namespace:AvaloniaApp"
         xmlns:iconPacks="urn:iconpacks-avalonia"
-        xmlns:iconPacks1="clr-namespace:MahApps.Metro.IconPacks;assembly=AvaloniaIconPacks"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="AvaloniaApp.MainWindow"
         Title="AvaloniaApp"
@@ -16,10 +15,10 @@
             <TextBlock Margin="0 10" Text="Welcome to Avalonia!" FontSize="22" FontWeight="SemiBold" />
             <TextBlock Margin="0 10" Text="IconPacks - PackIconBoxIcons" FontSize="18" FontWeight="SemiBold" />
 
-            <ComboBox Name="BoxIcons" Width="200" ItemsSource="{avaloniaApp:Enums iconPacks1:PackIconBoxIconsKind}"
-                      SelectedItem="{x:Static iconPacks1:PackIconBoxIconsKind.RegularRecycle}" />
+            <ComboBox Name="BoxIcons" Width="200" ItemsSource="{avaloniaApp:Enums iconPacks:PackIconBoxIconsKind}"
+                      SelectedItem="{x:Static iconPacks:PackIconBoxIconsKind.RegularRecycle}" />
 
-            <iconPacks1:PackIconBoxIcons Margin="10"
+            <iconPacks:PackIconBoxIcons Margin="10"
                                         Kind="{Binding #BoxIcons.SelectedItem, Mode=OneWay}"
                                         Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
 
@@ -31,13 +30,13 @@
             </ComboBox>
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
-                <iconPacks1:PackIconBoxIcons Kind="{Binding #BoxIcons.SelectedItem, Mode=OneWay}"
+                <iconPacks:PackIconBoxIcons Kind="{Binding #BoxIcons.SelectedItem, Mode=OneWay}"
                                             Foreground="{DynamicResource SystemControlHighlightAccentBrush}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             Margin="5"
                                             Width="144" Height="144" />
-                <iconPacks1:PackIconBoxIcons Kind="{Binding #BoxIcons.SelectedItem, Mode=OneWay}"
+                <iconPacks:PackIconBoxIcons Kind="{Binding #BoxIcons.SelectedItem, Mode=OneWay}"
                                             Foreground="{DynamicResource SystemControlHighlightAccentBrush}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
@@ -59,7 +58,7 @@
             <CheckBox Name="SpinCheckBox" Margin="0 2" Content="Spin" IsChecked="True" />
             <CheckBox Name="VisibilityCheckBox" Margin="0 2" Content="Visible" IsChecked="True" />
 
-            <iconPacks1:PackIconBoxIcons Kind="RegularCog"
+            <iconPacks:PackIconBoxIcons Kind="RegularCog"
                                         Foreground="{DynamicResource SystemControlHighlightAccentBrush}"
                                         ClipToBounds="False"
                                         HorizontalAlignment="Center"

diff --git a/src/AvaloniaIconPacks.TestApp.sln b/src/AvaloniaIconPacks.TestApp.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.10.34916.146
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaIconPacks", "AvaloniaIconPacks\AvaloniaIconPacks.csproj", "{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaApp", "AvaloniaApp\AvaloniaApp.csproj", "{3D1F4877-0B9D-4D2E-BA55-2527FB5F6552}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconPacks.Avalonia.Core", "IconPacks.Avalonia.Core\IconPacks.Avalonia.Core.csproj", "{870C9AFF-CB82-4A6B-BB0B-7AE19B43A766}"
@@ -14,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\.editorconfig = ..\.editorconfig
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconPacks.Avalonia.BoxIcons", "IconPacks.Avalonia.BoxIcons\IconPacks.Avalonia.BoxIcons.csproj", "{0159372E-46AA-4886-B346-4AA74B26D613}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -24,18 +24,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Debug|x64.Build.0 = Debug|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Debug|x86.Build.0 = Debug|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Release|x64.ActiveCfg = Release|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Release|x64.Build.0 = Release|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Release|x86.ActiveCfg = Release|Any CPU
-		{9D89109C-03C6-4F03-ACFF-0212CA6FAAA3}.Release|x86.Build.0 = Release|Any CPU
 		{3D1F4877-0B9D-4D2E-BA55-2527FB5F6552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D1F4877-0B9D-4D2E-BA55-2527FB5F6552}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3D1F4877-0B9D-4D2E-BA55-2527FB5F6552}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -60,6 +48,18 @@ Global
 		{870C9AFF-CB82-4A6B-BB0B-7AE19B43A766}.Release|x64.Build.0 = Release|Any CPU
 		{870C9AFF-CB82-4A6B-BB0B-7AE19B43A766}.Release|x86.ActiveCfg = Release|Any CPU
 		{870C9AFF-CB82-4A6B-BB0B-7AE19B43A766}.Release|x86.Build.0 = Release|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Debug|x64.Build.0 = Debug|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Debug|x86.Build.0 = Debug|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Release|x64.ActiveCfg = Release|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Release|x64.Build.0 = Release|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Release|x86.ActiveCfg = Release|Any CPU
+		{0159372E-46AA-4886-B346-4AA74B26D613}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE