Skip to content

Commit 97f4d27

Browse files
mohnjilesmohnjiles
authored
Merge pull request LykosAI#746 from ionite34/update-icons-and-usings
IsFilled -> IconVariant.Filled & removed unused usings
2 parents aca603b + aab73d8 commit 97f4d27

53 files changed

Lines changed: 90 additions & 137 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎StabilityMatrix.Avalonia/Animations/BetterSlideNavigationTransition.cs‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
using System;
22
using System.Threading;
3-
using System.Threading.Tasks;
43
using Avalonia;
54
using Avalonia.Animation;
65
using Avalonia.Animation.Easings;
76
using Avalonia.Media;
87
using Avalonia.Styling;
98
using FluentAvalonia.UI.Media.Animation;
10-
using Projektanker.Icons.Avalonia;
119

1210
namespace StabilityMatrix.Avalonia.Animations;
1311

@@ -18,8 +16,7 @@ public class BetterSlideNavigationTransition : BaseTransitionInfo
1816
/// <summary>
1917
/// Gets or sets the type of animation effect to play during the slide transition.
2018
/// </summary>
21-
public SlideNavigationTransitionEffect Effect { get; set; } =
22-
SlideNavigationTransitionEffect.FromRight;
19+
public SlideNavigationTransitionEffect Effect { get; set; } = SlideNavigationTransitionEffect.FromRight;
2320

