DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +00:00
Code Issues Releases Wiki Activity

Submission wizard - Style tweaks to

Browse Source 
Profile details - Started work on side pane
This commit is contained in:
Robert committed 2023-08-22 22:20:56 +02:00
1 parent a51ab70298
commit 2a34381926
9 files changed
+90 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/LoginStepView.axaml
+3 -3
View File
@@ -6,7 +6,7 @@
mc:Ignorable="d" d:DesignWidth="970" d:DesignHeight="625"
x:Class="Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.LoginStepView"
x:DataType="steps:LoginStepViewModel">
<StackPanel>
<StackPanel Margin="0 50 0 0">
<StackPanel.Styles>
<Styles>
<Style Selector="TextBlock">
@@ -22,10 +22,10 @@
<Run>Creating an account is free and we'll not bother you with a newsletter or crap like that.</Run>
</TextBlock>
<Lottie Path="/Assets/Animations/login-pending.json" RepeatCount="-1" Width="250" Height="250"></Lottie>
<Lottie Path="/Assets/Animations/login-pending.json" RepeatCount="1" Width="350" Height="350"></Lottie>
<TextBlock>
<Run>Click continue to (create an account) and log in.</Run>
<Run>Click Log In below to (create an account) and log in.</Run>
<LineBreak/>
<Run>You'll also be able to log in with Google or Discord.</Run>
</TextBlock>
src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepView.axaml
+14 -13
View File
@@ -39,18 +39,9 @@
<Grid ColumnDefinitions="103,*">
<StackPanel Grid.Column="0" Width="95">
<DockPanel>
<Button DockPanel.Dock="Right"
VerticalAlignment="Bottom"
Classes="icon-button"
Command="{CompiledBinding ClearIcon}"
IsVisible="{CompiledBinding IconBitmap, Converter={x:Static ObjectConverters.IsNotNull}}"
Width="22"
Height="22">
<avalonia:MaterialIcon Kind="Trash"></avalonia:MaterialIcon>
</Button>
<Label DockPanel.Dock="Left" Target="Name" Margin="0 15 0 0">Icon</Label>
</DockPanel>
<Label Target="Name" Margin="0 15 0 0">Icon</Label>
<Button Width="95"
Height="95"
@@ -68,7 +59,17 @@
VerticalAlignment="Center"
Width="95"
Height="95">
<Image Source="{CompiledBinding IconBitmap}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"></Image>
<Panel>
<Image Source="{CompiledBinding IconBitmap}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"></Image>
<Button Classes="icon-button image-picker"
VerticalAlignment="Stretch"
HorizontalAlignment="Stretch"
Cursor="Hand"
Command="{CompiledBinding SelectIcon}"
ToolTip.Tip="Click to browse">
</Button>
</Panel>
</Border>
<TextBlock Foreground="{DynamicResource SystemFillColorCriticalBrush}" Margin="2 0"
IsVisible="{CompiledBinding !IconValid}"
src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepViewModel.cs
+2 -4
View File
@@ -40,7 +40,6 @@ public class SpecificationsStepViewModel : SubmissionViewModel
GoBack = ReactiveCommand.Create(ExecuteGoBack);
Continue = ReactiveCommand.Create(ExecuteContinue, ValidationContext.Valid);
SelectIcon = ReactiveCommand.CreateFromTask(ExecuteSelectIcon);
ClearIcon = ReactiveCommand.Create(ExecuteClearIcon);
this.WhenActivated(d =>
{
@@ -53,14 +52,13 @@ public class SpecificationsStepViewModel : SubmissionViewModel
ApplyFromState();
this.ClearValidationRules();
Disposable.Create(ExecuteClearIcon).DisposeWith(d);
Disposable.Create(ClearIcon).DisposeWith(d);
});
}
public override ReactiveCommand<Unit, Unit> Continue { get; }
public override ReactiveCommand<Unit, Unit> GoBack { get; }
public ReactiveCommand<Unit, Unit> SelectIcon { get; }
public ReactiveCommand<Unit, Unit> ClearIcon { get; }
public ObservableCollection<CategoryViewModel> Categories { get; } = new();
public ObservableCollection<string> Tags { get; } = new();
@@ -141,7 +139,7 @@ public class SpecificationsStepViewModel : SubmissionViewModel
IconBitmap = BitmapExtensions.LoadAndResize(result[0], 128);
}
private void ExecuteClearIcon()
private void ClearIcon()
{
IconBitmap?.Dispose();
IconBitmap = null;
src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepView.axaml
+1 -1
View File
@@ -7,7 +7,7 @@
mc:Ignorable="d" d:DesignWidth="970" d:DesignHeight="625"
x:Class="Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.ValidateEmailStepView"
x:DataType="steps:ValidateEmailStepViewModel">
<StackPanel >
<StackPanel Margin="0 50 0 0">
<StackPanel.Styles>
<Styles>
<Style Selector="TextBlock">