NebulaTeam/NebulaLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- tweak: prettify

Browse Source
This commit is contained in:
Cinka
2025-01-23 20:43:52 +03:00
parent 019dd13d8e
commit 1374772d46
7 changed files with 124 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Nebula.Launcher/Views/Pages/AccountInfoView.axaml
View File

@@ -7,8 +7,8 @@
xmlns="https://github.com/avaloniaui"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages">
xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Design.DataContext>
<pages:AccountInfoViewModel />
</Design.DataContext>
@@ -18,6 +18,7 @@
RowDefinitions="*">
<StackPanel Grid.Column="1" Grid.Row="0">
<Border
BoxShadow="0 -1 15 0 #121212"
CornerRadius="10,10,0,0"
Margin="5,5,5,0"
Padding="5">
@@ -31,8 +32,9 @@
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type pages:AuthLoginPasswordModel}">
<Border
BoxShadow="0 1 15 0 #121212"
CornerRadius="0,10,0,10"
Margin="5,5,5,0"
Margin="5,5,5,5"
VerticalAlignment="Center">
<Panel>
<StackPanel Margin="10,5,5,5" Orientation="Horizontal">
@@ -51,7 +53,6 @@
</Label>
</Button>
<Button
BorderThickness="2,0,0,0"
Command="{Binding OnDelete}"
CornerRadius="0,10,0,0"
Padding="5">
@@ -73,6 +74,7 @@
Grid.ColumnSpan="{Binding AuthViewSpan}"
Grid.Row="0">
<Border
BoxShadow="0 0 15 0 #121212"
CornerRadius="10"
Margin="5"
Padding="15">
@@ -81,7 +83,7 @@
<Svg
Height="100"
Margin="0,0,0,20"
Path="/Assets/svg/user.svg"/>
Path="/Assets/svg/user.svg" />
<StackPanel HorizontalAlignment="Center">
<StackPanel Orientation="Horizontal">
<Label VerticalAlignment="Center">
@@ -107,7 +109,7 @@
</StackPanel>
<Border
Background="#333333"
BoxShadow="0 0 5 0 #121212"
CornerRadius="10"
IsVisible="{Binding AuthUrlConfigExpand}">
<ScrollViewer Height="80">
@@ -127,12 +129,14 @@
</ListBox>
</ScrollViewer>
</Border>
<Button
Command="{Binding DoAuth}"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Center">
<Label>Auth</Label>
</Button>
<Border BoxShadow="0 0 5 0 #121212">
<Button
Command="{Binding DoAuth}"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Center">
<Label>Auth</Label>
</Button>
</Border>
<Button Command="{Binding ExpandAuthViewCommand}" HorizontalAlignment="Right">
<Label>
>
@@ -144,7 +148,7 @@
<Svg
Height="100"
Margin="0,0,0,20"
Path="/Assets/svg/user.svg"/>
Path="/Assets/svg/user.svg" />
<Label>
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock>Hello,</TextBlock>
@@ -156,12 +160,16 @@
Margin="5,20,5,5"
Orientation="Horizontal"
Spacing="5">
<Button Command="{Binding Logout}">
<Label>Logout</Label>
</Button>
<Button Command="{Binding SaveProfileCommand}">
<Label>Save profile</Label>
</Button>
<Border BoxShadow="0 0 5 0 #121212">
<Button Command="{Binding Logout}">
<Label>Logout</Label>
</Button>
</Border>
<Border BoxShadow="0 0 5 0 #121212">
<Button Command="{Binding SaveProfileCommand}">
<Label>Save profile</Label>
</Button>
</Border>
</StackPanel>
</StackPanel>
</Panel>

34
Nebula.Launcher/Views/Pages/ServerListView.axaml
View File

@@ -7,8 +7,8 @@
xmlns="https://github.com/avaloniaui"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages">
xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Design.DataContext>
<pages:ServerListViewModel />
@@ -18,18 +18,24 @@
ColumnDefinitions="*"
Margin="0"
RowDefinitions="*,40">
<ScrollViewer Margin="0,0,0,10" Padding="0,0,10,0" Grid.RowSpan="2">
<ItemsControl
ItemsSource="{Binding ServerInfos}"
Padding="0">
</ItemsControl>
<ScrollViewer
Grid.RowSpan="2"
Margin="0,0,0,10"
Padding="0,0,10,0">
<ItemsControl ItemsSource="{Binding ServerInfos}" Padding="0" />
</ScrollViewer>
<Border Grid.Row="1" Background="{StaticResource DefaultBackground}" BorderThickness="0">
</Border>
<Grid Grid.Row="1" ColumnDefinitions="*,40,40" RowDefinitions="*" Margin="5,0,0,0">
<Border
Background="{StaticResource DefaultBackground}"
BoxShadow="0 2 25 0 #121212"
CornerRadius="0"
Grid.Row="1" />
<Grid
ColumnDefinitions="*,40,40"
Grid.Row="1"
Margin="5,0,0,0"
RowDefinitions="*">
<TextBox
Margin="0"
Text="{Binding SearchText}"
@@ -40,13 +46,13 @@
Command="{Binding FilterRequired}"
Grid.Column="1"
Padding="10">
<Svg Path="/Assets/svg/filter.svg"></Svg>
<Svg Path="/Assets/svg/filter.svg" />
</Button>
<Button
Command="{Binding UpdateRequired}"
Grid.Column="2"
Padding="10">
<Svg Path="/Assets/svg/refresh.svg"></Svg>
<Svg Path="/Assets/svg/refresh.svg" />
</Button>
</Grid>
</Grid>