feat: replace icons in demo.

This commit is contained in:
Zhang Dian
2025-01-13 23:53:39 +08:00
parent 2084f148e7
commit 9b98ad7e6a
11 changed files with 63 additions and 102 deletions

View File

@@ -11,9 +11,6 @@
<Design.DataContext>
<vm:AvatarDemoViewModel />
</Design.DataContext>
<UserControl.Resources>
<StreamGeometry x:Key="IconCamera">M7.44721 3.10557C7.786 2.428 8.47852 2 9.23607 2H14.7639C15.5215 2 16.214 2.428 16.5528 3.10557L17.5 5H20C21.6569 5 23 6.34315 23 8V18C23 19.6569 21.6569 21 20 21H4C2.34315 21 1 19.6569 1 18V8C1 6.34315 2.34315 5 4 5H6.5L7.44721 3.10557ZM9 13C9 11.3431 10.3431 10 12 10C13.6569 10 15 11.3431 15 13C15 14.6569 13.6569 16 12 16C10.3431 16 9 14.6569 9 13ZM12 8C9.23858 8 7 10.2386 7 13C7 15.7614 9.23858 18 12 18C14.7614 18 17 15.7614 17 13C17 10.2386 14.7614 8 12 8Z</StreamGeometry>
</UserControl.Resources>
<UserControl.Styles>
<Style Selector="u|Avatar">
<Setter Property="Content" Value="{Binding Content}" />
@@ -32,7 +29,8 @@
Width="{Binding $parent[u:Avatar].Width}"
Height="{Binding $parent[u:Avatar].Height}" />
<PathIcon
Data="{StaticResource IconCamera}"
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconCamera}"
Width="{Binding $parent[u:Avatar].FontSize}"
Height="{Binding $parent[u:Avatar].FontSize}" />
</Panel>
@@ -86,7 +84,8 @@
Width="{Binding $parent[u:Avatar].Width}"
Height="{Binding $parent[u:Avatar].Height}" />
<PathIcon
Data="{StaticResource IconCamera}"
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconCamera}"
Width="{Binding $parent[u:Avatar].FontSize}"
Height="{Binding $parent[u:Avatar].FontSize}" />
</Panel>

View File

@@ -48,7 +48,9 @@
</u:Breadcrumb.Styles>
<u:Breadcrumb.IconTemplate>
<DataTemplate DataType="x:String">
<PathIcon Width="12" Height="12" Data="{Binding Path=., Converter={StaticResource IconConverter}}"></PathIcon>
<PathIcon
Theme="{StaticResource InnerPathIcon}"
Data="{Binding Converter={StaticResource IconConverter}}" />
</DataTemplate>
</u:Breadcrumb.IconTemplate>
</u:Breadcrumb>

View File

@@ -56,11 +56,10 @@
<StackPanel Orientation="Horizontal">
<TextBlock Text="Style Class" />
<PathIcon
Width="12"
Height="12"
Theme="{StaticResource InnerPathIcon}"
VerticalAlignment="Center"
TextElement.FontWeight="Normal"
Data="{DynamicResource DialogQuestionIconGlyph}"
Data="{DynamicResource SemiIconHelpCircle}"
ToolTip.Tip="Pass a Style Class to the created Dialog. In this example, if you set StyleClass as 'Custom', You will get Special Style for OK Button. These styles usually are defined in the root of your App/Window" />
</StackPanel>
</u:FormItem.Label>
@@ -148,11 +147,10 @@
<StackPanel Orientation="Horizontal">
<TextBlock Text="Style Class" />
<PathIcon
Width="12"
Height="12"
Theme="{StaticResource InnerPathIcon}"
VerticalAlignment="Center"
TextElement.FontWeight="Normal"
Data="{DynamicResource DialogQuestionIconGlyph}"
Data="{DynamicResource SemiIconHelpCircle}"
ToolTip.Tip="Pass a Style Class to the created Dialog. In this example, if you set StyleClass as 'Custom', You will get Special Style for OK Button. These styles usually are defined in the root of your App/Window" />
</StackPanel>
</u:FormItem.Label>

View File

