- add: new tab

.idea/.idea.Nebula/.idea/avalonia.xml

@@ -5,9 +5,13 @@
       <map>
         <entry key="Nebula.Launcher/App.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/ViewModels/Styles1.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Controls/ServerContainerControl.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/MainWindow.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/ServerContainer.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/ServerList.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Tabs/AccountInfoTab.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Tabs/ServerListTab.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
       </map>
     </option>
   </component>

Nebula.Launcher/App.axaml

@@ -19,6 +19,18 @@
         </Style>
         <Style Selector="TextBlock">
             <Setter Property="Foreground" Value="#f7f7ff"/>
+            <Setter Property="FontSize" Value="14"/>
+        </Style>
+        
+        <Style Selector="Button">
+            <Setter Property="Background" Value="#e63462"/>
+            <Setter Property="BorderBrush" Value="#343334"/>
+            <Setter Property="Padding" Value="5"/>
+            <Setter Property="CornerRadius" Value="10"/>
+        </Style>
+        
+        <Style Selector="Button:pressed">
+            <Setter Property="Background" Value="#b82a4e"/>
         </Style>
         
         <Style Selector="Button.ViewSelectButton">
@@ -30,10 +42,5 @@
         <Style Selector="Button.ViewSelectButton:pressed">
             <Setter Property="Background" Value="#e63462"/>
         </Style>
-        
-        <Style Selector="Button">
-            <Setter Property="Background" Value="#e63462"/>
-            <Setter Property="BorderBrush" Value="#343334"/>
-        </Style>
     </Application.Styles>
 </Application>

Nebula.Launcher/Assets/attribution.txt

@@ -1,2 +1,3 @@
 account.png Icon by Icon Desai
 list.png Icon by Vector Stall
+settings.png Icon by Smashicons

Nebula.Launcher/Nebula.Launcher.csproj

@@ -27,4 +27,15 @@
         </PackageReference>
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Compile Update="Views\Controls\ServerContainerControl.axaml.cs">
+        <DependentUpon>ServerContainerControl.axaml</DependentUpon>
+        <SubType>Code</SubType>
+      </Compile>
+      <Compile Update="Views\Tabs\ServerListTab.axaml.cs">
+        <DependentUpon>ServerListTab.axaml</DependentUpon>
+        <SubType>Code</SubType>
+      </Compile>
+    </ItemGroup>
 </Project>

Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml

@@ -0,0 +1,20 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Nebula.Launcher.Views.Controls.PlayerContainerControl">
+    <Border Margin="5,4,5,0"
+            CornerRadius="0,10,0,10" BorderThickness="0,1,1,0" VerticalAlignment="Center">
+        <Panel>
+            <StackPanel Orientation="Horizontal" Margin="5">
+                <TextBlock Margin="0,0,2,0">Name:</TextBlock>
+                <TextBlock>Ni Higgers</TextBlock>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button Padding="5" CornerRadius="0,0,0,10">Select</Button>
+                <Button Padding="5" BorderThickness="2,0,0,0" CornerRadius="0,10,0,0">Delete</Button>
+            </StackPanel>
+        </Panel>
+    </Border>
+</UserControl>

Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml.cs

@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Nebula.Launcher.Views.Controls;
+
+public partial class PlayerContainerControl : UserControl
+{
+    public PlayerContainerControl()
+    {
+        InitializeComponent();
+    }
+}

Nebula.Launcher/Views/Controls/ServerContainerControl.axaml

@@ -4,10 +4,10 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Nebula.Launcher.Views.ServerContainer">
+             x:Class="Nebula.Launcher.Views.Controls.ServerContainerControl">
     <Grid ColumnDefinitions="*,70" RowDefinitions="*,*" Margin="0,5,0,5">
-        <Border Grid.Row="0" Grid.Column="0"
-                Padding="5">
+        <Border Grid.Row="0" Grid.Column="0" BorderThickness="2,0,0,0"
+                Padding="10">
             <TextBlock>Server name</TextBlock>
         </Border>
         <Border Grid.Row="0" Grid.Column="1"
@@ -17,7 +17,7 @@
             <TextBlock HorizontalAlignment="Center">15/15</TextBlock>
         </Border>
                 
-        <Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
+        <Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" BorderThickness="2,0,0,0"
                 Height="50"
                 CornerRadius="0,0,10,10">
             <Border.Background>

Nebula.Launcher/Views/Controls/ServerContainerControl.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace Nebula.Launcher.Views.Controls;
+
+public partial class ServerContainerControl : UserControl
+{
+    public ServerContainerControl()
+    {
+        InitializeComponent();
+    }
+}

Nebula.Launcher/Views/MainWindow.axaml

@@ -3,16 +3,17 @@
         xmlns:vm="using:Nebula.Launcher.ViewModels"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
-        xmlns:views="clr-namespace:Nebula.Launcher.Views"
+        xmlns:tabs="clr-namespace:Nebula.Launcher.Views.Tabs"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="Nebula.Launcher.Views.MainWindow"
-        x:DataType="vm:TestViewModel"
+        x:DataType="vm:TestViewModel" 
+        MinHeight="400" 
+        MinWidth="600"
+        Height="400"
+        Width="800"
         Icon="/Assets/avalonia-logo.ico"
         Title="Nebula.Launcher">
     
-    
-
     <Grid ColumnDefinitions="60,*" RowDefinitions="*,40"  Margin="0">
         <Border Grid.Row="0" Grid.Column="0"
                 BorderThickness="0,0,2,0"
@@ -25,17 +26,18 @@
                 <Button Classes="ViewSelectButton">
                     <Image Source="../Assets/list.png"/>
                 </Button>
+                <Button Classes="ViewSelectButton" Padding="15">
+                    <Image Source="../Assets/settings.png"/>
+                </Button>
             </StackPanel>
         </Border>
         
