Skip to content

Commit

Permalink
Merge pull request WalletWasabi#12888 from ichthus1604/SendManualCont…
Browse files Browse the repository at this point in the history
…rol2

[UI] Send: Manual Control 2
  • Loading branch information
RolandUI authored Jun 24, 2024
2 parents f7a9e58 + c73d4d9 commit 81b995e
Show file tree
Hide file tree
Showing 41 changed files with 619 additions and 617 deletions.
26 changes: 24 additions & 2 deletions WalletWasabi.Fluent/Controls/AmountControl.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

<Setter Property="Template">
<ControlTemplate>
<TextBlock DataContext="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}}" Classes="monoSpaced" TextWrapping="Wrap">
<TextBlock DataContext="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}}" Classes="monoSpaced" TextWrapping="Wrap"
IsVisible="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}">
<TextBlock.Text>
<MultiBinding StringFormat="{}{0} {1}">
<Binding Path="Btc" Converter="{x:Static converters:MoneyConverters.ToBtc}" />
Expand All @@ -20,7 +21,8 @@
<Style Selector="^.Fee">
<Setter Property="Template">
<ControlTemplate>
<TextBlock DataContext="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}}" Classes="monoSpaced" TextWrapping="Wrap">
<TextBlock DataContext="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}}" Classes="monoSpaced" TextWrapping="Wrap"
IsVisible="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}">
<TextBlock.Text>
<MultiBinding StringFormat="{}{0} {1}">
<Binding Path="Btc" Converter="{x:Static converters:MoneyConverters.ToFeeWithUnit}" />
Expand All @@ -32,6 +34,26 @@
</Setter>
</Style>

<Style Selector="^.Material">
<Setter Property="Template">
<ControlTemplate>
<Border Background="{DynamicResource TileRegionColor}"
Padding="10 5 10 5" CornerRadius="10"
DataContext="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}}"
IsVisible="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}">
<StackPanel Orientation="Horizontal" Spacing="10">
<TextBlock Classes="monoSpaced" TextWrapping="Wrap"
Text="{Binding Btc, Converter={x:Static converters:MoneyConverters.ToBtc}}"/>
<TextBlock Classes="monoSpaced" TextWrapping="Wrap"
Text="{Binding Usd^, Converter={x:Static converters:MoneyConverters.ToUsdFormatted}}"
IsVisible="{Binding HasUsdBalance^}"
Opacity="0.6"/>
</StackPanel>
</Border>
</ControlTemplate>
</Setter>
</Style>

</ControlTheme>

</ResourceDictionary>
4 changes: 2 additions & 2 deletions WalletWasabi.Fluent/Controls/AmountControl.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ namespace WalletWasabi.Fluent.Controls;