@@ -9,10 +9,6 @@
d:DesignWidth="800"
mc:Ignorable="d">
<UserControl.Resources>
<StreamGeometry x:Key="InfoPath">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</StreamGeometry>
</UserControl.Resources>
<UserControl.Styles>
<Style Selector="u|DualBadge">
<Setter Property="Margin" Value="4" />
@@ -29,9 +25,8 @@
<u:DualBadge>
<u:DualBadge.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4k
</u:DualBadge>
@@ -41,9 +36,8 @@
<u:DualBadge Header="downloads">
<u:DualBadge.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4k
</u:DualBadge>
@@ -57,9 +51,8 @@
<u:DualBadge Classes="FlatSquare">
<u:DualBadge.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4k
</u:DualBadge>
@@ -69,9 +62,8 @@
<u:DualBadge Classes="FlatSquare" Header="downloads">
<u:DualBadge.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4k
</u:DualBadge>
@@ -85,9 +77,8 @@
<u:DualBadge Classes="Plastic">
<u:DualBadge.Icon>
<PathIcon
Width="12"
Height="12"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4k
</u:DualBadge>
@@ -97,9 +88,8 @@
<u:DualBadge Classes="Plastic" Header="downloads">
<u:DualBadge.Icon>
<PathIcon
Width="12"
Height="12"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4k
</u:DualBadge>
@@ -113,9 +103,8 @@
<u:DualBadge Classes="ForTheBadge">
<u:DualBadge.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4K
</u:DualBadge>
@@ -125,9 +114,8 @@
<u:DualBadge Classes="ForTheBadge" Header="DOWNLOADS">
<u:DualBadge.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4K
</u:DualBadge>

View File

@@ -9,9 +9,6 @@
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<UserControl.Resources>
<StreamGeometry x:Key="iconGlyph">M12.0101 1C5.92171 1 1 5.92171 1 12.0101C1 16.8771 4.15354 20.9967 8.5284 22.455C9.07526 22.5644 9.27577 22.218 9.27577 21.9264C9.27577 21.6712 9.25754 20.7962 9.25754 19.8848C6.19514 20.541 5.55714 18.5723 5.55714 18.5723C5.06497 17.2963 4.33583 16.9682 4.33583 16.9682C3.33326 16.2938 4.40874 16.2938 4.40874 16.2938C5.52069 16.3667 6.104 17.4239 6.104 17.4239C7.08834 19.101 8.67423 18.627 9.31223 18.3354C9.40337 17.6245 9.69503 17.1323 10.0049 16.8589C7.56229 16.6037 4.99206 15.6558 4.99206 11.4267C4.99206 10.2237 5.42954 9.23931 6.12223 8.47371C6.01286 8.20028 5.63006 7.07011 6.2316 5.55714C6.2316 5.55714 7.16126 5.26548 9.25754 6.68731C10.1325 6.45034 11.0804 6.32274 12.0101 6.32274C12.9397 6.32274 13.8876 6.45034 14.7626 6.68731C16.8589 5.26548 17.7885 5.55714 17.7885 5.55714C18.3901 7.07011 18.0073 8.20028 17.8979 8.47371C18.6088 9.23931 19.0281 10.2237 19.0281 11.4267C19.0281 15.6558 16.4578 16.5854 13.997 16.8589C14.398 17.2052 14.7443 17.8614 14.7443 18.9004C14.7443 20.377 14.7261 21.5618 14.7261 21.9264C14.7261 22.218 14.9266 22.5644 15.4735 22.455C19.8483 20.9967 23.0019 16.8771 23.0019 12.0101C23.0201 5.92171 18.0802 1 12.0101 1Z</StreamGeometry>
</UserControl.Resources>
<StackPanel HorizontalAlignment="Left" Spacing="16">
<ToggleSwitch Name="loading" Content="Toggle Loading" />
<u:EnumSelector Name="placement" EnumType="{x:Type common:Position}" />
@@ -36,9 +33,8 @@
IsLoading="{Binding #loading.IsChecked}">
<u:IconButton.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource iconGlyph}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconGithubLogo}" />
</u:IconButton.Icon>
</u:IconButton>
<u:IconButton
@@ -48,9 +44,8 @@
IsLoading="{Binding #loading.IsChecked}">
<u:IconButton.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource iconGlyph}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconGithubLogo}" />
</u:IconButton.Icon>
</u:IconButton>
<u:IconButton
@@ -61,9 +56,8 @@
IsLoading="{Binding #loading.IsChecked}">
<u:IconButton.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource iconGlyph}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconGithubLogo}" />
</u:IconButton.Icon>
</u:IconButton>
<u:IconButton
@@ -74,9 +68,8 @@
Theme="{DynamicResource SolidIconButton}">
<u:IconButton.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource iconGlyph}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconGithubLogo}" />
</u:IconButton.Icon>
</u:IconButton>
<u:IconButton
@@ -88,9 +81,8 @@
Theme="{DynamicResource SolidIconButton}">
<u:IconButton.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource iconGlyph}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconGithubLogo}" />
</u:IconButton.Icon>
</u:IconButton>
<u:IconButton

View File

