Update User Profile Stuff + Misc.

This commit is contained in:
_Neo_ 2025-10-15 18:59:13 +03:00
parent 2434c55266
commit 9f2ab7aa8f
7 changed files with 322 additions and 316 deletions

View file

@ -16,14 +16,11 @@
<Design.DataContext>
<viewModels:ProfileSelectorDialogViewModel />
</Design.DataContext>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
<Grid Margin="10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
<Border
CornerRadius="5"
CornerRadius="6"
BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
BorderThickness="1">
<ListBox
MaxHeight="300"
HorizontalAlignment="Stretch"
@ -31,7 +28,6 @@
Background="Transparent"
ItemsSource="{Binding Profiles}"
SelectionChanged="ProfilesList_SelectionChanged">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel
@ -40,17 +36,15 @@
Orientation="Horizontal" />
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<ListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="Margin" Value="5 5 0 5" />
<Setter Property="Margin" Value="5,0,0,0" />
<Setter Property="CornerRadius" Value="5" />
</Style>
<Style Selector="Rectangle#SelectionIndicator">
<Setter Property="Opacity" Value="0" />
</Style>
</ListBox.Styles>
<ListBox.DataTemplates>
<DataTemplate
DataType="models:UserProfile">
@ -58,10 +52,11 @@
PointerEntered="Grid_PointerEntered"
PointerExited="Grid_OnPointerExited">
<Border
Margin="5"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
ClipToBounds="True"
CornerRadius="5"
CornerRadius="6"
Background="{Binding BackgroundColor}">
<StackPanel
HorizontalAlignment="Stretch"
@ -72,15 +67,20 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
Source="{Binding Image, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
<TextBlock
<Panel
Height="40"
HorizontalAlignment="Stretch"
MaxWidth="90"
Text="{Binding Name}"
TextAlignment="Center"
TextWrapping="Wrap"
TextTrimming="CharacterEllipsis"
MaxLines="2"
Margin="5" />
VerticalAlignment="Stretch">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock
Text="{Binding Name}"
MaxWidth="75"
TextAlignment="Center"
TextTrimming="CharacterEllipsis"
TextWrapping="Wrap"
MaxLines="2" />
</StackPanel>
</Panel>
</StackPanel>
</Border>
</Grid>
@ -88,8 +88,8 @@
<DataTemplate
DataType="viewModels:BaseModel">
<Panel
Height="118"
Width="96">
Height="120"
Width="100">
<Panel.Styles>
<Style Selector="Panel">
<Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />

View file

@ -14,7 +14,7 @@
mc:Ignorable="d"
Focusable="True"
x:DataType="models:TempProfile">
<Grid Margin="0" ColumnDefinitions="Auto,*" RowDefinitions="*,Auto">
<Grid Margin="10" ColumnDefinitions="Auto,*" RowDefinitions="*,Auto">
<StackPanel
Grid.Row="0"
Grid.Column="0"
@ -48,9 +48,9 @@
BorderThickness="1">
<Panel>
<ui:SymbolIcon
FontSize="60"
Width="96"
Height="96"
FontSize="70"
Width="115"
Height="115"
Margin="0"
Foreground="{DynamicResource AppListHoverBackgroundColor}"
HorizontalAlignment="Stretch"
@ -58,8 +58,8 @@
Symbol="Camera" />
<Image
Name="ProfileImage"
Width="96"
Height="96"
Width="115"
Height="115"
Margin="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
@ -73,7 +73,7 @@
Grid.ColumnSpan="2"
HorizontalAlignment="Left"
Orientation="Horizontal"
Margin="0 24 0 0"
Margin="0 30 0 0"
Spacing="10">
<Button
Width="50"
@ -88,7 +88,7 @@
Grid.ColumnSpan="2"
HorizontalAlignment="Right"
Orientation="Horizontal"
Margin="0 24 0 0"
Margin="0 30 0 0"
Spacing="10">
<Button
Name="DeleteButton"

View file

@ -18,7 +18,7 @@
<viewModels:UserFirmwareAvatarSelectorViewModel />
</Design.DataContext>
<Grid
Margin="0"
Margin="10"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" RowDefinitions="Auto,*,Auto,Auto">
<ListBox
@ -62,7 +62,7 @@
Grid.Row="3"
Orientation="Horizontal"
Spacing="10"
Margin="0 24 0 0"
Margin="0 30 0 0"
HorizontalAlignment="Left">
<Button
Width="50"
@ -76,7 +76,7 @@
Grid.Row="3"
Orientation="Horizontal"
Spacing="10"
Margin="0 24 0 0"
Margin="0 30 0 0"
HorizontalAlignment="Right">
<ui:ColorPickerButton
FlyoutPlacement="Top"

