feat: update Radix Icons to v1.3.0

MahApps · May 4, 2024 · 10ce0b8 · 10ce0b8
1 parent 8a8bff9
commit 10ce0b8
Show file tree

Hide file tree

Showing 12 changed files with 660 additions and 671 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ This `IconPacks` library contains controls, markup extensions and converters to
 | [Primer Octicons (GitHub)](https://github.com/primer/octicons) | 19.9.0 | 604 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Octicons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Octicons.svg?style=flat-square&&label=Octicons"></a> |
 | [PICOL Icons](https://github.com/PicolSigns/Icons) | 1.1.0 | 549 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.PicolIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.PicolIcons.svg?style=flat-square&&label=PicolIcons"></a> |
 | [Pixelarticons Free](https://pixelarticons.com/) | 1.8.1 | 486 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.PixelartIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.PixelartIcons.svg?style=flat-square&&label=PixelartIcons"></a> |
-| [Radix Icons](https://icons.modulz.app/) | 1.0.3 | 312 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RadixIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RadixIcons.svg?style=flat-square&&label=RadixIcons"></a> |
+| [Radix Icons](https://github.com/radix-ui/icons) | 1.3.0 | 324 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RadixIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RadixIcons.svg?style=flat-square&&label=RadixIcons"></a> |
 | [Remix Icon](https://remixicon.com/) | 4.2.0 | 2850 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RemixIcon/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RemixIcon.svg?style=flat-square&&label=RemixIcon"></a> |
 | [RPG Awesome](https://nagoshiashumari.github.io/Rpg-Awesome/) | 0.2.0 | 495 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RPGAwesome/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RPGAwesome.svg?style=flat-square&&label=RPGAwesome"></a> |
 | [Simple Icons](https://simpleicons.org/) | 7.14.0 | 2379 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.SimpleIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.SimpleIcons.svg?style=flat-square&&label=SimpleIcons"></a> |

diff --git a/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIcons.cs b/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIcons.cs
@@ -10,10 +10,10 @@
 namespace MahApps.Metro.IconPacks
 {
     /// <summary>
-    /// RadixIcons licensed under the MIT License <see><cref>https://github.com/modulz/radix-icons/blob/master/LICENSE</cref></see>
-    /// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/modulz/radix-icons</cref></see>.
+    /// RadixIcons licensed under the MIT License <see><cref>https://github.com/radix-ui/icons?tab=MIT-1-ov-file#readme</cref></see>
+    /// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/radix-ui/icons</cref></see>.
     /// </summary>
-    [MetaData("Radix Icons", "https://icons.modulz.app/", "https://github.com/modulz/radix-icons/blob/master/LICENSE")]
+    [MetaData("Radix Icons", "https://github.com/radix-ui/icons", "https://github.com/radix-ui/icons?tab=MIT-1-ov-file#readme")]
     public class PackIconRadixIcons : PackIconControlBase
     {
         public static readonly DependencyProperty KindProperty

diff --git a/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIconsDataFactory.cs b/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIconsDataFactory.cs
diff --git a/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIconsImageExtension.cs b/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIconsImageExtension.cs
@@ -34,11 +34,5 @@ protected override string GetPathData(object iconKind)
             }
             return data;
         }
-
-        /// <inheritdoc />
-        protected override ScaleTransform GetScaleTransform(object iconKind)
-        {
-            return new ScaleTransform(1, -1);
-        }
     }
 }
diff --git a/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIconsKind.cs b/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIconsKind.cs
diff --git a/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIconsKindToImageConverter.cs b/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PackIconRadixIconsKindToImageConverter.cs
@@ -1,6 +1,4 @@
-using System.Windows.Media;
-
-namespace MahApps.Metro.IconPacks.Converter
+namespace MahApps.Metro.IconPacks.Converter
 {
     public class PackIconRadixIconsKindToImageConverter : PackIconKindToImageConverterBase
     {
@@ -14,11 +12,5 @@ protected override string GetPathData(object iconKind)
             }
             return data;
         }
-
-        /// <inheritdoc />
-        protected override ScaleTransform GetScaleTransform(object iconKind)
-        {
-            return new ScaleTransform(1, -1);
-        }
     }
 }
diff --git a/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PathIconRadixIcons.cs b/src/MahApps.Metro.IconPacks/Icons/RadixIcons/PathIconRadixIcons.cs
@@ -8,10 +8,10 @@
 namespace MahApps.Metro.IconPacks
 {
     /// <summary>
-    /// RadixIcons licensed under the MIT License <see><cref>https://github.com/modulz/radix-icons/blob/master/LICENSE</cref></see>
-    /// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/modulz/radix-icons</cref></see>.
+    /// RadixIcons licensed under the MIT License <see><cref>https://github.com/radix-ui/icons?tab=MIT-1-ov-file#readme</cref></see>
+    /// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/radix-ui/icons</cref></see>.
     /// </summary>
-    [MetaData("Radix Icons", "https://icons.modulz.app/", "https://github.com/modulz/radix-icons/blob/master/LICENSE")]
+    [MetaData("Radix Icons", "https://github.com/radix-ui/icons", "https://github.com/radix-ui/icons?tab=MIT-1-ov-file#readme")]
     public class PathIconRadixIcons : PathIconControlBase
     {
         public static readonly DependencyProperty KindProperty
@@ -36,9 +36,6 @@ public PackIconRadixIconsKind Kind
 
         public PathIconRadixIcons()
         {
-            var transformGroup = this.RenderTransform as TransformGroup ?? new TransformGroup();
-            var scaleTransform = new ScaleTransform() {ScaleY = -1};
-            transformGroup.Children.Insert(0, scaleTransform);
         }
 
         protected override void UpdateData()

diff --git a/src/MahApps.Metro.IconPacks/PackIconImageExtension.cs b/src/MahApps.Metro.IconPacks/PackIconImageExtension.cs
@@ -146,7 +146,6 @@ protected override ScaleTransform GetScaleTransform(object iconKind)
                 case PackIconFontistoKind _:
                 case PackIconForkAwesomeKind _:
                 case PackIconJamIconsKind _:
-                case PackIconRadixIconsKind _:
                 case PackIconRPGAwesomeKind _:
                 case PackIconTypiconsKind _:
                 case PackIconVaadinIconsKind _:

diff --git a/src/MahApps.Metro.IconPacks/PackIconKindToImageConverter.cs b/src/MahApps.Metro.IconPacks/PackIconKindToImageConverter.cs
@@ -126,7 +126,6 @@ protected override ScaleTransform GetScaleTransform(object iconKind)
                 case PackIconFontistoKind _:
                 case PackIconForkAwesomeKind _:
                 case PackIconJamIconsKind _:
-                case PackIconRadixIconsKind _:
                 case PackIconRPGAwesomeKind _:
                 case PackIconTypiconsKind _:
                 case PackIconVaadinIconsKind _:

diff --git a/src/MahApps.Metro.IconPacks/Themes/UAP/PackIconRadixIcons.xaml b/src/MahApps.Metro.IconPacks/Themes/UAP/PackIconRadixIcons.xaml
@@ -27,12 +27,7 @@
                     <Path Fill="{TemplateBinding Foreground}"
                           Stretch="Uniform"
                           Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}"
-                          RenderTransformOrigin="0.5 0.5"
-                          UseLayoutRounding="False">
-                        <Path.RenderTransform>
-                            <ScaleTransform ScaleY="-1" />
-                        </Path.RenderTransform>
-                    </Path>
+                          UseLayoutRounding="False" />
                 </Viewbox>
             </Grid>
         </Grid>

diff --git a/src/MahApps.Metro.IconPacks/Themes/WPF/PackIconControl.xaml b/src/MahApps.Metro.IconPacks/Themes/WPF/PackIconControl.xaml
@@ -116,13 +116,6 @@
                     </Setter.Value>
                 </Setter>
             </DataTrigger>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" Value="{x:Type iconPacks:PackIconRadixIconsKind}">
-                <Setter TargetName="PART_IconPath" Property="LayoutTransform">
-                    <Setter.Value>
-                        <ScaleTransform ScaleY="-1" />
-                    </Setter.Value>
-                </Setter>
-            </DataTrigger>
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" Value="{x:Type iconPacks:PackIconRPGAwesomeKind}">
                 <Setter TargetName="PART_IconPath" Property="LayoutTransform">
                     <Setter.Value>

diff --git a/src/MahApps.Metro.IconPacks/Themes/WPF/PackIconRadixIcons.xaml b/src/MahApps.Metro.IconPacks/Themes/WPF/PackIconRadixIcons.xaml
@@ -29,11 +29,7 @@
                           Stretch="Uniform"
                           Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}"
                           SnapsToDevicePixels="False"
-                          UseLayoutRounding="False">
-                        <Path.LayoutTransform>
-                            <ScaleTransform ScaleY="-1" />
-                        </Path.LayoutTransform>
-                    </Path>
+                          UseLayoutRounding="False" />
                 </Viewbox>
             </Grid>
         </Grid>