-        <StackPanel Grid.Column="1" Grid.Row="0">
-            <ScrollViewer 
-                HorizontalScrollBarVisibility="Visible" 
-                VerticalScrollBarVisibility="Disabled"
-                Padding="5">
-                <views:ServerList/>
-            </ScrollViewer>
-        </StackPanel>
+        <ScrollViewer Grid.Column="1" Grid.Row="0" 
+            HorizontalScrollBarVisibility="Visible" 
+            VerticalScrollBarVisibility="Disabled"
+            Padding="5">
+            <tabs:AccountInfoTab/>
+        </ScrollViewer>
         
         <Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
                 BorderThickness="0,2,0,0"
@@ -43,8 +45,8 @@
                 Padding="5" 
                 Margin="0,0,0,0">
             <Panel>
-                <TextBlock HorizontalAlignment="Left" VerticalAlignment="Center">Site: ssilka | Discord: lala</TextBlock>
-                <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center">v1.5</TextBlock>
+                <TextBlock HorizontalAlignment="Left" VerticalAlignment="Center">cinka.ru</TextBlock>
+                <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center">v0.01</TextBlock>
             </Panel>
         </Border>
     </Grid>

Nebula.Launcher/Views/ServerList.axaml

@@ -1,17 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:views="clr-namespace:Nebula.Launcher.Views"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Nebula.Launcher.Views.ServerList">
-    <StackPanel>
-        <views:ServerContainer/>
-        <views:ServerContainer/>
-        <views:ServerContainer/>
-        <views:ServerContainer/>
-        <views:ServerContainer/>
-        <views:ServerContainer/>
-        <views:ServerContainer/>
-    </StackPanel>
-</UserControl>

Nebula.Launcher/Views/ServerList.axaml.cs

@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Nebula.Launcher.Views;
-
-public partial class ServerList : UserControl
-{
-    public ServerList()
-    {
-        InitializeComponent();
-    }
-}

Nebula.Launcher/Views/Tabs/AccountInfoTab.axaml

@@ -0,0 +1,43 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:controls="clr-namespace:Nebula.Launcher.Views.Controls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Nebula.Launcher.Views.Tabs.AccountInfoTab">
+    <Grid ColumnDefinitions="*,1.5*" RowDefinitions="*">
+        <StackPanel Grid.Column="0" Grid.Row="0">
+            <Border
+                Padding="15" Margin="5"
+                CornerRadius="10">
+                <StackPanel HorizontalAlignment="Center">
+                    <Image Source="/Assets/account.png" Height="100" Margin="0,0,0,20"/>
+                    <Grid ColumnDefinitions="120, 100" RowDefinitions="Auto, Auto, Auto">
+                        <TextBlock Grid.Row="0" Grid.Column="0">Login:</TextBlock>
+                        <TextBox Grid.Row="0" Grid.Column="1"></TextBox>
+                        <TextBlock Grid.Row="1" Grid.Column="0">Password:</TextBlock>
+                        <TextBox Grid.Row="1" Grid.Column="1" PasswordChar="#" Text="Sas"></TextBox>
+                        <TextBlock Grid.Row="2" Grid.Column="0">Auth server:</TextBlock>
+                        <TextBox Grid.Row="2" Grid.Column="1"></TextBox>
+                    </Grid>
+                    <StackPanel Orientation="Horizontal" Margin="5" HorizontalAlignment="Center">
+                        <Button>Save profile</Button>
+                    </StackPanel>
+                </StackPanel>
+            </Border>
+        </StackPanel>
+                    
+        <StackPanel Grid.Column="1" Grid.Row="0">
+            <Border Padding="5" Margin="5,5,5,0"
+                    CornerRadius="10,10,0,0">
+                <TextBlock HorizontalAlignment="Center">Profiles:</TextBlock>
+            </Border>
+            <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
+                <StackPanel>
+                    <controls:PlayerContainerControl/>
+                    <controls:PlayerContainerControl/>
+                </StackPanel>
+            </ScrollViewer>
+        </StackPanel>
+    </Grid>
+</UserControl>

Nebula.Launcher/Views/Tabs/AccountInfoTab.axaml.cs

@@ -2,11 +2,11 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Nebula.Launcher.Views;
+namespace Nebula.Launcher.Views.Tabs;
 
-public partial class ServerContainer : UserControl
+public partial class AccountInfoTab : UserControl
 {
-    public ServerContainer()
+    public AccountInfoTab()
     {
         InitializeComponent();
     }

Nebula.Launcher/Views/Tabs/ServerListTab.axaml

@@ -0,0 +1,22 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:controls="clr-namespace:Nebula.Launcher.Views.Controls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Nebula.Launcher.Views.Tabs.ServerListTab">
+    <Grid ColumnDefinitions="*" RowDefinitions="*,40"> 
+        <ScrollViewer>
+            <StackPanel>
+                <controls:ServerContainerControl/>
+                <controls:ServerContainerControl/>
+            </StackPanel>
+        </ScrollViewer>
+        <Border Grid.Row="1" CornerRadius="10" BorderThickness="2,0,0,0">
+            <Grid ColumnDefinitions="*,40" RowDefinitions="*">
+                <TextBlock VerticalAlignment="Center" Margin="10">Search...</TextBlock>
+                <Button Grid.Column="1" Padding="10"><Image Source="/Assets/filter.png"/></Button>
+            </Grid>
+        </Border>
+    </Grid>
+</UserControl>

Nebula.Launcher/Views/Tabs/ServerListTab.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace Nebula.Launcher.Views.Tabs;
+
+public partial class ServerListTab : UserControl
+{
+    public ServerListTab()
+    {
+        InitializeComponent();
+    }
+}