View file

@ -15,7 +15,7 @@
<Design.DataContext>
<viewModles:UserProfileImageSelectorViewModel />
</Design.DataContext>
<Grid
<Grid Margin="10"
HorizontalAlignment="Stretch"
VerticalAlignment="Center" RowDefinitions="Auto,70,Auto">
<TextBlock

View file

@ -19,7 +19,7 @@
<Design.DataContext>
<viewModels:UserSaveManagerViewModel />
</Design.DataContext>
<Grid RowDefinitions="Auto,*,Auto">
<Grid Margin="10" RowDefinitions="Auto,*,Auto">
<Grid
Grid.Row="0"
HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*">
@ -70,13 +70,14 @@
<Grid
Grid.Column="1"
HorizontalAlignment="Stretch"
Margin="10,0, 0, 0" ColumnDefinitions="Auto,*">
<Label Content="{ext:Locale Search}" VerticalAlignment="Center" />
Margin="10,0,0,0" ColumnDefinitions="Auto,*">
<TextBox
Margin="5,0,0,0"
Grid.Column="1"
HorizontalAlignment="Stretch"
Text="{Binding Search}" />
Text="{Binding Search}"
Watermark="{ext:Locale Search}" />
</Grid>
</Grid>
<Border

View file

@ -12,20 +12,19 @@
d:DesignHeight="450"
MinWidth="500"
d:DesignWidth="800"
Margin="0"
Padding="0"
mc:Ignorable="d"
Focusable="True"
x:DataType="viewModels:UserProfileViewModel">
<Design.DataContext>
<viewModels:UserProfileViewModel />
</Design.DataContext>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
<Border
CornerRadius="5"
BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
BorderThickness="1">
<Grid Margin="10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
<StackPanel>
<ListBox
MaxHeight="300"
HorizontalAlignment="Stretch"
HorizontalAlignment="Center"
VerticalAlignment="Center"
SelectionChanged="ProfilesList_SelectionChanged"
Background="Transparent"
@ -40,7 +39,7 @@
</ListBox.ItemsPanel>
<ListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="Margin" Value="5 5 0 5" />
<Setter Property="Margin" Value="5 0 0 0" />
<Setter Property="CornerRadius" Value="5" />
</Style>
<Style Selector="Rectangle#SelectionIndicator">
@ -54,10 +53,11 @@
PointerEntered="Grid_PointerEntered"
PointerExited="Grid_OnPointerExited">
<Border
Margin="5"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
ClipToBounds="True"
CornerRadius="5"
CornerRadius="6"
Background="{Binding BackgroundColor}">
<StackPanel
HorizontalAlignment="Stretch"
@ -68,15 +68,20 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
Source="{Binding Image, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
<TextBlock
<Panel
Height="40"
HorizontalAlignment="Stretch"
MaxWidth="90"
Text="{Binding Name}"
TextAlignment="Center"
TextWrapping="Wrap"
TextTrimming="CharacterEllipsis"
MaxLines="2"
Margin="5" />
VerticalAlignment="Stretch">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock
Text="{Binding Name}"
MaxWidth="75"
TextAlignment="Center"
TextTrimming="CharacterEllipsis"
TextWrapping="Wrap"
MaxLines="2" />
</StackPanel>
</Panel>
</StackPanel>
</Border>
<Border
@ -104,8 +109,8 @@
<DataTemplate
DataType="viewModels:BaseModel">
<Panel
Height="118"
Width="96">
Height="120"
Width="100">
<Button
MinWidth="50"
MinHeight="50"
@ -128,10 +133,10 @@
</DataTemplate>
</ListBox.DataTemplates>
</ListBox>
</Border>
</StackPanel>
<StackPanel
Grid.Row="1"
Margin="0 24 0 0"
Margin="10,30,0,0"
HorizontalAlignment="Left"
Orientation="Horizontal"
Spacing="10">
@ -144,7 +149,7 @@
</StackPanel>
<StackPanel
Grid.Row="1"
Margin="0 24 0 0"
Margin="0,30,0,0"
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button