diff --git a/.idea/.idea.Nebula/.idea/avalonia.xml b/.idea/.idea.Nebula/.idea/avalonia.xml
index f46dd60..7586366 100644
--- a/.idea/.idea.Nebula/.idea/avalonia.xml
+++ b/.idea/.idea.Nebula/.idea/avalonia.xml
@@ -5,9 +5,13 @@
diff --git a/Nebula.Launcher/App.axaml b/Nebula.Launcher/App.axaml
index f78de88..ba40e95 100644
--- a/Nebula.Launcher/App.axaml
+++ b/Nebula.Launcher/App.axaml
@@ -19,6 +19,18 @@
+
+
+
+
-
-
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/account.png b/Nebula.Launcher/Assets/account.png
index a83cbdd..77dff4b 100644
Binary files a/Nebula.Launcher/Assets/account.png and b/Nebula.Launcher/Assets/account.png differ
diff --git a/Nebula.Launcher/Assets/attribution.txt b/Nebula.Launcher/Assets/attribution.txt
index 68b82db..7e13daa 100644
--- a/Nebula.Launcher/Assets/attribution.txt
+++ b/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
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/filter.png b/Nebula.Launcher/Assets/filter.png
new file mode 100644
index 0000000..2c77c33
Binary files /dev/null and b/Nebula.Launcher/Assets/filter.png differ
diff --git a/Nebula.Launcher/Assets/list.png b/Nebula.Launcher/Assets/list.png
index c127fda..4db0a25 100644
Binary files a/Nebula.Launcher/Assets/list.png and b/Nebula.Launcher/Assets/list.png differ
diff --git a/Nebula.Launcher/Assets/settings.png b/Nebula.Launcher/Assets/settings.png
new file mode 100644
index 0000000..da87b53
Binary files /dev/null and b/Nebula.Launcher/Assets/settings.png differ
diff --git a/Nebula.Launcher/Nebula.Launcher.csproj b/Nebula.Launcher/Nebula.Launcher.csproj
index 2557ae7..a80e71f 100644
--- a/Nebula.Launcher/Nebula.Launcher.csproj
+++ b/Nebula.Launcher/Nebula.Launcher.csproj
@@ -27,4 +27,15 @@
+
+
+
+ ServerContainerControl.axaml
+ Code
+
+
+ ServerListTab.axaml
+ Code
+
+
diff --git a/Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml b/Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml
new file mode 100644
index 0000000..6f00507
--- /dev/null
+++ b/Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml
@@ -0,0 +1,20 @@
+
+
+
+
+ Name:
+ Ni Higgers
+
+
+
+
+
+
+
+
diff --git a/Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml.cs b/Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml.cs
new file mode 100644
index 0000000..24ecb51
--- /dev/null
+++ b/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();
+ }
+}
\ No newline at end of file
diff --git a/Nebula.Launcher/Views/ServerContainer.axaml b/Nebula.Launcher/Views/Controls/ServerContainerControl.axaml
similarity index 88%
rename from Nebula.Launcher/Views/ServerContainer.axaml
rename to Nebula.Launcher/Views/Controls/ServerContainerControl.axaml
index 0a1e562..efae3e4 100644
--- a/Nebula.Launcher/Views/ServerContainer.axaml
+++ b/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">
-
+
Server name
15/15
-
diff --git a/Nebula.Launcher/Views/Controls/ServerContainerControl.axaml.cs b/Nebula.Launcher/Views/Controls/ServerContainerControl.axaml.cs
new file mode 100644
index 0000000..f10585f
--- /dev/null
+++ b/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();
+ }
+}
\ No newline at end of file
diff --git a/Nebula.Launcher/Views/MainWindow.axaml b/Nebula.Launcher/Views/MainWindow.axaml
index 636070e..56bb703 100644
--- a/Nebula.Launcher/Views/MainWindow.axaml
+++ b/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">
-
-
+
-
-
-
-
-
+
+
+
- Site: ssilka | Discord: lala
- v1.5
+ cinka.ru
+ v0.01
diff --git a/Nebula.Launcher/Views/ServerList.axaml b/Nebula.Launcher/Views/ServerList.axaml
deleted file mode 100644
index c707c07..0000000
--- a/Nebula.Launcher/Views/ServerList.axaml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Nebula.Launcher/Views/ServerList.axaml.cs b/Nebula.Launcher/Views/ServerList.axaml.cs
deleted file mode 100644
index 459939e..0000000
--- a/Nebula.Launcher/Views/ServerList.axaml.cs
+++ /dev/null
@@ -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();
- }
-}
\ No newline at end of file
diff --git a/Nebula.Launcher/Views/Tabs/AccountInfoTab.axaml b/Nebula.Launcher/Views/Tabs/AccountInfoTab.axaml
new file mode 100644
index 0000000..c516891
--- /dev/null
+++ b/Nebula.Launcher/Views/Tabs/AccountInfoTab.axaml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+ Login:
+
+ Password:
+
+ Auth server:
+
+
+
+
+
+
+
+
+
+
+
+ Profiles:
+
+
+
+
+
+
+
+
+
+
diff --git a/Nebula.Launcher/Views/ServerContainer.axaml.cs b/Nebula.Launcher/Views/Tabs/AccountInfoTab.axaml.cs
similarity index 50%
rename from Nebula.Launcher/Views/ServerContainer.axaml.cs
rename to Nebula.Launcher/Views/Tabs/AccountInfoTab.axaml.cs
index 48c1acb..4c77a11 100644
--- a/Nebula.Launcher/Views/ServerContainer.axaml.cs
+++ b/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();
}
diff --git a/Nebula.Launcher/Views/Tabs/ServerListTab.axaml b/Nebula.Launcher/Views/Tabs/ServerListTab.axaml
new file mode 100644
index 0000000..f59edb0
--- /dev/null
+++ b/Nebula.Launcher/Views/Tabs/ServerListTab.axaml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+ Search...
+
+
+
+
+
diff --git a/Nebula.Launcher/Views/Tabs/ServerListTab.axaml.cs b/Nebula.Launcher/Views/Tabs/ServerListTab.axaml.cs
new file mode 100644
index 0000000..a744527
--- /dev/null
+++ b/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();
+ }
+}
\ No newline at end of file