@@ -14,7 +14,6 @@
<vm:IntroductionDemoViewModel />
</Design.DataContext>
<UserControl.Resources>
<StreamGeometry x:Key="InfoPath">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</StreamGeometry>
<SolidColorBrush x:Key="MaskBackground" Opacity="0.2" Color="{DynamicResource SemiBlue3Color}" />
<SolidColorBrush x:Key="MaskBorderBrush" Color="{DynamicResource SemiBlue5Color}" />
</UserControl.Resources>
@@ -190,36 +189,32 @@
<u:DualBadge Header="downloads">
<u:DualBadge.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4k
</u:DualBadge>
<u:DualBadge Classes="FlatSquare" Header="downloads">
<u:DualBadge.Icon>
<PathIcon
Width="14"
Height="14"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4k
</u:DualBadge>
<u:DualBadge Classes="Plastic" Header="downloads">
<u:DualBadge.Icon>
<PathIcon
Width="12"
Height="12"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4k
</u:DualBadge>
<u:DualBadge Classes="ForTheBadge" Header="downloads">
<u:DualBadge.Icon>
<PathIcon
Width="12"
Height="12"
Data="{StaticResource InfoPath}" />
Theme="{StaticResource InnerPathIcon}"
Data="{StaticResource SemiIconDownload}" />
</u:DualBadge.Icon>
2.4k
</u:DualBadge>

View File

@@ -10,11 +10,6 @@
x:CompileBindings="True"
x:DataType="vm:RatingDemoViewModel"
mc:Ignorable="d">
<UserControl.Resources>
<StreamGeometry x:Key="LoveHeartGeometry">
M12 5.99999C10.5 2.12432 5.75193 2.0557 3.40383 4.4038C0.865423 6.94221 0.999999 10.5 3.50001 14C5.52139 16.8299 9.83088 20.3136 11.4069 21.5438C11.7573 21.8172 12.2427 21.8172 12.5931 21.5438C14.1691 20.3136 18.4786 16.8299 20.5 14C23 10.5 23.1346 6.94221 20.5962 4.4038C18.2481 2.0557 14.5 2.12432 12 5.99999Z
</StreamGeometry>
</UserControl.Resources>
<StackPanel Spacing="20">
<Grid ColumnDefinitions="*, 300">
<Grid Grid.Column="0">
@@ -43,7 +38,7 @@
Count="{Binding Count}"
DefaultValue="{Binding DefaultValue}"
Foreground="{StaticResource SemiRed5}"
Character="{StaticResource LoveHeartGeometry}" />
Character="{StaticResource SemiIconLikeHeart}" />
</StackPanel>
</Grid>
<Border Grid.Column="1" VerticalAlignment="Top">

View File

@@ -12,12 +12,6 @@
x:CompileBindings="True"
x:DataType="vm:ToolBarDemoViewModel"
mc:Ignorable="d">
<UserControl.Resources>
<ResourceDictionary>
<StreamGeometry x:Key="BoldGlyph">M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z</StreamGeometry>
<StreamGeometry x:Key="ItalicGlyph">M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z</StreamGeometry>
</ResourceDictionary>
</UserControl.Resources>
<Grid ColumnDefinitions="Auto, Auto, *" RowDefinitions="Auto, Auto, *">
<u:EnumSelector Name="Orientation" EnumType="Orientation" />
<u:ToolBar
@@ -78,15 +72,13 @@
<u:ToolBar Margin="16">
<ToggleButton Name="bold">
<PathIcon
Width="16"
Height="16"
Data="{DynamicResource BoldGlyph}" />
Theme="{StaticResource InnerPathIcon}"
Data="{DynamicResource SemiIconBold}" />
</ToggleButton>
<ToggleButton Name="italic">
<PathIcon
Width="16"
Height="16"
Data="{DynamicResource ItalicGlyph}" />
Theme="{StaticResource InnerPathIcon}"
Data="{DynamicResource SemiIconItalic}" />
</ToggleButton>
<u:ToolBarSeparator />
<StackPanel Orientation="Horizontal">

View File

@@ -6,13 +6,13 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Ursa.Demo.Pages.TwoTonePathIconDemo">
<StackPanel>
<TextBlock Text="Size"></TextBlock>
<Slider Name="width" Minimum="0" Maximum="100" Value="20" Width="300"></Slider>
<ToggleSwitch Name="active" Content="Active"></ToggleSwitch>
<TextBlock Text="Size" />
<Slider Name="width" Minimum="0" Maximum="100" Value="20" Width="300" />
<ToggleSwitch Name="active" Content="Active" />
<u:TwoTonePathIcon
IsActive="{Binding ElementName=active, Path=IsChecked}"
Width="{Binding #width.Value}"
Height="{Binding #width.Value}"
Data="M12 3L2 12H5V20H19V12H22L12 3M13 18H11V16H13V18M13 14H11V8H13V14Z"/>
Data="{StaticResource SemiIconHome}" />
</StackPanel>
</UserControl>