public class AmountControl : TemplatedControl
{
public static readonly StyledProperty<Amount> AmountProperty = AvaloniaProperty.Register<AmountControl, Amount>(nameof(Amount));
public static readonly StyledProperty<Amount?> AmountProperty = AvaloniaProperty.Register<AmountControl, Amount?>(nameof(Amount));

public Amount Amount
public Amount? Amount
{
get => GetValue(AmountProperty);
set => SetValue(AmountProperty, value);
Expand Down
23 changes: 23 additions & 0 deletions WalletWasabi.Fluent/Controls/Button.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,29 @@
</Setter>
</ControlTheme>

<ControlTheme x:Key="DialogSelectAllButton" TargetType="ToggleButton" BasedOn="{StaticResource DialogButton}">
<Style Selector="^[IsChecked=True]">
<Setter Property="ToolTip.Tip" Value="Unselect all" />
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
<PathIcon Height="13" Foreground="{DynamicResource AcrylicTrimForeground}" Data="{StaticResource select_none}" />
</DataTemplate>
</Setter.Value>
</Setter>
</Style>
<Style Selector="^[IsChecked=False]">
<Setter Property="ToolTip.Tip" Value="Select all" />
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
<PathIcon Height="13" Foreground="{DynamicResource AcrylicTrimForeground}" Data="{StaticResource select_all}" />
</DataTemplate>
</Setter.Value>
</Setter>
</Style>
</ControlTheme>

<ControlTheme x:Key="FunctionButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="{StaticResource FunctionButtonPadding}" />
Expand Down
18 changes: 10 additions & 8 deletions WalletWasabi.Fluent/Controls/ContentArea.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
<ProgressRing Name="LoadingRing" IsIndeterminate="True" IsVisible="{TemplateBinding IsBusy}" />
<DockPanel Name="MainDockPanel" IsVisible="{Binding !#LoadingRing.IsVisible}">

<Panel DockPanel.Dock="Bottom" x:Name="PART_ButtonArea">
<DockPanel DockPanel.Dock="Bottom" x:Name="PART_ButtonArea">
<Button Name="PART_CancelButton"
Classes="invisible"
IsVisible="{TemplateBinding EnableCancel}"
Content="{TemplateBinding CancelContent}"
HorizontalAlignment="Left" Command="{Binding CancelCommand}">
DockPanel.Dock="Left" Command="{Binding CancelCommand}">
<Interaction.Behaviors>
<FocusOnAttachedBehavior
IsEnabled="{Binding FocusCancel, RelativeSource={RelativeSource TemplatedParent}}" />
</Interaction.Behaviors>
</Button>
<DockPanel>

<StackPanel Orientation="Horizontal" Spacing="30" DockPanel.Dock="Right">
<Button Name="PART_SkipButton"
IsVisible="{TemplateBinding EnableSkip}"
Expand All @@ -59,15 +59,13 @@
</StackPanel>
<ContentPresenter Content="{TemplateBinding BottomContent}"
x:Name="PART_BottomContentPresenter" />
</DockPanel>
</Panel>
</DockPanel>

<Panel DockPanel.Dock="Top">
<Panel IsHitTestVisible="False" Background="{TemplateBinding HeaderBackground}" />
<StackPanel Name="PART_Header" Spacing="10">
<DockPanel>
<Button Name="PART_BackButton"
Margin="-31,0,0,0"
Classes="plain"
Command="{Binding BackCommand}"
IsVisible="{TemplateBinding EnableBack}">
Expand Down Expand Up @@ -118,10 +116,14 @@
<Setter Property="Margin" Value="31 11 31 21" />
</Style>

<Style Selector="^/template/ Panel#PART_ButtonArea">
<Setter Property="Margin" Value="31,10" />
<Style Selector="^/template/ DockPanel#PART_ButtonArea">
<Setter Property="Margin" Value="31 0 31 10" />
</Style>

<Style Selector="^/template/ Button#PART_BackButton">
<Setter Property="Margin" Value="-31,0,0,0"/>
</Style>

<Style Selector="^/template/ ContentPresenter#PART_TitlePresenter">
<Setter Property="TextElement.Foreground" Value="{DynamicResource TextControlForeground}" />
<Setter Property="TextElement.FontSize" Value="{DynamicResource FontSizeH3}" />
Expand Down
43 changes: 43 additions & 0 deletions WalletWasabi.Fluent/Controls/UICommand.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
using Avalonia;
using System.Windows.Input;

namespace WalletWasabi.Fluent.Controls;

public class UICommand : AvaloniaObject, IUICommand
{
public static readonly StyledProperty<string> NameProperty =
AvaloniaProperty.Register<UICommand, string>(nameof(Name));

public static readonly StyledProperty<object> IconProperty =
AvaloniaProperty.Register<UICommand, object>(nameof(Icon));

public static readonly StyledProperty<ICommand> CommandProperty =
AvaloniaProperty.Register<UICommand, ICommand>(nameof(Command));

public static readonly StyledProperty<bool> IsDefaultProperty =
AvaloniaProperty.Register<UICommand, bool>(nameof(IsDefault));

public string Name
{
get => GetValue(NameProperty);
set => SetValue(NameProperty, value);
}

public object Icon
{
get => GetValue(IconProperty);
set => SetValue(IconProperty, value);
}

public ICommand Command
{
get => GetValue(CommandProperty);
set => SetValue(CommandProperty, value);
}

public bool IsDefault
{
get => GetValue(IsDefaultProperty);
set => SetValue(IsDefaultProperty, value);
}
}
2 changes: 2 additions & 0 deletions WalletWasabi.Fluent/Icons/Icons.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@
<StreamGeometry x:Key="select_none">M 1.6875 0 C 0.811127 0 0.090651 0.668804 0.0078125 1.52344 C 0.00255634 1.57766 0 1.63189 0 1.6875 C -1.21318e-05 1.69014 0 1.69267 0 1.69531 L 0 11.4355 L 0 11.4434 C 0.000255319 11.4989 0.00231271 11.5533 0.0078125 11.6074 C 0.090651 12.4621 0.811127 13.1309 1.6875 13.1309 L 11.4355 13.1309 C 12.3119 13.1309 13.0304 12.4621 13.1133 11.6074 C 13.119 11.5507 13.123 11.4938 13.123 11.4355 L 13.123 1.69531 L 13.123 1.6875 C 13.1228 1.63195 13.1188 1.5776 13.1133 1.52344 C 13.0304 0.668808 12.3119 0 11.4355 0 L 1.6875 0 z M 1.6875 1.13281 L 4.47656 1.13281 L 11.4355 1.13281 C 11.7073 1.13281 11.9339 1.32571 11.9863 1.58203 C 11.9933 1.61615 11.9975 1.65144 11.998 1.6875 L 11.998 1.69531 L 11.998 11.4355 C 11.998 11.4744 11.9938 11.5122 11.9863 11.5488 C 11.9339 11.8051 11.7073 11.998 11.4355 11.998 L 1.6875 11.998 C 1.41567 11.998 1.18917 11.8051 1.13672 11.5488 C 1.12923 11.5122 1.125 11.4744 1.125 11.4355 L 1.125 1.69531 L 1.125 1.6875 C 1.1255 1.65144 1.12974 1.61615 1.13672 1.58203 C 1.18917 1.32571 1.41567 1.13281 1.6875 1.13281 z M 13.873 2.7207 L 13.873 2.72852 L 13.8711 4.27344 L 13.8711 4.2832 L 13.875 4.3125 L 13.875 4.32031 L 13.875 11.8125 L 13.875 11.8203 C 13.8747 11.8888 13.872 11.9567 13.8652 12.0234 C 13.7596 13.0635 12.8804 13.875 11.8125 13.875 L 4.29297 13.875 L 2.7207 13.873 C 2.72168 13.8758 2.72362 13.8781 2.72461 13.8809 L 2.7207 13.8809 C 2.95155 14.5378 3.57668 15.0078 4.3125 15.0078 L 11.8125 15.0078 C 13.4655 15.0078 14.8247 13.7497 14.9844 12.1387 C 14.9953 12.0315 15 11.9225 15 11.8125 L 15 4.32031 L 15 4.3125 C 14.9998 4.26652 14.998 4.22083 14.9941 4.17578 C 14.9907 4.13334 14.985 4.09228 14.9785 4.05078 C 14.8818 3.43142 14.4502 2.92353 13.873 2.7207 z</StreamGeometry>
<StreamGeometry x:Key="select_all">M 1.6875 0 C 0.755521 0 0 0.755521 0 1.6875 L 0 11.4355 C 0 12.3675 0.755521 13.123 1.6875 13.123 L 11.4355 13.123 C 12.3675 13.123 13.123 12.3675 13.123 11.4355 L 13.123 1.6875 C 13.123 0.755521 12.3675 0 11.4355 0 L 1.6875 0 z M 1.6875 1.125 L 11.4355 1.125 C 11.7461 1.125 11.998 1.37684 11.998 1.6875 L 11.998 11.4355 C 11.998 11.7461 11.7461 11.998 11.4355 11.998 L 1.6875 11.998 C 1.37684 11.998 1.125 11.7461 1.125 11.4355 L 1.125 1.6875 C 1.125 1.37684 1.37684 1.125 1.6875 1.125 z M 13.873 2.7207 L 13.8711 4.27344 L 13.875 4.3125 L 13.875 11.8125 C 13.875 12.9516 12.9516 13.875 11.8125 13.875 L 4.29297 13.875 L 2.7207 13.873 C 2.95155 14.5299 3.57668 15 4.3125 15 L 11.8125 15 C 13.5729 15 15 13.5729 15 11.8125 L 15 4.3125 C 15 3.57668 14.5299 2.95155 13.873 2.7207 z M 9 3.9375 C 8.85606 3.9375 8.7114 3.99173 8.60156 4.10156 L 5.68555 7.01953 L 4.94922 6.03711 L 4.89453 5.97461 C 4.69964 5.78172 4.38805 5.75632 4.16211 5.92578 C 3.91358 6.11215 3.86438 6.46434 4.05078 6.71289 L 5.17578 8.21289 L 5.23047 8.27539 C 5.44628 8.48876 5.80158 8.49536 6.02344 8.27344 L 9.39844 4.89844 L 9.45312 4.83398 C 9.61654 4.61377 9.59816 4.30126 9.39844 4.10156 C 9.2886 3.99173 9.14394 3.9375 9 3.9375 z</StreamGeometry>
<StreamGeometry x:Key="coordinator">M9.25 6C8.83579 6 8.5 6.33579 8.5 6.75C8.5 7.16421 8.83579 7.5 9.25 7.5H14.75C15.1642 7.5 15.5 7.16421 15.5 6.75C15.5 6.33579 15.1642 6 14.75 6H9.25ZM8.5 17.75C8.5 17.3358 8.83579 17 9.25 17H14.75C15.1642 17 15.5 17.3358 15.5 17.75C15.5 18.1642 15.1642 18.5 14.75 18.5H9.25C8.83579 18.5 8.5 18.1642 8.5 17.75ZM9.25 14C8.83579 14 8.5 14.3358 8.5 14.75C8.5 15.1642 8.83579 15.5 9.25 15.5H14.75C15.1642 15.5 15.5 15.1642 15.5 14.75C15.5 14.3358 15.1642 14 14.75 14H9.25ZM6 5C6 3.34315 7.34315 2 9 2H15C16.6569 2 18 3.34315 18 5V19C18 20.6569 16.6569 22 15 22H9C7.34315 22 6 20.6569 6 19V5ZM9 3.5C8.17157 3.5 7.5 4.17157 7.5 5V19C7.5 19.8284 8.17157 20.5 9 20.5H15C15.8284 20.5 16.5 19.8284 16.5 19V5C16.5 4.17157 15.8284 3.5 15 3.5H9Z</StreamGeometry>
<StreamGeometry x:Key="manual_control">F1 M3.88411 4.01327C3.74935 3.85155 3.52773 3.79156 3.32979 3.86322C3.13185 3.93489 3 4.12285 3 4.33336L3 8.66667C3 8.94287 3.22386 9.16667 3.5 9.16667C3.77614 9.16667 4 8.94287 4 8.66667L4 5.7144L5.61587 7.65347C5.71087 7.76747 5.8516 7.83333 6 7.83333C6.1484 7.83333 6.28913 7.76747 6.38413 7.65347L8 5.7144L8 8.66667C8 8.94287 8.22387 9.16667 8.5 9.16667C8.77613 9.16667 9 8.94287 9 8.66667L9 4.33336C9 4.12285 8.86813 3.93489 8.6702 3.86322C8.47227 3.79156 8.25067 3.85155 8.11587 4.01327L6 6.55233L3.88411 4.01327ZM2.16667 0.5C0.970047 0.5 0 1.47005 0 2.66667L0 10.3333C0 11.5299 0.970047 12.5 2.16667 12.5L9.83333 12.5C11.0299 12.5 12 11.5299 12 10.3333L12 2.66667C12 1.47005 11.0299 0.5 9.83333 0.5L2.16667 0.5ZM1 2.66667C1 2.02233 1.52233 1.5 2.16667 1.5L9.83333 1.5C10.4777 1.5 11 2.02233 11 2.66667L11 10.3333C11 10.9777 10.4777 11.5 9.83333 11.5L2.16667 11.5C1.52233 11.5 1 10.9777 1 10.3333L1 2.66667Z</StreamGeometry>
<StreamGeometry x:Key="automatic_control">M3.25 0C1.46 0 0 1.46 0 3.25V14.75C0 16.54 1.46 18 3.25 18H14.75C16.54 18 18 16.54 18 14.75V3.25C18 1.46 16.54 0 14.75 0H3.25ZM1.5 3.25C1.5 2.28 2.28 1.5 3.25 1.5H14.75C15.72 1.5 16.5 2.28 16.5 3.25V14.75C16.5 15.72 15.72 16.5 14.75 16.5H3.25C2.28 16.5 1.5 15.72 1.5 14.75V3.25Z M13.1799 11.92L9.67995 4.67003C9.42995 4.15003 8.57995 4.15003 8.32995 4.67003L4.82995 11.92C4.64995 12.29 4.80995 12.74 5.17995 12.92C5.55995 13.1 5.99995 12.94 6.17995 12.57L6.81995 11.24H11.1899L11.8299 12.57C11.9599 12.84 12.2299 12.99 12.5099 12.99C12.6199 12.99 12.7299 12.97 12.8399 12.92C13.2099 12.74 13.3699 12.29 13.1899 11.92H13.1799ZM7.53995 9.75003L8.99995 6.73003L10.4599 9.75003H7.53995Z</StreamGeometry>
<StreamGeometry x:Key="rocket_bolt">M 19.18 2.33 c -0.27 -0.87 -0.95 -1.55 -1.82 -1.82 l -0.67 -0.21 c -2.41 -0.75 -5.03 -0.1 -6.81 1.68 c -1.81 1.81 -3.61 3.62 -5.42 5.42 c -0.69 0.69 -0.69 1.8 0 2.49 l 0.5 0.5 l -1.4 0.8 c -0.36 0.21 -0.49 0.67 -0.28 1.03 c 0.03 0.06 0.07 0.11 0.12 0.16 l 3.9 3.91 c 0.29 0.29 0.77 0.29 1.07 0 c 0.05 -0.05 0.09 -0.1 0.12 -0.16 l 0.8 -1.4 l 0.5 0.5 c 0.69 0.69 1.8 0.69 2.49 0 c 0 0 0 0 0 0 c 1.81 -1.81 3.61 -3.62 5.42 -5.42 c 1.78 -1.78 2.43 -4.4 1.68 -6.81 l -0.2 -0.67 Z M 16.91 1.95 c 0.4 0.12 0.71 0.43 0.83 0.83 l 0.21 0.67 c 0.58 1.87 0.08 3.91 -1.31 5.3 l -5.42 5.42 c -0.1 0.1 -0.26 0.1 -0.35 0 l -5.33 -5.33 c -0.1 -0.1 -0.1 -0.26 0 -0.35 c 0 0 0 0 0 0 l 5.42 -5.42 c 1.38 -1.39 3.42 -1.89 5.29 -1.31 l 0.66 0.21 Z M 8.19 13.63 l -0.52 0.9 l -2.51 -2.51 l 0.9 -0.51 l 2.13 2.13 Z M 4.28 16.47 c 0.28 -0.31 0.26 -0.78 -0.04 -1.07 c -0.29 -0.27 -0.73 -0.27 -1.02 0 l -2.49 2.49 c -0.28 0.31 -0.26 0.78 0.04 1.07 c 0.29 0.27 0.73 0.27 1.02 0 l 2.49 -2.49 Z M 2.33 13.45 c 0.29 0.29 0.29 0.77 0 1.07 l -1.07 1.07 c -0.31 0.28 -0.78 0.26 -1.07 -0.04 c -0.27 -0.29 -0.27 -0.73 0 -1.02 l 1.07 -1.07 c 0.29 -0.29 0.77 -0.29 1.07 0 Z M 6.24 18.43 c 0.31 -0.28 0.33 -0.76 0.04 -1.07 c -0.28 -0.31 -0.76 -0.33 -1.07 -0.04 c -0.02 0.01 -0.03 0.03 -0.04 0.04 l -1.06 1.06 c -0.31 0.28 -0.33 0.76 -0.04 1.07 c 0.28 0.31 0.76 0.33 1.07 0.04 c 0.02 -0.01 0.03 -0.03 0.04 -0.04 l 1.06 -1.06 Z M 14.38 7.1 l -2.63 4.03 c -0.09 0.15 -0.26 0.24 -0.43 0.24 c -0.35 0 -0.6 -0.35 -0.49 -0.68 l 0.77 -2.32 h -0.78 c -0.35 0 -0.59 -0.35 -0.47 -0.68 l 1.13 -3 c 0.07 -0.19 0.26 -0.32 0.47 -0.32 h 1.43 c 0.35 0 0.59 0.35 0.47 0.68 l -0.5 1.32 h 0.63 c 0.38 0 0.6 0.41 0.4 0.73 Z</StreamGeometry>
<StreamGeometry x:Key="rocket_confirmed">M 17.28 10.23 C 16.73 10.01 16.13 9.89 15.5 9.88 C 15.45 9.87 15.39 9.87 15.34 9.87 c -2.38 0 -4.4 1.51 -5.16 3.62 c -0.21 0.56 -0.33 1.16 -0.34 1.79 v 0.09 c 0 3.04 2.46 5.5 5.5 5.5 c 3.04 0 5.5 -2.46 5.5 -5.5 c 0 -2.36 -1.48 -4.36 -3.56 -5.14 z m 0.77 3.93 l -3.13 3.13 c -0.09 0.09 -0.22 0.14 -0.35 0.14 c -0.14 0 -0.26 -0.05 -0.36 -0.14 l -1.58 -1.58 c -0.19 -0.2 -0.19 -0.51 0 -0.71 c 0.2 -0.19 0.52 -0.19 0.71 0 l 1.23 1.23 l 2.77 -2.78 c 0.19 -0.19 0.51 -0.19 0.71 0 c 0.19 0.2 0.19 0.52 0 0.71 z m -3.82 -8.7 c -0.98 -0.98 -2.57 -0.98 -3.55 0 c -0.49 0.49 -0.74 1.13 -0.74 1.77 c 0 0.64 0.25 1.29 0.74 1.78 c 0.37 0.37 0.82 0.6 1.3 0.69 c 0.72 -0.44 1.53 -0.73 2.4 -0.86 c 0.83 -0.99 0.78 -2.45 -0.15 -3.38 z m -1.06 2.49 c -0.4 0.39 -1.03 0.39 -1.42 0 c -0.4 -0.4 -0.4 -1.03 0 -1.43 c 0.39 -0.39 1.02 -0.39 1.42 0 v 0 c 0.39 0.4 0.39 1.03 0 1.43 z m 1.06 -2.49 c -0.98 -0.98 -2.57 -0.98 -3.55 0 c -0.49 0.49 -0.74 1.13 -0.74 1.77 c 0 0.64 0.25 1.29 0.74 1.78 c 0.37 0.37 0.82 0.6 1.3 0.69 c 0.72 -0.44 1.53 -0.73 2.4 -0.86 c 0.83 -0.99 0.78 -2.45 -0.15 -3.38 z m -1.06 2.49 c -0.4 0.39 -1.03 0.39 -1.42 0 c -0.4 -0.4 -0.4 -1.03 0 -1.43 c 0.39 -0.39 1.02 -0.39 1.42 0 v 0 c 0.39 0.4 0.39 1.03 0 1.43 z M 19.38 3 L 19.17 2.34 C 18.9 1.47 18.22 0.79 17.35 0.52 L 16.69 0.31 C 14.28 -0.44 11.66 0.21 9.88 1.99 l -1 1 C 7.48 1.94 5.52 2.08 4.29 3.32 L 3.04 4.57 c -0.29 0.29 -0.29 0.77 0 1.06 l 1.6 1.6 l -0.18 0.18 c -0.69 0.69 -0.69 1.8 0 2.49 l 0.5 0.5 l -1.41 0.8 c -0.36 0.21 -0.48 0.67 -0.28 1.03 c 0.04 0.06 0.08 0.11 0.13 0.16 l 3.9 3.91 c 0.29 0.29 0.77 0.29 1.07 0 c 0.04 -0.05 0.08 -0.1 0.12 -0.16 l 0.26 -0.46 c -0.01 -0.1 -0.01 -0.2 -0.01 -0.31 c 0 -0.97 0.21 -1.89 0.6 -2.72 L 5.52 8.83 C 5.43 8.74 5.43 8.58 5.52 8.48 l 5.43 -5.42 c 1.38 -1.39 3.42 -1.89 5.29 -1.31 l 0.67 0.21 c 0.39 0.12 0.7 0.43 0.82 0.82 l 0.21 0.67 c 0.58 1.87 0.08 3.91 -1.31 5.3 l -0.12 0.13 c 0.56 0.09 1.09 0.26 1.58 0.5 C 19.57 7.62 20.06 5.22 19.38 3 Z M 6.06 11.5 L 8.19 13.63 L 7.67 14.53 L 5.16 12.02 Z M 5.7 6.17 L 4.64 5.1 L 5.35 4.39 C 6 3.74 7.01 3.61 7.8 4.08 Z m 8.53 -0.71 c -0.98 -0.98 -2.57 -0.98 -3.55 0 c -0.49 0.49 -0.74 1.13 -0.74 1.77 c 0 0.64 0.25 1.29 0.74 1.78 c 0.37 0.37 0.82 0.6 1.3 0.69 c 0.72 -0.44 1.53 -0.73 2.4 -0.86 c 0.83 -0.99 0.78 -2.45 -0.15 -3.38 z m -1.06 2.49 c -0.4 0.39 -1.03 0.39 -1.42 0 c -0.4 -0.4 -0.4 -1.03 0 -1.43 c 0.39 -0.39 1.02 -0.39 1.42 0 v 0 c 0.39 0.4 0.39 1.03 0 1.43 z m 1.06 -2.49 c -0.98 -0.98 -2.57 -0.98 -3.55 0 c -0.49 0.49 -0.74 1.13 -0.74 1.77 c 0 0.64 0.25 1.29 0.74 1.78 c 0.37 0.37 0.82 0.6 1.3 0.69 c 0.72 -0.44 1.53 -0.73 2.4 -0.86 c 0.83 -0.99 0.78 -2.45 -0.15 -3.38 z m -1.06 2.49 c -0.4 0.39 -1.03 0.39 -1.42 0 c -0.4 -0.4 -0.4 -1.03 0 -1.43 c 0.39 -0.39 1.02 -0.39 1.42 0 v 0 c 0.39 0.4 0.39 1.03 0 1.43 z M 4.24 15.41 C 3.95 15.14 3.5 15.14 3.22 15.41 L 0.73 17.9 c -0.28 0.3 -0.26 0.78 0.04 1.06 c 0.29 0.27 0.74 0.27 1.02 0 L 4.28 16.48 C 4.56 16.17 4.54 15.69 4.24 15.41 Z M 2.33 13.46 c -0.3 -0.3 -0.77 -0.3 -1.07 0 L 0.2 14.52 c -0.27 0.29 -0.27 0.74 0 1.02 c 0.28 0.31 0.76 0.33 1.06 0.05 l 1.07 -1.07 c 0.29 -0.29 0.29 -0.77 0 -1.06 z m 3.95 3.91 C 6 17.06 5.52 17.04 5.21 17.32 C 5.2 17.34 5.18 17.35 5.17 17.37 l -1.06 1.06 c -0.31 0.28 -0.33 0.76 -0.05 1.06 c 0.29 0.31 0.76 0.33 1.07 0.05 c 0.01 -0.02 0.03 -0.03 0.04 -0.05 l 1.06 -1.06 c 0.31 -0.28 0.33 -0.76 0.05 -1.06 z</StreamGeometry>

Expand Down
Loading

0 comments on commit 81b995e

Please sign in to comment.