2421
/// <summary>
2522
/// Gets or sets the HorizontalOffset used when animating from the Left or Right
@@ -68,29 +65,21 @@ public override async void RunAnimation(Animatable ctrl, CancellationToken cance
6865
Setters =
6966
{
7067
new Setter(
71-
isVertical
72-
? TranslateTransform.YProperty
73-
: TranslateTransform.XProperty,
68+
isVertical ? TranslateTransform.YProperty : TranslateTransform.XProperty,
7469
length
7570
),
7671
new Setter(Visual.OpacityProperty, 0d)
7772
},
7873
Cue = new Cue(0d)
7974
},
80-
new KeyFrame
81-
{
82-
Setters = { new Setter(Visual.OpacityProperty, 1d) },
83-
Cue = new Cue(0.05d)
84-
},
75+
new KeyFrame { Setters = { new Setter(Visual.OpacityProperty, 1d) }, Cue = new Cue(0.05d) },
8576
new KeyFrame
8677
{
8778
Setters =
8879
{
8980
new Setter(Visual.OpacityProperty, 1d),
9081
new Setter(
91-
isVertical
92-
? TranslateTransform.YProperty
93-
: TranslateTransform.XProperty,
82+
isVertical ? TranslateTransform.YProperty : TranslateTransform.XProperty,
9483
0.0
9584
)
9685
},

‎StabilityMatrix.Avalonia/Controls/HyperlinkIconButton.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Avalonia.Controls;
77
using Avalonia.Controls.Presenters;
88
using Avalonia.Logging;
9-
using FluentAvalonia.UI.Controls;
109
using StabilityMatrix.Core.Processes;
1110
using Symbol = FluentIcons.Common.Symbol;
1211

‎StabilityMatrix.Avalonia/Controls/Inference/ControlNetCard.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<fluentIcons:SymbolIcon
7272
VerticalAlignment="Center"
7373
FontSize="15"
74-
IsFilled="True"
74+
IconVariant="Filled"
7575
Symbol="Play" />
7676
</Button>
7777
</sg:SpacedGrid>
@@ -106,7 +106,7 @@
106106
VerticalAlignment="Center"
107107
FontSize="18"
108108
Foreground="{DynamicResource ThemeGreyColor}"
109-
IsFilled="True"
109+
IconVariant="Filled"
110110
Symbol="CloudArrowDown" />
111111
</Button>
112112
</Grid>

‎StabilityMatrix.Avalonia/Controls/Inference/ModelCard.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
<Styles.Resources>
2525
<fluent:SymbolIconSource
2626
x:Key="IconCube"
27-
IsFilled="False"
27+
IconVariant="Filled"
2828
Symbol="Cube" />
2929
<fluent:SymbolIconSource
3030
x:Key="IconQuestionCircle"
31-
IsFilled="True"
31+
IconVariant="Filled"
3232
Symbol="QuestionCircle" />
3333
<fluent:SymbolIconSource
3434
x:Key="IconTableCellEdit"
35-
IsFilled="True"
35+
IconVariant="Filled"
3636
Symbol="TableCellEdit" />
3737
</Styles.Resources>
3838

‎StabilityMatrix.Avalonia/Controls/Inference/PromptExpansionCard.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
VerticalAlignment="Center"
6868
FontSize="18"
6969
Foreground="{DynamicResource ThemeGreyColor}"
70-
IsFilled="True"
70+
IconVariant="Filled"
7171
Symbol="CloudArrowDown" />
7272
</Button>
7373
</Grid>

‎StabilityMatrix.Avalonia/Controls/Inference/SelectImageCard.axaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181
<fluentIcons:SymbolIcon
8282
FontSize="28"
83-
IsFilled="True"
83+
IconVariant="Filled"
8484
Symbol="DocumentQuestionMark" />
8585
<TextBlock
8686
Grid.Row="1"
@@ -138,7 +138,7 @@
138138
<fluentIcons:SymbolIcon
139139
Effect="{StaticResource ImageDropShadowEffect}"
140140
FontSize="28"
141-
IsFilled="True"
141+
IconVariant="Filled"
142142
Symbol="Eye" />
143143
</ToggleButton>
144144
</Border>
@@ -174,7 +174,7 @@
174174
<fluentIcons:SymbolIcon
175175
Effect="{StaticResource ImageDropShadowEffect}"
176176
FontSize="28"
177-
IsFilled="True"
177+
IconVariant="Filled"
178178
Symbol="Layer" />
179179
</Button>
180180
</Border>
@@ -204,7 +204,7 @@
204204
<fluentIcons:SymbolIcon
205205
Effect="{StaticResource ImageDropShadowEffect}"
206206
FontSize="28"
207-
IsFilled="True"
207+
IconVariant="Filled"
208208
Symbol="ImageArrowCounterclockwise" />
209209
</Button>
210210
</Border>
@@ -228,7 +228,7 @@
228228

229229
<fluentIcons:SymbolIcon
230230
FontSize="28"
231-
IsFilled="True"
231+
IconVariant="Filled"
232232
Symbol="ImageCopy" />
233233
<TextBlock
234234
Grid.Row="1"

‎StabilityMatrix.Avalonia/Controls/Inference/StackEditableCard.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
VerticalAlignment="Bottom"
4848
CornerRadius="4"
4949
Padding="12,4" >
50-
<fluentIcons:SymbolIcon Symbol="Add" IsFilled="True" FontSize="14" />
50+
<fluentIcons:SymbolIcon Symbol="Add" IconVariant="Filled" FontSize="14" />
5151
</Button>
5252
</sg:SpacedGrid>
5353

‎StabilityMatrix.Avalonia/Controls/Inference/StackEditableCard.axaml.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
using System;
2-
using System.Diagnostics;
3-
using System.Diagnostics.CodeAnalysis;
4-
using System.Linq;
5-
using System.Text.RegularExpressions;
62
using Avalonia;
73
using Avalonia.Controls;
84
using Avalonia.Controls.Metadata;
95
using Avalonia.Controls.Primitives;
106
using Avalonia.Interactivity;
117
using Avalonia.LogicalTree;
12-
using DynamicData.Binding;
138
using FluentAvalonia.UI.Controls;
14-
using Nito.Disposables.Internals;
159
using StabilityMatrix.Avalonia.ViewModels.Inference;
1610
using StabilityMatrix.Core.Attributes;
1711
using StabilityMatrix.Core.Extensions;
@@ -26,8 +20,10 @@ public class StackEditableCard : TemplatedControl
2620
private ListBox? listBoxPart;
2721

2822
// ReSharper disable once MemberCanBePrivate.Global
29-
public static readonly StyledProperty<bool> IsListBoxEditEnabledProperty =
30-
AvaloniaProperty.Register<StackEditableCard, bool>("IsListBoxEditEnabled");
23+
public static readonly StyledProperty<bool> IsListBoxEditEnabledProperty = AvaloniaProperty.Register<
24+
StackEditableCard,
25+
bool
26+
>("IsListBoxEditEnabled");
3127

3228
public bool IsListBoxEditEnabled
3329
{

‎StabilityMatrix.Avalonia/Controls/Inference/UpscalerCard.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
VerticalAlignment="Center"
6666
FontSize="18"
6767
Foreground="{DynamicResource ThemeGreyColor}"
68-
IsFilled="True"
68+
IconVariant="Filled"
6969
Symbol="CloudArrowDown" />
7070
</Button>
7171
</Grid>

‎StabilityMatrix.Avalonia/Controls/SelectableImageCard/SelectableImageButton.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using AsyncImageLoader;
32
using Avalonia;
43
using Avalonia.Controls;
54
using Avalonia.Controls.Primitives;

0 commit comments

Comments
 (0)