31 Commits

Author SHA1 Message Date
673a972598 Merge remote-tracking branch 'origin/master' 2025-11-08 13:42:36 +03:00
f44589454c - fix: auth renew and null fix 2025-11-08 13:42:11 +03:00
fd06729035 - fix: update resolver startup 2025-10-04 19:59:23 +03:00
a09ace0d39 - fix: UpdateResolver preview think 2025-09-08 21:26:12 +03:00
56c373134f - fix: little thinks 2025-09-07 21:21:50 +03:00
fa68b4bcd5 - fix: Message on error 2025-08-17 21:40:31 +03:00
b86b65fd66 - fix: profiles token refresh now 2025-08-17 21:02:45 +03:00
6c967efd85 - fix: auth logic part 2 2025-08-07 22:34:25 +03:00
6a6bb4f27c - fix: auth logic part 1 2025-08-06 21:29:00 +03:00
f6a15e9c45 - add: multiauth 2025-07-15 18:38:53 +03:00
c148f6ed34 - add: nice error view 2025-07-14 10:06:38 +03:00
a475148543 - tweak: a little bit of repair and tweaks 2025-07-13 10:07:36 +03:00
34fd4ebf4c - tweak: Migrate v3 profiles 2025-07-10 15:22:15 +03:00
83d116003b - add: lang think 2025-07-09 23:15:02 +03:00
a3c96174b2 - add: Foolproof 2025-07-05 20:39:36 +03:00
3bfae32c25 - fix: harmony assembly include 2025-07-03 12:46:28 +03:00
ae17ff2d89 - add: Unit tests 2025-07-03 12:17:15 +03:00
517fadaab8 - tweak: View autogenerator 2025-07-02 21:32:51 +03:00
9e95d68c4a - tweak: style thinks 2025-06-28 14:05:19 +03:00
01ebe3219d - add: Metrics 2025-06-27 21:31:38 +03:00
147915f684 - add: add more translate 2025-06-23 19:48:11 +03:00
0a2fe55c7f - add: language 2025-06-23 16:39:30 +03:00
02e1a14571 - add: Custom names of servers 2025-06-22 22:11:27 +03:00
37ca8fecf3 - tweak: Rework loading status 2025-06-22 10:40:42 +03:00
875dacaa18 - tweak: Improve auth page 2025-06-20 16:27:42 +03:00
10d317c867 - add: config invoke 2025-06-19 21:12:42 +03:00
73682acbab - add: Config page fully 2025-06-18 21:36:50 +03:00
a7943adb76 - tweak: Change content running logic 2025-06-17 21:07:32 +03:00
eb188321af - add: VC check 2025-06-15 19:14:58 +03:00
030f680b96 - fix: natives 2025-06-15 17:25:09 +03:00
ba8153e6b4 - fix: return addfavorite button 2025-06-15 17:13:31 +03:00
153 changed files with 4318 additions and 1250 deletions

View File

@@ -12,6 +12,7 @@
<entry key="Nebula.Launcher/MessageBox/MessageView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/MessageBox/MessageView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/MessageBox/MessageWindow.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/MessageBox/MessageWindow.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/ViewModels/Styles1.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/Config/StringConfigurationView.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/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/Controls/ServerContainerControl.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/ExceptionView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/ExceptionView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
@@ -21,24 +22,30 @@
<entry key="Nebula.Launcher/Views/Pages/AccountInfoPage.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Pages/AccountInfoPage.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Pages/AccountInfoView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Pages/AccountInfoView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Pages/AddFavoriteView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Pages/AddFavoriteView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Pages/ConfigurationView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Pages/ContentBrowserView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Pages/ContentBrowserView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Pages/FavoriteServerListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Pages/FavoriteServerListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Pages/ServerListPage.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Pages/ServerListPage.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Pages/ServerListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Pages/ServerListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Pages/ServerOverviewView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Pages/ServerOverviewView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Popup/AddFavoriteView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Popup/EditServerNameView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Popup/ExceptionListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Popup/ExceptionListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Popup/ExceptionView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Popup/ExceptionView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Popup/InfoPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Popup/InfoPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Popup/IsLoginCredentialsNullPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Popup/LoadingContextView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Popup/LoadingContextView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Popup/LogPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Popup/LogPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Popup/MessagePopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Popup/MessagePopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Popup/TfaView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Popup/TfaView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/ServerCompoundEntryView.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/ServerContainer.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/ServerEntryView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/ServerEntryView.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/ServerList.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/ServerListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/ServerListView.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/AccountInfoTab.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/Tabs/ServerListTab.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Views/Tabs/ServerListTab.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Views/VisualErrorView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.UpdateResolver/App.axaml" value="Nebula.UpdateResolver/Nebula.UpdateResolver.csproj" /> <entry key="Nebula.UpdateResolver/App.axaml" value="Nebula.UpdateResolver/Nebula.UpdateResolver.csproj" />
<entry key="Nebula.UpdateResolver/MainWindow.axaml" value="Nebula.UpdateResolver/Nebula.UpdateResolver.csproj" /> <entry key="Nebula.UpdateResolver/MainWindow.axaml" value="Nebula.UpdateResolver/Nebula.UpdateResolver.csproj" />
</map> </map>

2
.vscode/launch.json vendored
View File

@@ -10,7 +10,7 @@
"request": "launch", "request": "launch",
"preLaunchTask": "build", "preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path. // If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/Nebula.Launcher/bin/Debug/net9.0/Nebula.Launcher.dll", "program": "${workspaceFolder}/Nebula.Launcher/bin/Debug/Nebula.Launcher.dll",
"args": [], "args": [],
"cwd": "${workspaceFolder}/Nebula.Launcher", "cwd": "${workspaceFolder}/Nebula.Launcher",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console

View File

@@ -28,14 +28,16 @@ public class App : Application
{ {
case IClassicDesktopStyleApplicationLifetime desktop: case IClassicDesktopStyleApplicationLifetime desktop:
DisableAvaloniaDataAnnotationValidation(); DisableAvaloniaDataAnnotationValidation();
desktop.MainWindow = new MessageWindow(out provider); desktop.MainWindow = (Window)(provider = new MessageWindow());
break; break;
case ISingleViewApplicationLifetime singleViewPlatform: case ISingleViewApplicationLifetime singleViewPlatform:
singleViewPlatform.MainView = new MessageView(out provider); singleViewPlatform.MainView = (Control)(provider = new MessageView());
break; break;
} }
provider?.ShowMessage("Launcher is already running.","hey shithead!"); provider?.ShowMessage(
"Error: An instance of the application is already running. Please close the existing instance before launching a new one.",
"Duplicate instance detected.");
return; return;
} }

View File

@@ -1,16 +1,28 @@
<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages">
<!-- Base Window Style -->
<Style Selector="Window"> <Style Selector="Window">
<Setter Property="Background" Value="{StaticResource DefaultBackground}" /> <Setter Property="Background" Value="{StaticResource DefaultBackground}" />
</Style> </Style>
<!-- Common Border Style -->
<Style Selector="Border"> <Style Selector="Border">
<Setter Property="CornerRadius" Value="10" /> <Setter Property="CornerRadius" Value="10" />
</Style> </Style>
<!-- Common Label Style -->
<Style Selector="Label"> <Style Selector="Label">
<Setter Property="Foreground" Value="#f7f7ff" /> <Setter Property="Foreground" Value="#f7f7ff" />
</Style> </Style>
<!-- Common ItemsControl Style -->
<Style Selector="ItemsControl"> <Style Selector="ItemsControl">
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
</Style> </Style>
<!-- General Button Style -->
<Style Selector="Button"> <Style Selector="Button">
<Setter Property="BorderBrush" Value="#343334" /> <Setter Property="BorderBrush" Value="#343334" />
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
@@ -19,6 +31,7 @@
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
</Style> </Style>
<!-- Button State Overrides -->
<Style Selector="Button:pressed"> <Style Selector="Button:pressed">
<Setter Property="RenderTransform" Value="{x:Null}" /> <Setter Property="RenderTransform" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0,0,0,2" /> <Setter Property="BorderThickness" Value="0,0,0,2" />
@@ -30,26 +43,33 @@
<Setter Property="BorderThickness" Value="0,0,0,0" /> <Setter Property="BorderThickness" Value="0,0,0,0" />
</Style> </Style>
<!-- ViewSelectButton Specialization -->
<Style Selector="Button.ViewSelectButton"> <Style Selector="Button.ViewSelectButton">
<Setter Property="CornerRadius" Value="0,8,8,0" /> <Setter Property="CornerRadius" Value="0,8,8,0" />
<Setter Property="Margin" Value="0,0,0,5" /> <Setter Property="Margin" Value="0,0,0,5" />
<Setter Property="Padding" Value="8" /> <Setter Property="Padding" Value="8" />
<Setter Property="Background" Value="Transparent" />
</Style> </Style>
<Style Selector="Button.ViewSelectButton:pressed"> <Style Selector="Button.ViewSelectButton:pressed">
<Setter Property="BorderThickness" Value="0,0,0,0" /> <Setter Property="BorderThickness" Value="0,0,0,0" />
</Style> </Style>
<!-- TextBox Styles -->
<Style Selector="TextBox"> <Style Selector="TextBox">
<Setter Property="Foreground" Value="#f7f7ff" /> <Setter Property="Foreground" Value="#f7f7ff" />
<Setter Property="SelectionForegroundBrush" Value="#f7f7ff" /> <Setter Property="SelectionForegroundBrush" Value="#f7f7ff" />
<Setter Property="BorderThickness" Value="0,0,0,0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#f7f7ff" /> <Setter Property="BorderBrush" Value="#f7f7ff" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
</Style> </Style>
<Style Selector="TextBox" />
<Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
<Setter Property="BorderBrush" Value="White" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0,0,0,1" />
</Style>
<!-- ListBoxItem Styles -->
<Style Selector="ListBoxItem /template/ ContentPresenter"> <Style Selector="ListBoxItem /template/ ContentPresenter">
<Setter Property="CornerRadius" Value="0,8,8,0" /> <Setter Property="CornerRadius" Value="0,8,8,0" />
<Setter Property="Margin" Value="0,0,0,5" /> <Setter Property="Margin" Value="0,0,0,5" />
@@ -60,29 +80,37 @@
<Style Selector="ListBoxItem:selected /template/ ContentPresenter"> <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
<Setter Property="CornerRadius" Value="0,8,8,0" /> <Setter Property="CornerRadius" Value="0,8,8,0" />
<Setter Property="Background"> <Setter Property="Background">
<LinearGradientBrush EndPoint="100%,50%" StartPoint="0%,50%"> <Setter.Value>
<GradientStop Color="#ae4c47" Offset="0.0" /> <LinearGradientBrush EndPoint="100%,50%" StartPoint="0%,50%">
<GradientStop Color="#D95F59" Offset="0.2" /> <GradientStop Color="#ae4c47" Offset="0.0" />
<GradientStop Color="#D95F59" Offset="1.0" /> <GradientStop Color="#D95F59" Offset="0.2" />
</LinearGradientBrush> <GradientStop Color="#D95F59" Offset="1.0" />
</LinearGradientBrush>
</Setter.Value>
</Setter> </Setter>
<Setter Property="BoxShadow" Value="0 0 15 1 #1212" /> <Setter Property="BoxShadow" Value="0 0 15 1 #1212" />
</Style> </Style>
<Style Selector="ListBoxItem:pointerover"> <Style Selector="ListBoxItem:pointerover">
<Setter Property="CornerRadius" Value="0,8,8,0" /> <Setter Property="CornerRadius" Value="0,8,8,0" />
<Setter Property="Margin" Value="0,0,5,0" /> <Setter Property="Margin" Value="0,0,5,0" />
</Style> </Style>
<Style Selector="ListBoxItem:pressed /template/ ContentPresenter"> <Style Selector="ListBoxItem:pressed /template/ ContentPresenter">
<Setter Property="CornerRadius" Value="0,8,8,0" /> <Setter Property="CornerRadius" Value="0,8,8,0" />
<Setter Property="Background" Value="{StaticResource DefaultSelected}" /> <Setter Property="Background" Value="{StaticResource DefaultSelected}" />
</Style> </Style>
<Style Selector="TextBox"> <!-- Combined ConfigBorder Styles -->
<Setter Property="Background" Value="Transparent" /> <Style Selector="pages|ComplexUnitConfigControl.ConfigBorder,
</Style> pages|ArrayUnitConfigControl.ConfigBorder,
<Style Selector="TextBox:focus /template/ Border#PART_BorderElement"> pages|StringUnitConfigControl.ConfigBorder,
<Setter Property="BorderBrush" Value="White" /> pages|IntUnitConfigControl.ConfigBorder,
<Setter Property="Background" Value="Transparent" /> pages|FloatUnitConfigControl.ConfigBorder">
<Setter Property="BorderThickness" Value="0,0,0,1" /> <Setter Property="Background" Value="#33333355" />
</Style> <Setter Property="CornerRadius" Value="0"/>
<Setter Property="BorderThickness" Value="1,0,0,2" />
<Setter Property="BorderBrush" Value="#3f3f3f5f" />
</Style>
</Styles> </Styles>

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 KiB

View File

@@ -0,0 +1,72 @@
tab-account = Account
tab-servers = Servers
tab-content = Content
tab-settings = Settings
vcruntime-check-error = VC runtime dlls are not present on this computer. Install VC runtime dlls.
migration-label-task = Migration task, please wait...
task-cancel = Cancel
popup-edit-name = Edit server name
popup-add-favorite = Add favorite
popup-exception = Exception was thrown
popup-information = Information
popup-loading = Loading...
popup-twofa = 2fa
account-profiles = Profiles
account-profile-select = Select
account-profile-delete = Delete
account-auth-retry = Retry Authentication
account-auth-try-another = Or try another account
account-auth-login = Enter your login
account-auth-password = Enter your password
account-auth-server = Authentication Server
account-auth-button = Authenticate
account-auth-save = Save Profile
account-auth-hello = Hello,
account-auth-current-server = Current server auth:
account-auth-logout = Log out
auth-current-login-name = Current login {$auth_server}: {$login}
auth-current-login-no-name = Profile not selected
auth-processing = Processing authentication request...
auth-error = An authentication error has occurred.
auth-error-occured = An error occurred during the authentication process.
auth-invalid-credentials = Invalid username or password. Please try again.
auth-connection-error = Unable to connect to the authentication server.
auth-name-resolution-error = Failed to resolve server address. Check your network or server configuration.
auth-secure-error = Failed to cinnect to the server using SSL
auth-config-read = Reading authentication configuration...
auth-try-auth-config = Attempting to authenticate using saved configuration.
auth-try-auth-profile = Attempting to authenticate using profile
config-export-logs = Export logs
config-open-data = Open data path
config-reset = Reset to default
config-save = Save changes
config-remove-content-all = Remove all content
filter-roleplay = Roleplay
filter-language = Language
favorite-add = Add to favorites
popup-add-favorite-invalid-ip = Please enter a valid IP
servername-set = Set server name
servername-clear = Clear server name
twofa-enabled = You have two-factor authentication enabled. Please enter the code.
twofa-set = Proceed
server-search = Server search
serverentry-tag = Tag
serverentry-map = Map
serverentry-preset = Preset
content-view-server = Server url
content-view-path = Path
popup-login-credentials-warning = Warning! No credentials provided!
popup-login-credentials-warning-label = Warning! No credentials provided! The servers will not be able to let you in due to lack of authorization. Please keep this in mind.
popup-login-credentials-warning-go-auth = Go to auth page
popup-login-credentials-warning-cancel = Cancel
popup-login-credentials-warning-proceed = Proceed
goto-path-home = Root folder

View File

@@ -0,0 +1,72 @@
tab-account = Аккаунт
tab-servers = Серверы
tab-content = Контент
tab-settings = Настройки
vcruntime-check-error = VC runtime dll-библиотеки отсутствуют на этом компьютере. Установите VC runtime dll.
migration-label-task = Задача миграции, подождите...
task-cancel = Отмена
popup-edit-name = Изменить имя сервера
popup-add-favorite = Добавить в избранное
popup-exception = Произошло исключение
popup-information = Информация
popup-loading = Загрузка...
popup-twofa = 2FA
account-profiles = Профили
account-profile-select = Выбрать
account-profile-delete = Удалить
account-auth-retry = Повторить аутентификацию
account-auth-try-another = Или попробуйте другой аккаунт
account-auth-login = Введите логин
account-auth-password = Введите пароль
account-auth-server = Сервер аутентификации
account-auth-button = Аутентифицировать
account-auth-save = Сохранить профиль
account-auth-hello = Привет,
account-auth-current-server = Текущий сервер авторизации:
account-auth-logout = Выйти
auth-current-login-name = Текущий профиль {$auth_server}: {$login}
auth-current-login-no-name = Профиль не выбран
auth-processing = Обработка запроса аутентификации...
auth-error = Произошла ошибка аутентификации.
auth-error-occured = Во время аутентификации произошла ошибка.
auth-invalid-credentials = Неверное имя пользователя или пароль. Попробуйте еще раз.
auth-connection-error = Не удается подключиться к серверу аутентификации.
auth-name-resolution-error = Не удалось разрешить адрес сервера. Проверьте сетевые настройки или конфигурацию сервера.
auth-secure-error = Не удалось подключиться к серверу по SSL. Проверьте сетевые настройки.
auth-config-read = Чтение конфигурации аутентификации...
auth-try-auth-config = Попытка аутентификации с использованием сохраненной конфигурации.
auth-try-auth-profile = Попытка аутентификации с использованием профиля
config-export-logs = Экспортировать логи
config-open-data = Открыть путь данных
config-reset = Сбросить к значениям по умолчанию
config-save = Сохранить изменения
config-remove-content-all = Удалить весь контент
filter-roleplay = Ролевая игра
filter-language = Язык
favorite-add = Добавить в избранное
popup-add-favorite-invalid-ip = Пожалуйста, введите валидный адрес
servername-set = Установить имя сервера
servername-clear = Очистить
twofa-enabled = У вас включена двухфакторная аутентификация. Введите код.
twofa-set = Продолжить
server-search = Поиск сервера
serverentry-tag = Тэги
serverentry-map = Карта
serverentry-preset = Режим
content-view-server = Сервер
content-view-path = Путь
popup-login-credentials-warning = Предупреждение! Учетные данные не указаны!
popup-login-credentials-warning-label = Предупреждение! Учетные данные не указаны! Серверы не смогут пропустить вас из-за отсутствия авторизации. Пожалуйста, имейте это в виду.
popup-login-credentials-warning-go-auth = Перейти на страницу авторизации
popup-login-credentials-warning-cancel = Отмена
popup-login-credentials-warning-proceed = Продолжить
goto-path-home = Корн. папка

View File

@@ -0,0 +1,7 @@
<!-- License: Apache. Made by Remix Design: https://github.com/Remix-Design/remixicon -->
<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<g>
<path fill="none" d="M0 0h24v24H0z"/>
<path fill="white" d="M15.728 9.686l-1.414-1.414L5 17.586V19h1.414l9.314-9.314zm1.414-1.414l1.414-1.414-1.414-1.414-1.414 1.414 1.414 1.414zM7.242 21H3v-4.243L16.435 3.322a1 1 0 0 1 1.414 0l2.829 2.829a1 1 0 0 1 0 1.414L7.243 21z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 489 B

View File

@@ -0,0 +1,20 @@
using System;
using System.Security.Cryptography;
using System.Text;
using Avalonia.Media;
namespace Nebula.Launcher.ViewModels.Pages;
public static class ColorUtils
{
public static Color GetColorFromString(string input)
{
var hash = MD5.HashData(Encoding.UTF8.GetBytes(input));
var r = byte.Clamp(hash[0], 10, 200);
var g = byte.Clamp(hash[1], 10, 100);
var b = byte.Clamp(hash[2], 10, 100);
return Color.FromArgb(Byte.MaxValue, r, g, b);
}
}

View File

@@ -0,0 +1,99 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Layout;
namespace Nebula.Launcher.ViewModels.Pages;
public sealed class ArrayUnitConfigControl : Border, IConfigControl
{
private readonly List<IConfigControl> _itemControls = [];
private readonly StackPanel _itemsPanel = new StackPanel() { Orientation = Orientation.Vertical };
private readonly Button _addButton = new Button() { Content = new Label()
{
Content = "Add Item"
}, Classes = { "ConfigBorder" }};
private readonly int _oldCount;
private readonly Type _elementType;
private readonly StackPanel _panel = new();
public string ConfigName { get; }
public bool Dirty => _itemControls.Any(dirty => dirty.Dirty) || _itemControls.Count != _oldCount;
public ArrayUnitConfigControl(string name, object value)
{
Classes.Add("ConfigBorder");
_elementType = value.GetType().GetElementType()!;
ConfigName = name;
_panel.Orientation = Orientation.Vertical;
_panel.Spacing = 4f;
_itemsPanel.Spacing = 4f;
_panel.Children.Add(new Label { Content = name });
_panel.Children.Add(_itemsPanel);
_panel.Children.Add(_addButton);
_addButton.Click += (_, _) => AddItem(ConfigControlHelper.CreateDefaultValue(_elementType)!);
Child = _panel;
SetValue(value);
_oldCount = _itemControls.Count;
}
private void AddItem(object value)
{
var itemPanel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };
var control = ConfigControlHelper.GetConfigControl(_itemControls.Count.ToString(), value);
var removeButton = new Button { Content = new Label(){ Content = "Remove" }, Classes = { "ConfigBorder" }};
removeButton.Click += (_, _) =>
{
_itemControls.Remove(control);
_itemsPanel.Children.Remove(itemPanel);
};
((Control)control).Margin = new Thickness(5);
itemPanel.Children.Add((Control)control);
itemPanel.Children.Add(removeButton);
_itemsPanel.Children.Add(itemPanel);
_itemControls.Add(control);
}
public void SetValue(object value)
{
_itemControls.Clear();
_itemsPanel.Children.Clear();
if (value is IEnumerable list)
{
foreach (var item in list)
{
AddItem(item);
}
}
}
public object GetValue()
{
return ConvertArray(_itemControls.Select(c => c.GetValue()).ToArray(), _elementType);
}
public static Array ConvertArray(Array sourceArray, Type targetType)
{
int length = sourceArray.Length;
var newArray = Array.CreateInstance(targetType, length);
for (int i = 0; i < length; i++)
{
var value = sourceArray.GetValue(i);
var converted = Convert.ChangeType(value, targetType);
newArray.SetValue(converted, i);
}
return newArray;
}
}

View File

@@ -0,0 +1,86 @@
using System;
using System.ComponentModel;
using System.Threading;
using System.Threading.Tasks;
using Nebula.Shared.Configurations;
namespace Nebula.Launcher.Configurations;
public abstract class ComplexConVarBinder<T> : INotifyPropertyChanged, INotifyPropertyChanging
{
private readonly ConVarObserver<T> _baseConVar;
private readonly Lock _lock = new();
private readonly SemaphoreSlim _valueChangeSemaphore = new(1, 1);
public T? Value
{
get
{
lock (_lock)
{
return _baseConVar.Value;
}
}
set
{
_ = SetValueAsync(value);
}
}
public bool HasValue
{
get
{
lock (_lock)
{
return _baseConVar.HasValue;
}
}
}
protected ComplexConVarBinder(ConVarObserver<T> baseConVar)
{
_baseConVar = baseConVar ?? throw new ArgumentNullException(nameof(baseConVar));
_baseConVar.PropertyChanged += BaseConVarOnPropertyChanged;
_baseConVar.PropertyChanging += BaseConVarOnPropertyChanging;
}
private async Task SetValueAsync(T? value)
{
await _valueChangeSemaphore.WaitAsync().ConfigureAwait(false);
try
{
var newValue = await OnValueChange(value).ConfigureAwait(false);
lock (_lock)
{
_baseConVar.Value = newValue;
}
}
finally
{
_valueChangeSemaphore.Release();
}
}
protected abstract Task<T?> OnValueChange(T? newValue);
private void BaseConVarOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasValue)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
}
private void BaseConVarOnPropertyChanging(object? sender, PropertyChangingEventArgs e)
{
PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(nameof(HasValue)));
PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(nameof(Value)));
}
public event PropertyChangedEventHandler? PropertyChanged;
public event PropertyChangingEventHandler? PropertyChanging;
}

View File

@@ -0,0 +1,68 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Layout;
namespace Nebula.Launcher.ViewModels.Pages;
public sealed class ComplexUnitConfigControl : Border, IConfigControl
{
private readonly List<(PropertyInfo, IConfigControl)> _units = [];
private Type _objectType = typeof(object);
private readonly StackPanel _panel = new();
public string ConfigName { get; }
public bool Dirty => _units.Any(dirty => dirty.Item2.Dirty);
public ComplexUnitConfigControl(string name, object obj)
{
Classes.Add("ConfigBorder");
_panel.Orientation = Orientation.Vertical;
_panel.Spacing = 4f;
ConfigName = name;
Child = _panel;
SetValue(obj);
}
public void SetValue(object value)
{
_units.Clear();
_panel.Children.Clear();
_objectType = value.GetType();
_panel.Children.Add(new Label()
{
Content = ConfigName
});
foreach (var propInfo in _objectType.GetProperties())
{
if(propInfo.PropertyType.IsInterface)
continue;
var propValue = propInfo.GetValue(value);
var control = ConfigControlHelper.GetConfigControl(propInfo.Name, propValue!);
((Control)control).Margin = new Thickness(5);
_panel.Children.Add((Control)control);
_units.Add((propInfo,control));
}
}
public object GetValue()
{
var obj = ConfigControlHelper.CreateDefaultValue(_objectType);
foreach (var (fieldInfo, configControl) in _units)
{
fieldInfo.SetValue(obj, configControl.GetValue());
}
return obj!;
}
}

View File

@@ -0,0 +1,39 @@
using System;
using System.Linq;
namespace Nebula.Launcher.ViewModels.Pages;
public static class ConfigControlHelper{
public static IConfigControl GetConfigControl(string name,object value)
{
switch (value)
{
case string stringValue:
return new StringUnitConfigControl(name, stringValue);
case int intValue:
return new IntUnitConfigControl(name, intValue);
case float floatValue:
return new FloatUnitConfigControl(name, floatValue);
}
var valueType = value.GetType();
if (valueType.IsArray)
return new ArrayUnitConfigControl(name, value);
return new ComplexUnitConfigControl(name, value);
}
public static object? CreateDefaultValue(Type type)
{
if(type.IsValueType)
return Activator.CreateInstance(type);
var ctor = type.GetConstructors().First();
var parameters = ctor.GetParameters()
.Select(p => CreateDefaultValue(p.ParameterType))
.ToArray();
return ctor.Invoke(parameters);
}
}

View File

@@ -0,0 +1,19 @@
using System.Globalization;
namespace Nebula.Launcher.ViewModels.Pages;
public sealed class FloatUnitConfigControl(string name, float value) : UnitConfigControl<float>(name, value)
{
public CultureInfo CultureInfo = CultureInfo.InvariantCulture;
public override void SetConfValue(float value)
{
ConfigValue = value.ToString(CultureInfo);
}
public override float GetConfValue()
{
return float.Parse(ConfigValue, CultureInfo);
}
}

View File

@@ -0,0 +1,9 @@
namespace Nebula.Launcher.ViewModels.Pages;
public interface IConfigControl
{
public string ConfigName { get; }
public bool Dirty {get;}
public abstract void SetValue(object value);
public abstract object GetValue();
}

View File

@@ -0,0 +1,14 @@
namespace Nebula.Launcher.ViewModels.Pages;
public sealed class IntUnitConfigControl(string name, int value) : UnitConfigControl<int>(name, value)
{
public override void SetConfValue(int value)
{
ConfigValue = value.ToString();
}
public override int GetConfValue()
{
return int.Parse(ConfigValue);
}
}

View File

@@ -0,0 +1,14 @@
namespace Nebula.Launcher.ViewModels.Pages;
public sealed class StringUnitConfigControl(string name, string value) : UnitConfigControl<string>(name, value)
{
public override void SetConfValue(string value)
{
ConfigValue = value;
}
public override string GetConfValue()
{
return ConfigValue;
}
}

View File

@@ -0,0 +1,53 @@
using Avalonia.Controls;
using Avalonia.Layout;
namespace Nebula.Launcher.ViewModels.Pages;
public abstract class UnitConfigControl<T> : Border, IConfigControl where T : notnull
{
private readonly Label _nameLabel = new();
private readonly TextBox _valueLabel = new();
private string _originalValue;
private StackPanel _panel = new();
public string ConfigName { get; }
public bool Dirty => _originalValue != ConfigValue;
protected string ConfigValue
{
get => _valueLabel.Text ?? string.Empty;
set => _valueLabel.Text = value;
}
public UnitConfigControl(string name, T value)
{
Classes.Add("ConfigBorder");
ConfigName = name;
_panel.Orientation = Orientation.Horizontal;
_panel.Children.Add(_nameLabel);
_panel.Children.Add(_valueLabel);
_nameLabel.Content = name;
_nameLabel.VerticalAlignment = VerticalAlignment.Center;
Child = _panel;
SetConfValue(value);
_originalValue = ConfigValue;
}
public abstract void SetConfValue(T value);
public abstract T GetConfValue();
public void SetValue(object value)
{
SetConfValue((T)value);
}
public object GetValue()
{
return GetConfValue()!;
}
}

View File

@@ -19,13 +19,16 @@ public class FilterBox : UserControl
public Action<FilterBoxChangedEventArgs>? OnFilterChanged {get; set;} public Action<FilterBoxChangedEventArgs>? OnFilterChanged {get; set;}
public string? FilterBoxName { public string FilterBoxName {
set => filterName.Text = value; set => filterName.LocalId = value;
get => filterName.Text; get => filterName.LocalId;
} }
private StackPanel filterPanel; private StackPanel filterPanel;
private TextBox filterName = new TextBox(); private LocalizedLabel filterName = new LocalizedLabel()
{
VerticalAlignment = VerticalAlignment.Center
};
public FilterBox() public FilterBox()
{ {
@@ -34,6 +37,8 @@ public class FilterBox : UserControl
Orientation = Orientation.Horizontal, Orientation = Orientation.Horizontal,
Spacing = 5, Spacing = 5,
}; };
filterPanel.Children.Add(filterName);
Content = filterPanel; Content = filterPanel;
} }

View File

@@ -0,0 +1,20 @@
using Avalonia;
using Avalonia.Controls;
using Nebula.Launcher.Services;
namespace Nebula.Launcher.Controls;
public class LocalizedLabel : Label
{
public static readonly StyledProperty<string> LocalIdProperty = AvaloniaProperty.Register<LocalizedLabel, string>(nameof(LocalId));
public string LocalId
{
get => GetValue(LocalIdProperty);
set
{
SetValue(LocalIdProperty, value);
Content = LocalisationService.GetString(value);
}
}
}

View File

@@ -1,4 +1,5 @@
using Avalonia.Controls; using Avalonia.Controls;
using Nebula.Launcher.Models;
using Nebula.Launcher.ServerListProviders; using Nebula.Launcher.ServerListProviders;
using Nebula.Launcher.ViewModels; using Nebula.Launcher.ViewModels;
using Nebula.Launcher.ViewModels.Pages; using Nebula.Launcher.ViewModels.Pages;
@@ -43,6 +44,17 @@ public partial class ServerListView : UserControl
else _provider.OnLoaded += RefreshRequired; else _provider.OnLoaded += RefreshRequired;
} }
public void RequireStatusUpdate()
{
foreach (var rawView in ServerList.Items)
{
if (rawView is ServerEntryModelView serverEntryModelView)
{
//serverEntryModelView.UpdateStatusIfNecessary();
}
}
}
public void ApplyFilter(ServerFilter? filter) public void ApplyFilter(ServerFilter? filter)
{ {
_currentFilter = filter; _currentFilter = filter;
@@ -50,9 +62,10 @@ public partial class ServerListView : UserControl
if(IsLoading) if(IsLoading)
return; return;
foreach (IFilterConsumer? serverView in ServerList.Items) foreach (var serverView in ServerList.Items)
{ {
serverView?.ProcessFilter(filter); if(serverView is IFilterConsumer filterConsumer)
filterConsumer.ProcessFilter(filter);
} }
} }
@@ -72,7 +85,8 @@ public partial class ServerListView : UserControl
foreach (var serverEntry in _provider.GetServers()) foreach (var serverEntry in _provider.GetServers())
{ {
ServerList.Items.Add(serverEntry); ServerList.Items.Add(serverEntry);
serverEntry.ProcessFilter(_currentFilter); if(serverEntry is IFilterConsumer serverFilter)
serverFilter.ProcessFilter(_currentFilter);
} }
foreach (var error in _provider.GetErrors()) foreach (var error in _provider.GetErrors())

View File

@@ -1,11 +1,13 @@
using Avalonia; using System;
using Avalonia.Controls;
using Avalonia.Data.Converters; using Avalonia.Data.Converters;
using Avalonia.Media; using Avalonia.Media;
using Avalonia.Platform;
using Nebula.Launcher.ViewModels.Pages;
using Color = System.Drawing.Color;
namespace Nebula.Launcher.Converters; namespace Nebula.Launcher.Converters;
public class TypeConverters public static class TypeConverters
{ {
public static FuncValueConverter<string, string?> IconConverter { get; } = public static FuncValueConverter<string, string?> IconConverter { get; } =
new(iconKey => new(iconKey =>
@@ -13,4 +15,17 @@ public class TypeConverters
if (iconKey == null) return null; if (iconKey == null) return null;
return $"/Assets/svg/{iconKey}.svg"; return $"/Assets/svg/{iconKey}.svg";
}); });
public static FuncValueConverter<string, IImage?> ImageConverter { get; } =
new(iconKey =>
{
if (iconKey == null) return null;
return new Avalonia.Media.Imaging.Bitmap(AssetLoader.Open(new Uri($"avares://Nebula.Launcher/Assets/error_presentation/{iconKey}.png")));
});
public static FuncValueConverter<string, Avalonia.Media.Color> NameColorRepresentation { get; } =
new((str)=>ColorUtils.GetColorFromString(str ?? throw new ArgumentNullException(nameof(str),"Name of color is null!")));
public static FuncValueConverter<string, bool> StringIsNotEmpty { get; } =
new(iconKey => !string.IsNullOrEmpty(iconKey));
} }

View File

@@ -1,2 +1 @@
global using Nebula.Shared.Attributes; global using Nebula.Shared.Attributes;
global using Nebula.Launcher.ViewHelper;

View File

@@ -1,38 +1,58 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using Nebula.Launcher.Models; using Nebula.Launcher.Models;
using Nebula.Launcher.ViewModels.Pages; using Nebula.Launcher.Models.Auth;
using Nebula.Shared.ConfigMigrations;
using Nebula.Shared.Configurations;
using Nebula.Shared.Configurations.Migrations;
using Nebula.Shared.Services; using Nebula.Shared.Services;
namespace Nebula.Launcher; namespace Nebula.Launcher;
public static class LauncherConVar public static class LauncherConVar
{ {
public static readonly ConVar<ProfileAuthCredentials[]> AuthProfiles = public static readonly ConVar<bool> DoMigration =
ConVarBuilder.Build<ProfileAuthCredentials[]>("auth.profiles.v2", []); ConVarBuilder.Build("migration.doMigrate", true);
public static readonly ConVar<string[]> AuthProfiles =
ConVarBuilder.BuildWithMigration<string[]>("auth.profiles.v4",
MigrationQueueBuilder.Instance
.With(new ProfileMigrationV2("auth.profiles.v2","auth.profiles.v4"))
.With(new ProfileMigrationV3V4("auth.profiles.v3","auth.profiles.v4"))
.Build(),
[]);
public static readonly ConVar<CurrentAuthInfo?> AuthCurrent = public static readonly ConVar<AuthTokenCredentials?> AuthCurrent =
ConVarBuilder.Build<CurrentAuthInfo?>("auth.current.v2"); ConVarBuilder.Build<AuthTokenCredentials?>("auth.current.v2");
public static readonly ConVar<string[]> Favorites = public static readonly ConVar<string[]> Favorites =
ConVarBuilder.Build<string[]>("server.favorites", []); ConVarBuilder.Build<string[]>("server.favorites", []);
public static readonly ConVar<AuthServerCredentials[]> AuthServers = ConVarBuilder.Build<AuthServerCredentials[]>("launcher.authServers", [ public static readonly ConVar<Dictionary<string,string>> ServerCustomNames =
ConVarBuilder.Build<Dictionary<string,string>>("server.names", []);
public static readonly ConVar<AuthServerCredentials[]> AuthServers =
ConVarBuilder.Build<AuthServerCredentials[]>("launcher.authServers", [
new AuthServerCredentials( new AuthServerCredentials(
"WizDen", "WizDen",
[ [
"https://harpy.durenko.tatar/auth-api/", "https://harpy.durenko.tatar/auth-api/",
"https://auth.fallback.spacestation14.com/" "https://auth.spacestation14.com/",
"https://auth.fallback.spacestation14.com/",
]),
new AuthServerCredentials(
"SimpleStation",
[
"https://auth.simplestation.org/",
]) ])
]); ]);
public static readonly ConVar<ServerHubRecord[]> Hub = ConVarBuilder.Build<ServerHubRecord[]>("launcher.hub.v2", [ public static readonly ConVar<ServerHubRecord[]> Hub = ConVarBuilder.Build<ServerHubRecord[]>("launcher.hub.v2", [
new ServerHubRecord("WizDen", "https://harpy.durenko.tatar/hub-api/api/servers", null), new ServerHubRecord("WizDen", "https://harpy.durenko.tatar/hub-api/api/servers"),
new ServerHubRecord("AltHub","https://web.networkgamez.com/api/servers",null) new ServerHubRecord("AltHub","https://hub.singularity14.co.uk/api/servers")
]); ]);
public static readonly ConVar<string> CurrentLang = ConVarBuilder.Build<string>("launcher.language", "en-US"); public static readonly ConVar<string> CurrentLang = ConVarBuilder.Build<string>("launcher.language", CultureInfo.CurrentCulture.Name);
public static readonly ConVar<string> ILSpyUrl = ConVarBuilder.Build<string>("decompiler.url", public static readonly ConVar<string> ILSpyUrl = ConVarBuilder.Build<string>("decompiler.url",
"https://github.com/icsharpcode/ILSpy/releases/download/v9.0/ILSpy_binaries_9.0.0.7889-x64.zip"); "https://github.com/icsharpcode/ILSpy/releases/download/v9.0/ILSpy_binaries_9.0.0.7889-x64.zip");
} }

View File

@@ -2,16 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
Width="600"
Height="400"
x:Class="Nebula.Launcher.MessageBox.MessageView"> x:Class="Nebula.Launcher.MessageBox.MessageView">
<Grid RowDefinitions="50,*" ColumnDefinitions="*"> <views:VisualErrorView x:Name="ErrorView"/>
<Border Grid.Column="0" Background="#222222" Padding="10" BorderBrush="#444444" BorderThickness="0,0,0,3">
<Label VerticalAlignment="Center" x:Name="Title">Text</Label>
</Border>
<Panel Margin="5" Grid.Row="1">
<Label x:Name="Message">Message</Label>
</Panel>
</Grid>
</UserControl> </UserControl>

View File

@@ -1,21 +1,22 @@
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Nebula.Launcher.ViewModels;
namespace Nebula.Launcher.MessageBox; namespace Nebula.Launcher.MessageBox;
public partial class MessageView : UserControl, IMessageContainerProvider public partial class MessageView : UserControl, IMessageContainerProvider
{ {
public MessageView(out IMessageContainerProvider provider) private readonly VisualErrorViewModel _context;
public MessageView()
{ {
InitializeComponent(); InitializeComponent();
provider = this; _context = new VisualErrorViewModel();
ErrorView.Content = _context;
} }
public void ShowMessage(string message, string title) public void ShowMessage(string message, string title)
{ {
Title.Content = title; _context.Title = title;
Message.Content = message; _context.Description = message;
} }
} }

View File

@@ -3,10 +3,52 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:messageBox="clr-namespace:Nebula.Launcher.MessageBox" xmlns:messageBox="clr-namespace:Nebula.Launcher.MessageBox"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" SystemDecorations="BorderOnly"
mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="260"
Width="600" Width="600"
Height="400" Height="260"
CanResize="False"
x:Class="Nebula.Launcher.MessageBox.MessageWindow" x:Class="Nebula.Launcher.MessageBox.MessageWindow"
Title="MessageWindow"> Title="MessageWindow">
<Grid ColumnDefinitions="*" RowDefinitions="30,*">
<messageBox:MessageView
Grid.Column="0"
Grid.Row="0"
Grid.RowSpan="2"
x:Name="MessageView" />
<Border
BorderThickness="0,0,0,2"
CornerRadius="0"
Grid.Column="0"
Grid.Row="0">
<Border.BorderBrush>
<LinearGradientBrush EndPoint="100%,50%" StartPoint="0%,50%">
<GradientStop Color="#222222" Offset="0.0" />
<GradientStop Color="#442222" Offset="1.0" />
</LinearGradientBrush>
</Border.BorderBrush>
<Panel
Height="30"
PointerPressed="InputElement_OnPointerPressed">
<TextBlock
FontSize="10"
Foreground="White"
IsVisible="False"
Margin="15,0"
Text="Nebula Launcher"
VerticalAlignment="Center" />
<StackPanel
HorizontalAlignment="Right"
Margin="5,0,5,0"
Orientation="Horizontal"
Spacing="8">
<Button
Click="Close_Click"
Content="🗙"
Foreground="Azure" />
</StackPanel>
</Panel>
</Border>
</Grid>
</Window> </Window>

View File

@@ -1,12 +1,28 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
namespace Nebula.Launcher.MessageBox; namespace Nebula.Launcher.MessageBox;
public partial class MessageWindow : Window public partial class MessageWindow : Window, IMessageContainerProvider
{ {
public MessageWindow(out IMessageContainerProvider provider) public MessageWindow()
{ {
InitializeComponent(); InitializeComponent();
Content = new MessageView(out provider); }
public void ShowMessage(string message, string title)
{
MessageView.ShowMessage(message, title);
}
private void Close_Click(object? sender, RoutedEventArgs e)
{
Close();
}
private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
} }
} }

View File

@@ -0,0 +1,6 @@
namespace Nebula.Launcher.Models.Auth;
public sealed record AuthServerCredentials(
string Name,
string[] Servers
);

View File

@@ -0,0 +1,12 @@
using System.Text.Json.Serialization;
using System.Windows.Input;
using Avalonia.Media;
using Nebula.Shared.Services;
namespace Nebula.Launcher.Models.Auth;
public sealed record ProfileEntry(
ProfileAuthCredentials Credentials,
string AuthName,
[property: JsonIgnore] ICommand OnSelect = default!,
[property: JsonIgnore] ICommand OnDelete = default!);

View File

@@ -0,0 +1,32 @@
using Nebula.Launcher.ProcessHelper;
using Nebula.Launcher.ViewModels.Popup;
using Nebula.Shared.Services;
namespace Nebula.Launcher.Models;
public sealed class ContentLogConsumer : IProcessLogConsumer
{
private readonly LogPopupModelView _currLog;
private readonly PopupMessageService _popupMessageService;
public ContentLogConsumer(LogPopupModelView currLog, PopupMessageService popupMessageService)
{
_currLog = currLog;
_popupMessageService = popupMessageService;
}
public void Out(string text)
{
_currLog.Append(text);
}
public void Error(string text)
{
_currLog.Append(text);
}
public void Fatal(string text)
{
_popupMessageService.Popup("Fatal error while stop instance:" + text);
}
}

View File

@@ -0,0 +1,8 @@
using Nebula.Launcher.ViewModels.Pages;
namespace Nebula.Launcher.Models;
public interface IFilterConsumer
{
public void ProcessFilter(ServerFilter? serverFilter);
}

View File

@@ -8,5 +8,4 @@ public record ListItemTemplate(Type ModelType, string IconKey, string Label);
public record ServerListTabTemplate(IServerListProvider ServerListProvider, string TabName); public record ServerListTabTemplate(IServerListProvider ServerListProvider, string TabName);
public record ServerHubRecord( public record ServerHubRecord(
[property:JsonPropertyName("name")] string Name, [property:JsonPropertyName("name")] string Name,
[property:JsonPropertyName("url")] string MainUrl, [property:JsonPropertyName("url")] string MainUrl);
[property:JsonPropertyName("fallback")] string? Fallback);

View File

@@ -0,0 +1,40 @@
using System.Text.RegularExpressions;
using Avalonia.Media;
namespace Nebula.Launcher.Models;
public sealed class LogInfo
{
public string Category { get; set; } = "LOG";
public IBrush CategoryColor { get; set; } = Brush.Parse("#424242");
public string Message { get; set; } = "";
public static LogInfo FromString(string input)
{
var matches = Regex.Matches(input, @"(\[(?<c>.*)\] (?<m>.*))|(?<m>.*)");
var category = "All";
if (matches[0].Groups.TryGetValue("c", out var c)) category = c.Value;
var color = Brush.Parse("#444444");
switch (category)
{
case "DEBG":
color = Brush.Parse("#2436d4");
break;
case "ERRO":
color = Brush.Parse("#d42436");
break;
case "INFO":
color = Brush.Parse("#0ab3c9");
break;
}
var message = matches[0].Groups["m"].Value;
return new LogInfo
{
Category = category, Message = message, CategoryColor = color
};
}
}

View File

@@ -31,6 +31,7 @@
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/> <PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0"/> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0"/>
<PackageReference Include="libsodium" Version="1.0.20"/> <PackageReference Include="libsodium" Version="1.0.20"/>
<PackageReference Include="Robust.Natives" Version="0.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -53,6 +54,8 @@
<Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.pdb" DestinationFolder="$(OutDir)"/> <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.pdb" DestinationFolder="$(OutDir)"/>
<Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.deps.json" DestinationFolder="$(OutDir)"/> <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.deps.json" DestinationFolder="$(OutDir)"/>
<Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.runtimeconfig.json" DestinationFolder="$(OutDir)"/> <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.runtimeconfig.json" DestinationFolder="$(OutDir)"/>
<Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\0Harmony.dll" DestinationFolder="$(OutDir)"/>
</Target> </Target>
<Target Name="PublishCheck" AfterTargets="Publish"> <Target Name="PublishCheck" AfterTargets="Publish">
@@ -60,6 +63,8 @@
<Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.pdb" DestinationFolder="$(PublishDir)"/> <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.pdb" DestinationFolder="$(PublishDir)"/>
<Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.deps.json" DestinationFolder="$(PublishDir)"/> <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.deps.json" DestinationFolder="$(PublishDir)"/>
<Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.runtimeconfig.json" DestinationFolder="$(PublishDir)"/> <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.runtimeconfig.json" DestinationFolder="$(PublishDir)"/>
<Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\0Harmony.dll" DestinationFolder="$(PublishDir)"/>
</Target> </Target>
<ItemGroup> <ItemGroup>

View File

@@ -0,0 +1,25 @@
using System.Diagnostics;
using System.Text;
using System.Threading.Tasks;
using Nebula.Shared.Services;
namespace Nebula.Launcher.ProcessHelper;
public abstract class DotnetProcessStartInfoProviderBase(DotnetResolverService resolverService) : IProcessStartInfoProvider
{
protected abstract string GetDllPath();
public virtual async Task<ProcessStartInfo> GetProcessStartInfo()
{
return new ProcessStartInfo
{
FileName = await resolverService.EnsureDotnet(),
Arguments = GetDllPath(),
CreateNoWindow = true,
UseShellExecute = false,
RedirectStandardOutput = true,
RedirectStandardError = true,
StandardOutputEncoding = Encoding.UTF8
};
}
}

View File

@@ -0,0 +1,51 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Threading.Tasks;
using Nebula.Launcher.ViewModels.Pages;
using Nebula.Shared;
using Nebula.Shared.Models;
using Nebula.Shared.Services;
namespace Nebula.Launcher.ProcessHelper;
[ServiceRegister(isSingleton:false)]
public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverService, AccountInfoViewModel accountInfoViewModel) :
DotnetProcessStartInfoProviderBase(resolverService)
{
private string? _publicKey;
private RobustUrl _address = default!;
protected override string GetDllPath()
{
var path = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
return Path.Join(path, "Nebula.Runner.dll");
}
public GameProcessStartInfoProvider WithBuildInfo(string publicKey, RobustUrl address)
{
_publicKey = publicKey;
_address = address;
return this;
}
public override async Task<ProcessStartInfo> GetProcessStartInfo()
{
var baseStart = await base.GetProcessStartInfo();
var authProv = accountInfoViewModel.Credentials.Value;
if(authProv is null)
throw new Exception("Client is without selected auth");
baseStart.EnvironmentVariables["ROBUST_AUTH_USERID"] = authProv.UserId.ToString();
baseStart.EnvironmentVariables["ROBUST_AUTH_TOKEN"] = authProv.Token.Token;
baseStart.EnvironmentVariables["ROBUST_AUTH_SERVER"] = authProv.AuthServer;
baseStart.EnvironmentVariables["AUTH_LOGIN"] = authProv.Login;
baseStart.EnvironmentVariables["ROBUST_AUTH_PUBKEY"] = _publicKey;
baseStart.EnvironmentVariables["GAME_URL"] = _address.ToString();
return baseStart;
}
}

View File

@@ -0,0 +1,33 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Nebula.Shared;
using Nebula.Shared.Models;
using Nebula.Shared.Services;
namespace Nebula.Launcher.ProcessHelper;
[ServiceRegister]
public sealed class GameRunnerPreparer(IServiceProvider provider, ContentService contentService, EngineService engineService)
{
public async Task<ProcessRunHandler<GameProcessStartInfoProvider>> GetGameProcessStartInfoProvider(RobustUrl address, ILoadingHandler loadingHandler, CancellationToken cancellationToken = default)
{
var buildInfo = await contentService.GetBuildInfo(address, cancellationToken);
var engine = await engineService.EnsureEngine(buildInfo.BuildInfo.Build.EngineVersion);
if (engine is null)
throw new Exception("Engine version not found: " + buildInfo.BuildInfo.Build.EngineVersion);
await contentService.EnsureItems(buildInfo.RobustManifestInfo, loadingHandler, cancellationToken);
await engineService.EnsureEngineModules("Robust.Client.WebView", buildInfo.BuildInfo.Build.EngineVersion);
var gameInfo =
provider.GetService<GameProcessStartInfoProvider>()!.WithBuildInfo(buildInfo.BuildInfo.Auth.PublicKey,
address);
var gameProcessRunHandler = new ProcessRunHandler<GameProcessStartInfoProvider>(gameInfo);
return gameProcessRunHandler;
}
}

View File

@@ -0,0 +1,6 @@
namespace Nebula.Launcher.ProcessHelper;
public interface IProcessConsumerCollection
{
public void RegisterLogger(IProcessLogConsumer consumer);
}

View File

@@ -0,0 +1,8 @@
namespace Nebula.Launcher.ProcessHelper;
public interface IProcessLogConsumer
{
public void Out(string text);
public void Error(string text);
public void Fatal(string text);
}

View File

@@ -0,0 +1,9 @@
using System.Diagnostics;
using System.Threading.Tasks;
namespace Nebula.Launcher.ProcessHelper;
public interface IProcessStartInfoProvider
{
public Task<ProcessStartInfo> GetProcessStartInfo();
}

View File

@@ -0,0 +1,37 @@
using System.Collections.Generic;
namespace Nebula.Launcher.ProcessHelper;
public sealed class ProcessLogConsumerCollection: IProcessLogConsumer, IProcessConsumerCollection
{
private readonly List<IProcessLogConsumer> _consumers = [];
public void RegisterLogger(IProcessLogConsumer consumer)
{
_consumers.Add(consumer);
}
public void Out(string text)
{
foreach (var consumer in _consumers)
{
consumer.Out(text);
}
}
public void Error(string text)
{
foreach (var consumer in _consumers)
{
consumer.Error(text);
}
}
public void Fatal(string text)
{
foreach (var consumer in _consumers)
{
consumer.Fatal(text);
}
}
}

View File

@@ -0,0 +1,137 @@
using System;
using System.Diagnostics;
using System.Threading.Tasks;
using Nebula.Shared.Services;
using Nebula.Shared.Services.Logging;
namespace Nebula.Launcher.ProcessHelper;
public class ProcessRunHandler<T> : IProcessConsumerCollection, IDisposable where T: IProcessStartInfoProvider
{
private ProcessStartInfo? _processInfo;
private Task<ProcessStartInfo>? _processInfoTask;
private Process? _process;
private ProcessLogConsumerCollection _consumerCollection = new();
private string _lastError = string.Empty;
private readonly T _currentProcessStartInfoProvider;
public T GetCurrentProcessStartInfo() => _currentProcessStartInfoProvider;
public bool IsRunning => _processInfo is not null;
public Action<ProcessRunHandler<T>>? OnProcessExited;
public void RegisterLogger(IProcessLogConsumer consumer)
{
_consumerCollection.RegisterLogger(consumer);
}
public ProcessRunHandler(T processStartInfoProvider)
{
_currentProcessStartInfoProvider = processStartInfoProvider;
_processInfoTask = _currentProcessStartInfoProvider.GetProcessStartInfo();
_processInfoTask.GetAwaiter().OnCompleted(OnInfoProvided);
}
private void OnInfoProvided()
{
if (_processInfoTask == null)
return;
_processInfo = _processInfoTask.GetAwaiter().GetResult();
_processInfoTask = null;
}
public void Start()
{
if (_processInfoTask != null)
{
_processInfoTask.Wait();
}
_process = Process.Start(_processInfo!);
if (_process is null) return;
_process.EnableRaisingEvents = true;
_process.BeginOutputReadLine();
_process.BeginErrorReadLine();
_process.OutputDataReceived += OnOutputDataReceived;
_process.ErrorDataReceived += OnErrorDataReceived;
_process.Exited += OnExited;
}
public void Stop()
{
_process?.CloseMainWindow();
}
private void OnExited(object? sender, EventArgs e)
{
if (_process is null) return;
_process.OutputDataReceived -= OnOutputDataReceived;
_process.ErrorDataReceived -= OnErrorDataReceived;
_process.Exited -= OnExited;
if (_process.ExitCode != 0)
_consumerCollection.Fatal(_lastError);
_process.Dispose();
_process = null;
OnProcessExited?.Invoke(this);
}
private void OnErrorDataReceived(object sender, DataReceivedEventArgs e)
{
if (e.Data != null)
{
_lastError = e.Data;
_consumerCollection.Error(e.Data);
}
}
private void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
{
if (e.Data != null)
{
_consumerCollection.Out(e.Data);
}
}
public void Dispose()
{
_processInfoTask?.Dispose();
_process?.Dispose();
}
}
public sealed class DebugLoggerBridge : IProcessLogConsumer
{
private ILogger _logger;
public DebugLoggerBridge(ILogger logger)
{
_logger = logger;
}
public void Out(string text)
{
_logger.Log(LoggerCategory.Log, text);
}
public void Error(string text)
{
_logger.Log(LoggerCategory.Error, text);
}
public void Fatal(string text)
{
_logger.Log(LoggerCategory.Error, text);
}
}

View File

@@ -1,9 +1,14 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.Media;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Nebula.Launcher.ViewModels; using Nebula.Launcher.ViewModels;
using Nebula.Launcher.ViewModels.Pages; using Nebula.Launcher.ViewModels.Pages;
using Nebula.Launcher.ViewModels.Popup;
using Nebula.Shared; using Nebula.Shared;
using Nebula.Shared.Models; using Nebula.Shared.Models;
using Nebula.Shared.Services; using Nebula.Shared.Services;
@@ -11,19 +16,20 @@ using Nebula.Shared.Utils;
namespace Nebula.Launcher.ServerListProviders; namespace Nebula.Launcher.ServerListProviders;
[ServiceRegister(), ConstructGenerator] [ServiceRegister, ConstructGenerator]
public sealed partial class FavoriteServerListProvider : IServerListProvider, IServerListDirtyInvoker public sealed partial class FavoriteServerListProvider : IServerListProvider, IServerListDirtyInvoker
{ {
[GenerateProperty] private ConfigurationService ConfigurationService { get; } [GenerateProperty] private ConfigurationService ConfigurationService { get; }
[GenerateProperty] private RestService RestService { get; } [GenerateProperty] private IServiceProvider ServiceProvider { get; }
[GenerateProperty] private ServerViewContainer ServerViewContainer { get; } [GenerateProperty] private ServerViewContainer ServerViewContainer { get; }
private List<IFilterConsumer> _serverLists = []; private List<IListEntryModelView> _serverLists = [];
private string[] rawServerLists = [];
public bool IsLoaded { get; private set; } public bool IsLoaded { get; private set; }
public Action? OnLoaded { get; set; } public Action? OnLoaded { get; set; }
public Action? Dirty { get; set; } public Action? Dirty { get; set; }
public IEnumerable<IFilterConsumer> GetServers() public IEnumerable<IListEntryModelView> GetServers()
{ {
return _serverLists; return _serverLists;
} }
@@ -38,19 +44,21 @@ public sealed partial class FavoriteServerListProvider : IServerListProvider, IS
IsLoaded = false; IsLoaded = false;
_serverLists.Clear(); _serverLists.Clear();
var servers = GetFavoriteEntries(); var servers = GetFavoriteEntries();
_serverLists.AddRange( var serverEntries = servers.Select(s =>
servers.Select(s => ServerViewContainer.Get(s.ToRobustUrl())
ServerViewContainer.Get(s.ToRobustUrl())
)
); );
_serverLists.AddRange(serverEntries);
_serverLists.Add(new AddFavoriteButton(ServiceProvider));
IsLoaded = true; IsLoaded = true;
OnLoaded?.Invoke(); OnLoaded?.Invoke();
} }
public void AddFavorite(ServerEntryModelView entryModelView) public void AddFavorite(ServerEntryModelView entryModelView)
{ {
entryModelView.IsFavorite = true;
AddFavorite(entryModelView.Address); AddFavorite(entryModelView.Address);
} }
@@ -59,7 +67,7 @@ public sealed partial class FavoriteServerListProvider : IServerListProvider, IS
var servers = GetFavoriteEntries(); var servers = GetFavoriteEntries();
servers.Add(robustUrl.ToString()); servers.Add(robustUrl.ToString());
ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray()); ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray());
Dirty?.Invoke(); if(ServerViewContainer.Get(robustUrl) is IFavoriteEntryModelView favoriteView) favoriteView.IsFavorite = true;
} }
public void RemoveFavorite(ServerEntryModelView entryModelView) public void RemoveFavorite(ServerEntryModelView entryModelView)
@@ -67,14 +75,57 @@ public sealed partial class FavoriteServerListProvider : IServerListProvider, IS
var servers = GetFavoriteEntries(); var servers = GetFavoriteEntries();
servers.Remove(entryModelView.Address.ToString()); servers.Remove(entryModelView.Address.ToString());
ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray()); ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray());
Dirty?.Invoke(); }
public void RemoveFavorite(RobustUrl url)
{
var servers = GetFavoriteEntries();
servers.Remove(url.ToString());
ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray());
} }
private List<string> GetFavoriteEntries() private List<string> GetFavoriteEntries()
{ {
return ConfigurationService.GetConfigValue(LauncherConVar.Favorites)?.ToList() ?? []; return rawServerLists.ToList();
} }
private void Initialise(){} private void Initialise()
{
ConfigurationService.SubscribeVarChanged(LauncherConVar.Favorites, OnVarChanged, true);
}
private void OnVarChanged(string[]? value)
{
if (value == null)
{
rawServerLists = [];
Dirty?.Invoke();
return;
}
rawServerLists = value;
Dirty?.Invoke();
}
private void InitialiseInDesignMode(){} private void InitialiseInDesignMode(){}
}
public class AddFavoriteButton: Border, IListEntryModelView{
private Button _addFavoriteButton = new Button();
public AddFavoriteButton(IServiceProvider serviceProvider)
{
Margin = new Thickness(5, 5, 5, 20);
Background = new SolidColorBrush(Color.Parse("#222222"));
CornerRadius = new CornerRadius(20f);
_addFavoriteButton.HorizontalAlignment = HorizontalAlignment.Center;
_addFavoriteButton.Click += (sender, args) =>
{
serviceProvider.GetService<PopupMessageService>()!.Popup(
serviceProvider.GetService<AddFavoriteViewModel>()!);
};
_addFavoriteButton.Content = "Add Favorite";
Child = _addFavoriteButton;
}
public bool IsFavorite { get; set; }
} }

View File

@@ -24,7 +24,7 @@ public sealed partial class HubServerListProvider : IServerListProvider
public Action? OnLoaded { get; set; } public Action? OnLoaded { get; set; }
private CancellationTokenSource? _cts; private CancellationTokenSource? _cts;
private readonly List<ServerEntryModelView> _servers = []; private readonly List<IListEntryModelView> _servers = [];
private readonly List<Exception> _errors = []; private readonly List<Exception> _errors = [];
public HubServerListProvider With(string hubUrl) public HubServerListProvider With(string hubUrl)
@@ -33,7 +33,7 @@ public sealed partial class HubServerListProvider : IServerListProvider
return this; return this;
} }
public IEnumerable<IFilterConsumer> GetServers() public IEnumerable<IListEntryModelView> GetServers()
{ {
return _servers; return _servers;
} }
@@ -74,6 +74,7 @@ public sealed partial class HubServerListProvider : IServerListProvider
catch (Exception e) catch (Exception e)
{ {
_errors.Add(new Exception($"Some error while loading server list from {HubUrl}. See inner exception", e)); _errors.Add(new Exception($"Some error while loading server list from {HubUrl}. See inner exception", e));
_errors.Add(e);
} }
IsLoaded = true; IsLoaded = true;

View File

@@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Nebula.Launcher.ViewModels; using Nebula.Launcher.ViewModels;
using Nebula.Launcher.ViewModels.Pages;
namespace Nebula.Launcher.ServerListProviders; namespace Nebula.Launcher.ServerListProviders;
@@ -9,7 +10,7 @@ public interface IServerListProvider
public bool IsLoaded { get; } public bool IsLoaded { get; }
public Action? OnLoaded { get; set; } public Action? OnLoaded { get; set; }
public IEnumerable<IFilterConsumer> GetServers(); public IEnumerable<IListEntryModelView> GetServers();
public IEnumerable<Exception> GetErrors(); public IEnumerable<Exception> GetErrors();
public void LoadServerList(); public void LoadServerList();

View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Nebula.Launcher.Controls; using Nebula.Launcher.Controls;
using Nebula.Launcher.ViewModels; using Nebula.Launcher.ViewModels;
using Nebula.Launcher.ViewModels.Pages;
namespace Nebula.Launcher.ServerListProviders; namespace Nebula.Launcher.ServerListProviders;
@@ -9,7 +10,7 @@ public sealed class TestServerList : IServerListProvider
{ {
public bool IsLoaded => true; public bool IsLoaded => true;
public Action? OnLoaded { get; set; } public Action? OnLoaded { get; set; }
public IEnumerable<IFilterConsumer> GetServers() public IEnumerable<IListEntryModelView> GetServers()
{ {
return [new ServerEntryModelView(),new ServerEntryModelView()]; return [new ServerEntryModelView(),new ServerEntryModelView()];
} }

View File

@@ -7,6 +7,7 @@ using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Threading; using Avalonia.Threading;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Nebula.Launcher.Views; using Nebula.Launcher.Views;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher; namespace Nebula.Launcher;

View File

@@ -0,0 +1,34 @@
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Nebula.Shared;
namespace Nebula.Launcher.Services;
public static class ExplorerHelper
{
public static void OpenFolder(string path)
{
string command;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
command = "explorer.exe";
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
command = "xdg-open";
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
command = "open";
else
throw new PlatformNotSupportedException("Unsupported OS platform");
var startInfo = new ProcessStartInfo
{
FileName = command,
Arguments = path,
UseShellExecute = false
};
Process.Start(startInfo);
}
}

View File

@@ -1,6 +1,8 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using Avalonia.Markup.Xaml;
using Avalonia.Platform; using Avalonia.Platform;
using Fluent.Net; using Fluent.Net;
using Nebula.Shared; using Nebula.Shared;
@@ -12,35 +14,66 @@ namespace Nebula.Launcher.Services;
public partial class LocalisationService public partial class LocalisationService
{ {
[GenerateProperty] private ConfigurationService ConfigurationService { get; } [GenerateProperty] private ConfigurationService ConfigurationService { get; }
[GenerateProperty] private DebugService DebugService { get; }
private CultureInfo _currentCultureInfo = CultureInfo.CurrentCulture;
private MessageContext _currentMessageContext;
private CultureInfo _currentCultureInfo = CultureInfo.CurrentCulture;
private static MessageContext? _currentMessageContext;
private void Initialise() private void Initialise()
{ {
// LoadLanguage(CultureInfo.GetCultureInfo(ConfigurationService.GetConfigValue(LauncherConVar.CurrentLang)!)); LoadLanguage(CultureInfo.GetCultureInfo(ConfigurationService.GetConfigValue(LauncherConVar.CurrentLang)!));
} }
public void LoadLanguage(CultureInfo cultureInfo) public void LoadLanguage(CultureInfo cultureInfo)
{ {
_currentCultureInfo = cultureInfo; try
using var fs = AssetLoader.Open(new Uri($@"Assets/lang/{_currentCultureInfo.EnglishName}.ftl"));
using var sr = new StreamReader(fs);
var options = new MessageContextOptions { UseIsolating = false };
var mc = new MessageContext(cultureInfo.EnglishName, options);
var errors = mc.AddMessages(sr);
foreach (var error in errors)
{ {
Console.WriteLine(error); _currentCultureInfo = cultureInfo;
} using var fs = AssetLoader.Open(new Uri($@"avares://Nebula.Launcher/Assets/lang/{_currentCultureInfo.Name}.ftl"));
using var sr = new StreamReader(fs);
_currentMessageContext = mc; var options = new MessageContextOptions { UseIsolating = false };
var mc = new MessageContext(cultureInfo.Name, options);
var errors = mc.AddMessages(sr);
foreach (var error in errors)
{
Console.WriteLine(error);
}
_currentMessageContext = mc;
} catch (Exception e) {
DebugService.GetLogger("localisationService").Error(e);
LoadLanguage(CultureInfo.GetCultureInfo("en-US"));
}
} }
private void InitialiseInDesignMode() private void InitialiseInDesignMode()
{ {
Initialise(); Initialise();
} }
public static string GetString(string locale, Dictionary<string, object>? options = null)
{
if (_currentMessageContext is null)
{
return locale;
}
var message = _currentMessageContext.GetMessage(locale);
if (message == null) return locale;
return _currentMessageContext.Format(message, options ?? []);
}
} }
public class LocaledText : MarkupExtension
{
public string Key { get; set; }
public Dictionary<string, object>? Options { get; set; }
public LocaledText(string key) => Key = key;
public override object ProvideValue(IServiceProvider serviceProvider)
{
return LocalisationService.GetString(Key, Options);
}
}

View File

@@ -1,16 +0,0 @@
using System;
namespace Nebula.Launcher.ViewHelper;
[AttributeUsage(AttributeTargets.Class)]
public class ViewModelRegisterAttribute : Attribute
{
public ViewModelRegisterAttribute(Type? type = null, bool isSingleton = true)
{
Type = type;
IsSingleton = isSingleton;
}
public Type? Type { get; }
public bool IsSingleton { get; }
}

View File

@@ -4,6 +4,7 @@ using Avalonia.Controls;
using Avalonia.Controls.Templates; using Avalonia.Controls.Templates;
using Nebula.Launcher.ViewModels; using Nebula.Launcher.ViewModels;
using Nebula.Launcher.Views; using Nebula.Launcher.Views;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher; namespace Nebula.Launcher;

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Avalonia.Logging;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using Nebula.Launcher.Models; using Nebula.Launcher.Models;
@@ -10,10 +11,10 @@ using Nebula.Launcher.Services;
using Nebula.Launcher.ViewModels.Pages; using Nebula.Launcher.ViewModels.Pages;
using Nebula.Launcher.ViewModels.Popup; using Nebula.Launcher.ViewModels.Popup;
using Nebula.Launcher.Views; using Nebula.Launcher.Views;
using Nebula.Shared.Models;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.Services.Logging; using Nebula.Shared.Services.Logging;
using Nebula.Shared.Utils; using Nebula.Shared.Utils;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels; namespace Nebula.Launcher.ViewModels;
@@ -23,10 +24,10 @@ public partial class MainViewModel : ViewModelBase
{ {
private readonly List<ListItemTemplate> _templates = private readonly List<ListItemTemplate> _templates =
[ [
new ListItemTemplate(typeof(AccountInfoViewModel), "user", "Account"), new ListItemTemplate(typeof(AccountInfoViewModel), "user", "tab-account"),
new ListItemTemplate(typeof(ServerOverviewModel), "file", "Servers"), new ListItemTemplate(typeof(ServerOverviewModel), "file", "tab-servers"),
new ListItemTemplate(typeof(ContentBrowserViewModel), "folder", "Content"), new ListItemTemplate(typeof(ContentBrowserViewModel), "folder", "tab-content"),
new ListItemTemplate(typeof(ConfigurationViewModel), "settings", "Settings") new ListItemTemplate(typeof(ConfigurationViewModel), "settings", "tab-settings")
]; ];
private readonly List<PopupViewModelBase> _viewQueue = new(); private readonly List<PopupViewModelBase> _viewQueue = new();
@@ -40,12 +41,15 @@ public partial class MainViewModel : ViewModelBase
[ObservableProperty] private bool _isPopupClosable = true; [ObservableProperty] private bool _isPopupClosable = true;
[ObservableProperty] private bool _popup; [ObservableProperty] private bool _popup;
[ObservableProperty] private ListItemTemplate? _selectedListItem; [ObservableProperty] private ListItemTemplate? _selectedListItem;
[ObservableProperty] private string? _loginText = LocalisationService.GetString("auth-current-login-no-name");
[GenerateProperty] private LocalisationService LocalisationService { get; } // Не убирать! Без этой хуйни вся локализация идет в пизду!
[GenerateProperty] private AccountInfoViewModel AccountInfoViewModel { get; }
[GenerateProperty] private DebugService DebugService { get; } = default!; [GenerateProperty] private DebugService DebugService { get; } = default!;
[GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!; [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
[GenerateProperty] private ContentService ContentService { get; } = default!; [GenerateProperty] private ContentService ContentService { get; } = default!;
[GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } = default!; [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } = default!;
[GenerateProperty] private FileService FileService { get; } = default!; [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
private ILogger _logger; private ILogger _logger;
@@ -53,12 +57,25 @@ public partial class MainViewModel : ViewModelBase
protected override void InitialiseInDesignMode() protected override void InitialiseInDesignMode()
{ {
Items = new ObservableCollection<ListItemTemplate>(_templates); Items = new ObservableCollection<ListItemTemplate>(_templates.Select(a=>
{
return a with { Label = LocalisationService.GetString(a.Label) };
}
));
RequirePage<AccountInfoViewModel>(); RequirePage<AccountInfoViewModel>();
} }
protected override void Initialise() protected override void Initialise()
{ {
AccountInfoViewModel.Credentials.PropertyChanged += (_, args) =>
{
if (args.PropertyName is not nameof(AccountInfoViewModel.Credentials.Value))
return;
UpdateCredentialsInfo();
};
UpdateCredentialsInfo();
_logger = DebugService.GetLogger(this); _logger = DebugService.GetLogger(this);
using var stream = typeof(MainViewModel).Assembly using var stream = typeof(MainViewModel).Assembly
@@ -73,18 +90,54 @@ public partial class MainViewModel : ViewModelBase
PopupMessageService.OnCloseRequired += OnPopupCloseRequired; PopupMessageService.OnCloseRequired += OnPopupCloseRequired;
CheckMigration(); CheckMigration();
var loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
loadingHandler.LoadingName = LocalisationService.GetString("migration-config-task");
loadingHandler.IsCancellable = false;
ConfigurationService.MigrateConfigs(loadingHandler);
if (!VCRuntimeDllChecker.AreVCRuntimeDllsPresent())
{
OnPopupRequired(LocalisationService.GetString("vcruntime-check-error"));
Helper.OpenBrowser("https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170");
}
}
private void UpdateCredentialsInfo()
{
if(AccountInfoViewModel.Credentials.HasValue)
{
LoginText =
LocalisationService.GetString("auth-current-login-name",
new Dictionary<string, object>
{
{ "login", AccountInfoViewModel.Credentials.Value?.Login ?? "" },
{
"auth_server",
AccountInfoViewModel.GetServerAuthName(AccountInfoViewModel.Credentials.Value?.AuthServer) ?? ""
}
});
}
else
{
LoginText = LocalisationService.GetString("auth-current-login-no-name");
}
} }
private void CheckMigration() private void CheckMigration()
{ {
if (!ConfigurationService.GetConfigValue(LauncherConVar.DoMigration))
return;
var loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>(); var loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
loadingHandler.LoadingName = "Migration task, please wait..."; loadingHandler.LoadingName = LocalisationService.GetString("migration-label-task");
loadingHandler.IsCancellable = false; loadingHandler.IsCancellable = false;
if (!ContentService.CheckMigration(loadingHandler)) if (!ContentService.CheckMigration(loadingHandler))
return; return;
OnPopupRequired(loadingHandler); OnPopupRequired(loadingHandler);
ConfigurationService.SetConfigValue(LauncherConVar.DoMigration, false);
} }
partial void OnSelectedListItemChanged(ListItemTemplate? value) partial void OnSelectedListItemChanged(ListItemTemplate? value)
@@ -148,6 +201,16 @@ public partial class MainViewModel : ViewModelBase
Popup = true; Popup = true;
} }
public void OpenAuthPage()
{
RequirePage<AccountInfoViewModel>();
}
public void OpenRootPath()
{
ExplorerHelper.OpenFolder(FileService.RootPath);
}
public void OpenLink() public void OpenLink()
{ {
Helper.OpenBrowser("https://durenko.tatar/nebula"); Helper.OpenBrowser("https://durenko.tatar/nebula");
@@ -209,4 +272,29 @@ public partial class MainViewModel : ViewModelBase
CurrentPopup = viewModelBase; CurrentPopup = viewModelBase;
} }
}
public static class VCRuntimeDllChecker
{
public static bool AreVCRuntimeDllsPresent()
{
if (!OperatingSystem.IsWindows()) return true;
string systemDir = Environment.SystemDirectory;
string[] requiredDlls = {
"msvcp140.dll",
"vcruntime140.dll"
};
foreach (var dll in requiredDlls)
{
var path = Path.Combine(systemDir, dll);
if (!File.Exists(path))
{
return false;
}
}
return true;
}
} }

View File

@@ -2,18 +2,20 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Text.Json.Serialization; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Input;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using Nebula.Launcher.Configurations;
using Nebula.Launcher.Models.Auth;
using Nebula.Launcher.Services; using Nebula.Launcher.Services;
using Nebula.Launcher.ViewModels.Popup; using Nebula.Launcher.ViewModels.Popup;
using Nebula.Launcher.Views.Pages; using Nebula.Launcher.Views.Pages;
using Nebula.Shared; using Nebula.Shared.Configurations;
using Nebula.Shared.Models.Auth;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.Services.Logging; using Nebula.Shared.Services.Logging;
using Nebula.Shared.Utils; using Nebula.Shared.Utils;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Pages; namespace Nebula.Launcher.ViewModels.Pages;
@@ -22,62 +24,51 @@ namespace Nebula.Launcher.ViewModels.Pages;
public partial class AccountInfoViewModel : ViewModelBase public partial class AccountInfoViewModel : ViewModelBase
{ {
[ObservableProperty] private bool _authMenuExpand; [ObservableProperty] private bool _authMenuExpand;
[ObservableProperty] private bool _authUrlConfigExpand; [ObservableProperty] private bool _authUrlConfigExpand;
[ObservableProperty] private int _authViewSpan = 1; [ObservableProperty] private int _authViewSpan = 1;
[ObservableProperty] private string _currentAuthServer = string.Empty; [ObservableProperty] private string _currentAuthServer = string.Empty;
[ObservableProperty] private string _currentLogin = string.Empty; [ObservableProperty] private string _currentLogin = string.Empty;
[ObservableProperty] private string _currentPassword = string.Empty; [ObservableProperty] private string _currentPassword = string.Empty;
[ObservableProperty] private bool _isLogged; [ObservableProperty] private bool _isLogged;
[ObservableProperty] private bool _doRetryAuth;
private bool _isProfilesEmpty;
[GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
[GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
[GenerateProperty] private DebugService DebugService { get; }
[GenerateProperty] private AuthService AuthService { get; } = default!;
[GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } = default!;
public ObservableCollection<ProfileAuthCredentials> Accounts { get; } = new();
public ObservableCollection<AuthServerCredentials> AuthUrls { get; } = new();
[ObservableProperty] private AuthServerCredentials _authItemSelect; [ObservableProperty] private AuthServerCredentials _authItemSelect;
private ILogger _logger; private bool _isProfilesEmpty;
[GenerateProperty] private PopupMessageService PopupMessageService { get; }
[GenerateProperty] private ConfigurationService ConfigurationService { get; }
[GenerateProperty] private DebugService DebugService { get; }
[GenerateProperty] private AuthService AuthService { get; }
[GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; }
public ObservableCollection<ProfileEntry> Accounts { get; } = new();
public ObservableCollection<AuthServerCredentials> AuthUrls { get; } = new();
public ComplexConVarBinder<AuthTokenCredentials?> Credentials { get; private set; }
private ILogger _logger;
//Design think //Design think
protected override void InitialiseInDesignMode() protected override void InitialiseInDesignMode()
{ {
AddAccount(new AuthLoginPassword("Binka", "12341", "")); AuthUrls.Add(new AuthServerCredentials("Test",["example.com","variant.lab"]));
AddAccount(new AuthLoginPassword("Binka", "12341", ""));
AuthUrls.Add(new AuthServerCredentials("Test",["example.com"])); AddAccount(new ProfileAuthCredentials("Binka", "","example.com"));
AddAccount(new ProfileAuthCredentials("Vilka","", "variant.lab"));
} }
//Real think //Real think
protected override void Initialise() protected override void Initialise()
{ {
_logger = DebugService.GetLogger(this); _logger = DebugService.GetLogger(this);
ReadAuthConfig(); Credentials = new AuthTokenCredentialsVar(this);
Task.Run(ReadAuthConfig);
Credentials.Value = Credentials.Value;
} }
public void AuthByProfile(ProfileAuthCredentials credentials)
{
CurrentLogin = credentials.Login;
CurrentPassword = credentials.Password;
CurrentAuthServer = credentials.AuthServer;
DoAuth();
}
public void DoAuth(string? code = null) public void DoAuth(string? code = null)
{ {
var message = ViewHelperService.GetViewModel<InfoPopupViewModel>(); var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
message.InfoText = "Auth think, please wait..."; message.InfoText = LocalisationService.GetString("auth-processing");
message.IsInfoClosable = false; message.IsInfoClosable = false;
PopupMessageService.Popup(message); PopupMessageService.Popup(message);
@@ -91,69 +82,131 @@ public partial class AccountInfoViewModel : ViewModelBase
Task.Run(async () => Task.Run(async () =>
{ {
Exception? exception = null; Exception? exception = null;
foreach (var server in serverCandidates) foreach (var server in serverCandidates)
{ {
try try
{ {
await TryAuth(CurrentLogin, CurrentPassword, server,code); await CatchAuthError(async() =>
{
Credentials.Value = await AuthService.Auth(CurrentLogin, CurrentPassword, server, code);
}, ()=> message.Dispose());
break; break;
} }
catch (Exception e) catch (Exception ex)
{ {
exception = e; exception = new Exception(LocalisationService.GetString("auth-error"), ex);
} }
} }
message.Dispose(); message.Dispose();
if (!IsLogged) if (exception != null)
{ {
PopupMessageService.Popup(new Exception("No one of auth server is available.", exception)); PopupMessageService.Popup(new Exception("Error while auth", exception));
} }
}); });
} }
private async Task TryAuth(string login, string password, string authServer,string? code) private async Task CatchAuthError(Func<Task> a, Action? onError)
{ {
DoRetryAuth = false;
try try
{ {
await AuthService.Auth(new AuthLoginPassword(login, password, authServer), code); await a();
CurrentLogin = login;
CurrentPassword = password;
CurrentAuthServer = authServer;
IsLogged = true;
ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, AuthService.SelectedAuth);
} }
catch (AuthException e) catch (AuthException e)
{ {
onError?.Invoke();
switch (e.Error.Code) switch (e.Error.Code)
{ {
case AuthenticateDenyCode.TfaRequired: case AuthenticateDenyCode.TfaRequired:
case AuthenticateDenyCode.TfaInvalid: case AuthenticateDenyCode.TfaInvalid:
var p = ViewHelperService.GetViewModel<TfaViewModel>(); var p = ViewHelperService.GetViewModel<TfaViewModel>();
p.OnTfaEntered += OnTfaEntered;
PopupMessageService.Popup(p); PopupMessageService.Popup(p);
_logger.Log("TFA required"); _logger.Log("TFA required");
break; break;
case AuthenticateDenyCode.InvalidCredentials: case AuthenticateDenyCode.InvalidCredentials:
PopupMessageService.Popup("Invalid Credentials!"); PopupError(LocalisationService.GetString("auth-invalid-credentials"), e);
_logger.Error($"Invalid credentials"); break;
case AuthenticateDenyCode.AccountLocked:
PopupError(LocalisationService.GetString("auth-account-locked"), e);
break;
case AuthenticateDenyCode.AccountUnconfirmed:
PopupError(LocalisationService.GetString("auth-account-unconfirmed"), e);
break;
case AuthenticateDenyCode.None:
PopupError(LocalisationService.GetString("auth-none"),e);
break; break;
default: default:
throw; PopupError(LocalisationService.GetString("auth-error-fuck"), e);
break;
}
}
catch (HttpRequestException e)
{
onError?.Invoke();
switch (e.HttpRequestError)
{
case HttpRequestError.ConnectionError:
PopupError(LocalisationService.GetString("auth-connection-error"), e);
DoRetryAuth = true;
break;
case HttpRequestError.NameResolutionError:
PopupError(LocalisationService.GetString("auth-name-resolution-error"), e);
DoRetryAuth = true;
break;
case HttpRequestError.SecureConnectionError:
PopupError(LocalisationService.GetString("auth-secure-error"), e);
DoRetryAuth = true;
break;
case HttpRequestError.UserAuthenticationError:
PopupError(LocalisationService.GetString("auth-user-authentication-error"), e);
break;
case HttpRequestError.Unknown:
PopupError(LocalisationService.GetString("auth-unknown"), e);
break;
case HttpRequestError.HttpProtocolError:
PopupError(LocalisationService.GetString("auth-http-protocol-error"), e);
break;
case HttpRequestError.ExtendedConnectNotSupported:
PopupError(LocalisationService.GetString("auth-extended-connect-not-support"), e);
break;
case HttpRequestError.VersionNegotiationError:
PopupError(LocalisationService.GetString("auth-version-negotiation-error"), e);
break;
case HttpRequestError.ProxyTunnelError:
PopupError(LocalisationService.GetString("auth-proxy-tunnel-error"), e);
break;
case HttpRequestError.InvalidResponse:
PopupError(LocalisationService.GetString("auth-invalid-response"), e);
break;
case HttpRequestError.ResponseEnded:
PopupError(LocalisationService.GetString("auth-response-ended"), e);
break;
case HttpRequestError.ConfigurationLimitExceeded:
PopupError(LocalisationService.GetString("auth-configuration-limit-exceeded"), e);
break;
default:
var authError = new Exception(LocalisationService.GetString("auth-error"), e);
_logger.Error(authError);
PopupMessageService.Popup(authError);
break;
} }
} }
} }
private void OnTfaEntered(string code)
{
DoAuth(code);
}
public void Logout() public void Logout()
{ {
IsLogged = false; Credentials.Value = null;
AuthService.ClearAuth(); CurrentAuthServer = "";
}
public string GetServerAuthName(string? url)
{
if (url is null) return "";
return AuthUrls.FirstOrDefault(p => p.Servers.Contains(url))?.Name ?? "CustomAuth";
} }
private void UpdateAuthMenu() private void UpdateAuthMenu()
@@ -164,15 +217,22 @@ public partial class AccountInfoViewModel : ViewModelBase
AuthViewSpan = 1; AuthViewSpan = 1;
} }
private void AddAccount(AuthLoginPassword authLoginPassword) private void AddAccount(ProfileAuthCredentials credentials)
{ {
var onDelete = new DelegateCommand<ProfileAuthCredentials>(OnDeleteProfile); var onDelete = new DelegateCommand<ProfileEntry>(OnDeleteProfile);
var onSelect = new DelegateCommand<ProfileAuthCredentials>(AuthByProfile); var onSelect = new DelegateCommand<ProfileEntry>((p) =>
{
CurrentLogin = p.Credentials.Login;
CurrentPassword = p.Credentials.Password;
CurrentAuthServer = p.Credentials.AuthServer;
DoAuth();
});
var serverName = GetServerAuthName(credentials.AuthServer);
var alpm = new ProfileAuthCredentials( var alpm = new ProfileEntry(
authLoginPassword.Login, credentials,
authLoginPassword.Password, serverName,
authLoginPassword.AuthServer,
onSelect, onSelect,
onDelete); onDelete);
@@ -182,54 +242,100 @@ public partial class AccountInfoViewModel : ViewModelBase
Accounts.Add(alpm); Accounts.Add(alpm);
} }
private async void ReadAuthConfig() private async Task ReadAuthConfig()
{ {
var message = ViewHelperService.GetViewModel<InfoPopupViewModel>(); var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
message.InfoText = "Read configuration file, please wait..."; message.InfoText = LocalisationService.GetString("auth-config-read");
message.IsInfoClosable = false; message.IsInfoClosable = false;
PopupMessageService.Popup(message); PopupMessageService.Popup(message);
foreach (var profile in
ConfigurationService.GetConfigValue(LauncherConVar.AuthProfiles)!) _logger.Log("Reading auth config");
AddAccount(new AuthLoginPassword(profile.Login, profile.Password, profile.AuthServer));
if (Accounts.Count == 0) UpdateAuthMenu();
AuthUrls.Clear(); AuthUrls.Clear();
var authUrls = ConfigurationService.GetConfigValue(LauncherConVar.AuthServers)!; var authUrls = ConfigurationService.GetConfigValue(LauncherConVar.AuthServers)!;
foreach (var url in authUrls) AuthUrls.Add(url); foreach (var url in authUrls) AuthUrls.Add(url);
if(authUrls.Length > 0) AuthItemSelect = authUrls[0]; if(authUrls.Length > 0) AuthItemSelect = authUrls[0];
var currProfile = ConfigurationService.GetConfigValue(LauncherConVar.AuthCurrent); var profileCandidates = new List<string>();
if (currProfile != null) foreach (var profileRaw in
ConfigurationService.GetConfigValue(LauncherConVar.AuthProfiles)!)
{ {
_logger.Log($"Decrypting profile...");
try try
{ {
CurrentLogin = currProfile.Login; var decoded =
CurrentAuthServer = currProfile.AuthServer; await CryptographicStore.Decrypt<ProfileAuthCredentials>(profileRaw,
CryptographicStore.GetComputerKey());
IsLogged = await AuthService.SetAuth(currProfile);
_logger.Log($"Decrypted profile: {decoded.Login}");
profileCandidates.Add(profileRaw);
AddAccount(decoded);
} }
catch (Exception e) catch (Exception e)
{ {
message.Dispose(); _logger.Error("Error while decrypting profile");
PopupMessageService.Popup(e); _logger.Error(e);
} }
} }
ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles, profileCandidates.ToArray());
if (Accounts.Count == 0) UpdateAuthMenu();
message.Dispose(); message.Dispose();
} }
[RelayCommand] public void DoCurrentAuth()
private void OnSaveProfile()
{ {
AddAccount(new AuthLoginPassword(CurrentLogin, CurrentPassword, CurrentAuthServer)); DoAuth();
}
private async Task<AuthTokenCredentials?> CheckOrRenewToken(AuthTokenCredentials? authTokenCredentials)
{
if(authTokenCredentials is null)
return null;
var daysLeft = (int)(authTokenCredentials.Token.ExpireTime - DateTime.Now).TotalDays;
if(daysLeft >= 4)
{
_logger.Log("Token " + authTokenCredentials.Login + " is active, "+daysLeft+" days left, undo renewing!");
return authTokenCredentials;
}
try
{
_logger.Log($"Renewing token for {authTokenCredentials.Login}");
return await ExceptionHelper.TryRun(() => AuthService.Refresh(authTokenCredentials), 3,
(attempt, e) => { _logger.Error(new Exception("Error while renewing, attempts: " + attempt, e)); });
}
catch (AuthTokenExpiredException e)
{
_logger.Error(e);
return null;
}
catch (Exception e)
{
var unexpectedError = new Exception(LocalisationService.GetString("auth-error"), e);
_logger.Error(unexpectedError);
return authTokenCredentials;
}
}
public void OnSaveProfile()
{
if(Credentials.Value is null ||
string.IsNullOrEmpty(CurrentPassword)) return;
AddAccount(new ProfileAuthCredentials(CurrentLogin, CurrentPassword, Credentials.Value.AuthServer));
_isProfilesEmpty = Accounts.Count == 0; _isProfilesEmpty = Accounts.Count == 0;
UpdateAuthMenu(); UpdateAuthMenu();
DirtyProfile(); DirtyProfile();
} }
private void OnDeleteProfile(ProfileAuthCredentials account) private void OnDeleteProfile(ProfileEntry account)
{ {
Accounts.Remove(account); Accounts.Remove(account);
_isProfilesEmpty = Accounts.Count == 0; _isProfilesEmpty = Accounts.Count == 0;
@@ -237,14 +343,23 @@ public partial class AccountInfoViewModel : ViewModelBase
DirtyProfile(); DirtyProfile();
} }
[RelayCommand] private void PopupError(string message, Exception e)
private void OnExpandAuthUrl() {
message = LocalisationService.GetString("auth-error-occured") + message;
_logger.Error(new Exception(message, e));
var messageView = ViewHelperService.GetViewModel<InfoPopupViewModel>();
messageView.InfoText = message;
messageView.IsInfoClosable = true;
PopupMessageService.Popup(messageView);
}
public void OnExpandAuthUrl()
{ {
AuthUrlConfigExpand = !AuthUrlConfigExpand; AuthUrlConfigExpand = !AuthUrlConfigExpand;
} }
[RelayCommand] public void OnExpandAuthView()
private void OnExpandAuthView()
{ {
AuthMenuExpand = !AuthMenuExpand; AuthMenuExpand = !AuthMenuExpand;
UpdateAuthMenu(); UpdateAuthMenu();
@@ -253,19 +368,77 @@ public partial class AccountInfoViewModel : ViewModelBase
private void DirtyProfile() private void DirtyProfile()
{ {
ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles, ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles,
Accounts.ToArray()); Accounts.Select(a => CryptographicStore.Encrypt(a.Credentials, CryptographicStore.GetComputerKey())).ToArray());
}
public sealed class AuthTokenCredentialsVar(AccountInfoViewModel accountInfoViewModel)
: ComplexConVarBinder<AuthTokenCredentials?>(
accountInfoViewModel.ConfigurationService.SubscribeVarChanged(LauncherConVar.AuthCurrent))
{
protected override async Task<AuthTokenCredentials?> OnValueChange(AuthTokenCredentials? currProfile)
{
if (currProfile is null)
{
accountInfoViewModel.IsLogged = false;
accountInfoViewModel._logger.Log("clearing credentials");
return null;
}
var message = accountInfoViewModel.ViewHelperService.GetViewModel<InfoPopupViewModel>();
message.InfoText = LocalisationService.GetString("auth-try-auth-config");
message.IsInfoClosable = false;
accountInfoViewModel.PopupMessageService.Popup(message);
accountInfoViewModel._logger.Log($"trying auth with {currProfile.Login}");
var errorRun = false;
currProfile = await accountInfoViewModel.CheckOrRenewToken(currProfile);
if (currProfile is null)
{
message.Dispose();
accountInfoViewModel._logger.Log("profile credentials update required!");
accountInfoViewModel.PopupMessageService.Popup("profile credentials update required!");
accountInfoViewModel.IsLogged = false;
return null;
}
try
{
await accountInfoViewModel.CatchAuthError(async () =>
{
await accountInfoViewModel.AuthService.EnsureToken(currProfile);
}, () =>
{
message.Dispose();
errorRun = true;
});
message.Dispose();
}
catch (Exception ex)
{
accountInfoViewModel.CurrentLogin = currProfile.Login;
accountInfoViewModel.CurrentAuthServer = currProfile.AuthServer;
var unexpectedError = new Exception(LocalisationService.GetString("auth-error"), ex);
accountInfoViewModel._logger.Error(unexpectedError);
accountInfoViewModel.PopupMessageService.Popup(unexpectedError);
errorRun = true;
}
if (errorRun)
{
accountInfoViewModel.IsLogged = false;
return null;
}
accountInfoViewModel.IsLogged = true;
return currProfile;
}
} }
} }
public sealed record ProfileAuthCredentials(
string Login,
string Password,
string AuthServer,
[property: JsonIgnore] ICommand OnSelect = default!,
[property: JsonIgnore] ICommand OnDelete = default!
);
public sealed record AuthServerCredentials(
string Name,
string[] Servers
);

View File

@@ -1,142 +1,115 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.ComponentModel; using System.IO;
using System.Linq; using System.IO.Compression;
using System.Runtime.CompilerServices; using System.Threading.Tasks;
using CommunityToolkit.Mvvm.ComponentModel; using Nebula.Launcher.Services;
using Microsoft.Extensions.DependencyInjection; using Nebula.Launcher.ViewModels.Popup;
using Nebula.Launcher.Views.Config;
using Nebula.Launcher.Views.Pages; using Nebula.Launcher.Views.Pages;
using Nebula.Shared;
using Nebula.Shared.Configurations;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using BindingFlags = System.Reflection.BindingFlags; using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Pages; namespace Nebula.Launcher.ViewModels.Pages;
[ViewModelRegister(typeof(ConfigurationView))] [ViewModelRegister(typeof(ConfigurationView))]
[ConstructGenerator] [ConstructGenerator]
public partial class ConfigurationViewModel : ViewModelBase, IConfigContext public partial class ConfigurationViewModel : ViewModelBase
{ {
public ObservableCollection<ViewModelBase> ConfigurationVerbose { get; } = new(); public ObservableCollection<IConfigControl> ConfigurationVerbose { get; } = new();
[GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!; [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
[GenerateProperty] private IServiceProvider ServiceProvider { get; } = default!; [GenerateProperty] private PopupMessageService PopupService { get; } = default!;
[GenerateProperty] private FileService FileService { get; set; } = default!;
[GenerateProperty] private ContentService ContentService { get; set; } = default!;
[GenerateProperty] private CancellationService CancellationService { get; set; } = default!;
[GenerateProperty] private ViewHelperService ViewHelperService { get; set; } = default!;
public void AddConfiguration<T,T1>(ConVar<T> convar) where T1: ViewModelBase, IConfigurationVerbose<T> private readonly List<(object, Type)> _conVarList = new();
public void AddCvarConf<T>(ConVar<T> cvar)
{ {
var configurationVerbose = ServiceProvider.GetService<T1>()!; ConfigurationVerbose.Add(
configurationVerbose.Context = new ConfigContext<T>(convar, this); ConfigControlHelper.GetConfigControl(cvar.Name, ConfigurationService.GetConfigValue(cvar)!));
configurationVerbose.InitializeConfig(); _conVarList.Add((cvar, cvar.Type));
ConfigurationVerbose.Add(configurationVerbose);
} }
public void InvokeUpdateConfiguration() public void InvokeUpdateConfiguration()
{ {
foreach (var verbose in ConfigurationVerbose) for (int i = 0; i < ConfigurationVerbose.Count; i++)
{ {
if(verbose is not IUpdateInvoker invoker) continue; var conVarControl = ConfigurationVerbose[i];
invoker.UpdateConfiguration(); if(!conVarControl.Dirty)
continue;
var conVar = _conVarList[i];
var methodInfo = ConfigurationService.GetType().GetMethod("SetConfigValue")!.MakeGenericMethod(conVar.Item2);
methodInfo.Invoke(ConfigurationService, [conVar.Item1, conVarControl.GetValue()]);
} }
} }
public void ResetConfig()
protected override void InitialiseInDesignMode()
{ {
AddConfiguration<string, StringConfigurationViewModel>(LauncherConVar.ILSpyUrl); foreach (var conVar in _conVarList)
{
var methodInfo = ConfigurationService.GetType().GetMethod("SetConfigValue")!.MakeGenericMethod(conVar.Item2);
methodInfo.Invoke(ConfigurationService, [conVar.Item1, null]);
}
_conVarList.Clear();
ConfigurationVerbose.Clear();
InitConfiguration();
PopupService.Popup("Configuration has been reset.");
} }
protected override void Initialise() public void OpenDataFolder()
{ {
InitialiseInDesignMode(); ExplorerHelper.OpenFolder(FileService.RootPath);
} }
public void SetValue<T>(ConVar<T> conVar, T value) public void ExportLogs()
{ {
ConfigurationService.SetConfigValue(conVar, value); var logPath = Path.Join(FileService.RootPath, "log");
var path = Path.Combine(Path.GetTempPath(), "tempThink"+Path.GetRandomFileName());
Directory.CreateDirectory(path);
ZipFile.CreateFromDirectory(logPath, Path.Join(path, DateTime.Now.ToString("yyyy-MM-dd") + ".zip"));
ExplorerHelper.OpenFolder(path);
} }
public T? GetValue<T>(ConVar<T> convar) public void RemoveAllContent()
{ {
return ConfigurationService.GetConfigValue<T>(convar); Task.Run(() =>
} {
} using var loader = ViewHelperService.GetViewModel<LoadingContextViewModel>();
loader.LoadingName = "Removing content";
public interface IConfigContext PopupService.Popup(loader);
{ ContentService.RemoveAllContent(loader, CancellationService.Token);
public void SetValue<T>(ConVar<T> conVar, T value); });
public T? GetValue<T>(ConVar<T> convar);
}
public class ConfigContext<T> : IConfigContext
{
public ConfigContext(ConVar<T> conVar, IConfigContext parent)
{
ConVar = conVar;
Parent = parent;
} }
public ConVar<T> ConVar { get; } private void InitConfiguration()
public IConfigContext Parent { get; }
public T? GetValue()
{ {
return GetValue(ConVar); AddCvarConf(LauncherConVar.ILSpyUrl);
} AddCvarConf(LauncherConVar.Hub);
AddCvarConf(LauncherConVar.AuthServers);
public void SetValue(T? value) AddCvarConf(CurrentConVar.EngineManifestUrl);
{ AddCvarConf(CurrentConVar.RobustAssemblyName);
SetValue(ConVar!, value); AddCvarConf(CurrentConVar.ManifestDownloadProtocolVersion);
}
public void SetValue<T1>(ConVar<T1> conVar, T1 value)
{
Parent.SetValue(conVar, value);
}
public T1? GetValue<T1>(ConVar<T1> convar)
{
return Parent.GetValue(convar);
}
}
public interface IConfigurationVerbose<T>
{
public ConfigContext<T> Context { get; set; }
public void InitializeConfig();
}
public interface IUpdateInvoker
{
public void UpdateConfiguration();
}
[ViewModelRegister(typeof(StringConfigurationView))]
public partial class StringConfigurationViewModel : ViewModelBase , IConfigurationVerbose<string>, IUpdateInvoker
{
[ObservableProperty] private string _configText = string.Empty;
[ObservableProperty] private string? _configName = string.Empty;
private string _oldText = string.Empty;
public required ConfigContext<string> Context { get; set; }
public void InitializeConfig()
{
ConfigName = Context.ConVar.Name;
_oldText = Context.GetValue() ?? string.Empty;
ConfigText = _oldText;
}
public void UpdateConfiguration()
{
if (_oldText == ConfigText) return;
Context.SetValue(ConfigText);
} }
protected override void InitialiseInDesignMode() protected override void InitialiseInDesignMode()
{ {
InitConfiguration();
} }
protected override void Initialise() protected override void Initialise()
{ {
InitConfiguration();
} }
} }

View File

@@ -18,6 +18,7 @@ using Nebula.Shared.FileApis;
using Nebula.Shared.Models; using Nebula.Shared.Models;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.Utils; using Nebula.Shared.Utils;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Pages; namespace Nebula.Launcher.ViewModels.Pages;
@@ -29,9 +30,7 @@ public sealed partial class ContentBrowserViewModel : ViewModelBase, IContentHol
[ObservableProperty] private string _serverText = ""; [ObservableProperty] private string _serverText = "";
[ObservableProperty] private string _searchText = ""; [ObservableProperty] private string _searchText = "";
[GenerateProperty] private ContentService ContentService { get; } = default!; [GenerateProperty] private ContentService ContentService { get; } = default!;
[GenerateProperty] private CancellationService CancellationService { get; } = default!;
[GenerateProperty] private FileService FileService { get; } = default!; [GenerateProperty] private FileService FileService { get; } = default!;
[GenerateProperty] private DebugService DebugService { get; } = default!;
[GenerateProperty] private PopupMessageService PopupService { get; } = default!; [GenerateProperty] private PopupMessageService PopupService { get; } = default!;
[GenerateProperty] private IServiceProvider ServiceProvider { get; } [GenerateProperty] private IServiceProvider ServiceProvider { get; }
[GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } = default!; [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } = default!;
@@ -59,12 +58,7 @@ public sealed partial class ContentBrowserViewModel : ViewModelBase, IContentHol
PopupService.Popup(loading); PopupService.Popup(loading);
Task.Run(() => ContentService.Unpack(serverEntry.FileApi, myTempDir, loading)); Task.Run(() => ContentService.Unpack(serverEntry.FileApi, myTempDir, loading));
var startInfo = new ProcessStartInfo(){ ExplorerHelper.OpenFolder(tmpDir);
FileName = "explorer.exe",
Arguments = tmpDir,
};
Process.Start(startInfo);
} }
public void OnGoEnter() public void OnGoEnter()
@@ -422,7 +416,20 @@ public abstract class BaseFolderContentEntry : ViewModelBase, IContentEntry
private Dictionary<string, IContentEntry> _childs = []; private Dictionary<string, IContentEntry> _childs = [];
public string IconPath => "/Assets/svg/folder.svg"; public string IconPath => "/Assets/svg/folder.svg";
public IContentHolder Holder { get; private set; }
private IContentHolder? _holder = null;
public IContentHolder Holder
{
get
{
if(_holder == null)
throw new InvalidOperationException(
GetType().Name + " was not initialised! Call Init(IContentHolder holder, string? name = null) before using it.");
return _holder;
}
}
public IContentEntry? Parent { get; set; } public IContentEntry? Parent { get; set; }
public string? Name { get; private set; } public string? Name { get; private set; }
@@ -438,7 +445,7 @@ public abstract class BaseFolderContentEntry : ViewModelBase, IContentEntry
public void Init(IContentHolder holder, string? name = null) public void Init(IContentHolder holder, string? name = null)
{ {
Name = name; Name = name;
Holder = holder; _holder = holder;
} }
public T AddChild<T>(T child) where T: IContentEntry public T AddChild<T>(T child) where T: IContentEntry

View File

@@ -2,7 +2,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Threading;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Nebula.Launcher.Controls; using Nebula.Launcher.Controls;
using Nebula.Launcher.Models; using Nebula.Launcher.Models;
@@ -12,6 +14,7 @@ using Nebula.Launcher.Views.Pages;
using Nebula.Shared; using Nebula.Shared;
using Nebula.Shared.Models; using Nebula.Shared.Models;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Pages; namespace Nebula.Launcher.ViewModels.Pages;
@@ -23,24 +26,17 @@ public partial class ServerOverviewModel : ViewModelBase
[ObservableProperty] private bool _isFilterVisible; [ObservableProperty] private bool _isFilterVisible;
[ObservableProperty] private ServerListView _currentServerList = new ServerListView(); [ObservableProperty] private ServerListView _currentServerList = new();
public readonly ServerFilter CurrentFilter = new ServerFilter(); public readonly ServerFilter CurrentFilter = new();
public Action? OnSearchChange;
[GenerateProperty] private PopupMessageService PopupMessageService { get; }
[GenerateProperty] private CancellationService CancellationService { get; }
[GenerateProperty] private DebugService DebugService { get; }
[GenerateProperty] private IServiceProvider ServiceProvider { get; } [GenerateProperty] private IServiceProvider ServiceProvider { get; }
[GenerateProperty] private ConfigurationService ConfigurationService { get; } [GenerateProperty] private ConfigurationService ConfigurationService { get; }
[GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; } [GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; }
[GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; }
public ObservableCollection<ServerListTabTemplate> Items { get; private set; } public ObservableCollection<ServerListTabTemplate> Items { get; private set; }
[ObservableProperty] private ServerListTabTemplate _selectedItem; [ObservableProperty] private ServerListTabTemplate _selectedItem;
[GenerateProperty, DesignConstruct] private ServerViewContainer ServerViewContainer { get; set; } [GenerateProperty, DesignConstruct] private ServerViewContainer ServerViewContainer { get; }
private Dictionary<string, ServerListView> _viewCache = []; private Dictionary<string, ServerListView> _viewCache = [];
@@ -57,9 +53,15 @@ public partial class ServerOverviewModel : ViewModelBase
//real think //real think
protected override void Initialise() protected override void Initialise()
{
ConfigurationService.SubscribeVarChanged(LauncherConVar.Hub, OnHubListChanged, true);
}
private void OnHubListChanged(ServerHubRecord[]? value)
{ {
var tempItems = new List<ServerListTabTemplate>(); var tempItems = new List<ServerListTabTemplate>();
foreach (var record in ConfigurationService.GetConfigValue(LauncherConVar.Hub) ?? [])
foreach (var record in value ?? [])
{ {
tempItems.Add(new ServerListTabTemplate(ServiceProvider.GetService<HubServerListProvider>()!.With(record.MainUrl), record.Name)); tempItems.Add(new ServerListTabTemplate(ServiceProvider.GetService<HubServerListProvider>()!.With(record.MainUrl), record.Name));
} }
@@ -69,13 +71,11 @@ public partial class ServerOverviewModel : ViewModelBase
Items = new ObservableCollection<ServerListTabTemplate>(tempItems); Items = new ObservableCollection<ServerListTabTemplate>(tempItems);
SelectedItem = Items[0]; SelectedItem = Items[0];
OnSearchChange += SearchChangeEvent;
} }
private void SearchChangeEvent() partial void OnSearchTextChanged(string value)
{ {
CurrentFilter.SearchText = SearchText; CurrentFilter.SearchText = value;
ApplyFilter(); ApplyFilter();
} }
@@ -83,7 +83,8 @@ public partial class ServerOverviewModel : ViewModelBase
{ {
foreach (var entry in ServerViewContainer.Items) foreach (var entry in ServerViewContainer.Items)
{ {
entry.ProcessFilter(CurrentFilter); if(entry is IFilterConsumer filterConsumer)
filterConsumer.ProcessFilter(CurrentFilter);
} }
} }
@@ -103,7 +104,10 @@ public partial class ServerOverviewModel : ViewModelBase
public void UpdateRequired() public void UpdateRequired()
{ {
ServerViewContainer.Clear();
CurrentServerList.RefreshFromProvider(); CurrentServerList.RefreshFromProvider();
CurrentServerList.RequireStatusUpdate();
CurrentServerList.ApplyFilter(CurrentFilter);
} }
partial void OnSelectedItemChanged(ServerListTabTemplate value) partial void OnSelectedItemChanged(ServerListTabTemplate value)
@@ -115,6 +119,7 @@ public partial class ServerOverviewModel : ViewModelBase
} }
CurrentServerList = view; CurrentServerList = view;
ApplyFilter();
} }
} }
@@ -123,38 +128,114 @@ public partial class ServerOverviewModel : ViewModelBase
public class ServerViewContainer public class ServerViewContainer
{ {
private readonly ViewHelperService _viewHelperService; private readonly ViewHelperService _viewHelperService;
private readonly List<string> _favorites = [];
private readonly Dictionary<string, string> _customNames = [];
public ServerViewContainer() public ServerViewContainer()
{ {
_viewHelperService = new ViewHelperService(); _viewHelperService = new ViewHelperService();
} }
public ServerViewContainer(ViewHelperService viewHelperService) [UsedImplicitly]
public ServerViewContainer(ViewHelperService viewHelperService, ConfigurationService configurationService)
{ {
_viewHelperService = viewHelperService; _viewHelperService = viewHelperService;
configurationService.SubscribeVarChanged(LauncherConVar.Favorites, OnFavoritesChange, true);
configurationService.SubscribeVarChanged(LauncherConVar.ServerCustomNames, OnCustomNamesChanged, true);
} }
private void OnCustomNamesChanged(Dictionary<string,string>? value)
{
var oldNames =
_customNames.ToDictionary(k => k.Key, v => v.Value); //Clone think
_customNames.Clear();
if(value == null)
{
foreach (var (ip,_) in oldNames)
{
if(!_entries.TryGetValue(ip, out var listEntry) || listEntry is not IEntryNameHolder entryNameHolder)
continue;
entryNameHolder.Name = null;
}
return;
}
foreach (var (oldIp, oldName) in oldNames)
{
if(value.TryGetValue(oldIp, out var newName))
{
if (oldName == newName)
value.Remove(newName);
continue;
}
if(!_entries.TryGetValue(oldIp, out var listEntry) ||
listEntry is not IEntryNameHolder entryNameHolder)
continue;
entryNameHolder.Name = null;
}
foreach (var (ip, name) in value)
{
_customNames.Add(ip, name);
if(!_entries.TryGetValue(ip, out var listEntry) || listEntry is not IEntryNameHolder entryNameHolder)
continue;
entryNameHolder.Name = name;
}
}
private void OnFavoritesChange(string[]? value)
{
_favorites.Clear();
if(value == null) return;
foreach (var favorite in value)
{
_favorites.Add(favorite);
if (_entries.TryGetValue(favorite, out var entry) && entry is IFavoriteEntryModelView favoriteView)
{
favoriteView.IsFavorite = true;
}
}
}
private readonly Dictionary<string, IListEntryModelView> _entries = new();
private readonly Dictionary<string, ServerEntryModelView> _entries = new(); public ICollection<IListEntryModelView> Items => _entries.Values;
public ICollection<ServerEntryModelView> Items => _entries.Values;
public void Clear() public void Clear()
{ {
_entries.Clear(); _entries.Clear();
} }
public ServerEntryModelView Get(RobustUrl url, ServerStatus? serverStatus = null) public IListEntryModelView Get(RobustUrl url, ServerStatus? serverStatus = null)
{ {
ServerEntryModelView? entry; IListEntryModelView? entry;
lock (_entries) lock (_entries)
{ {
_customNames.TryGetValue(url.ToString(), out var customName);
if (_entries.TryGetValue(url.ToString(), out entry)) if (_entries.TryGetValue(url.ToString(), out entry))
{ {
return entry; return entry;
} }
entry = _viewHelperService.GetViewModel<ServerEntryModelView>().WithData(url, serverStatus); if (serverStatus is not null)
entry = _viewHelperService.GetViewModel<ServerEntryModelView>().WithData(url, customName, serverStatus);
else
entry = _viewHelperService.GetViewModel<ServerCompoundEntryViewModel>().LoadServerEntry(url, customName, CancellationToken.None);
if(_favorites.Contains(url.ToString()) &&
entry is IFavoriteEntryModelView favoriteEntryModelView)
favoriteEntryModelView.IsFavorite = true;
_entries.Add(url.ToString(), entry); _entries.Add(url.ToString(), entry);
} }
@@ -163,6 +244,21 @@ public class ServerViewContainer
} }
} }
public interface IListEntryModelView
{
}
public interface IFavoriteEntryModelView
{
public bool IsFavorite { get; set; }
}
public interface IEntryNameHolder
{
public string? Name { get; set; }
}
public class ServerComparer : IComparer<ServerHubInfo>, IComparer<ServerStatus>, IComparer<(RobustUrl,ServerStatus)> public class ServerComparer : IComparer<ServerHubInfo>, IComparer<ServerStatus>, IComparer<(RobustUrl,ServerStatus)>
{ {
public int Compare(ServerHubInfo? x, ServerHubInfo? y) public int Compare(ServerHubInfo? x, ServerHubInfo? y)

View File

@@ -1,10 +1,13 @@
using System; using System;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using Nebula.Launcher.ServerListProviders;
using Nebula.Launcher.Services;
using Nebula.Launcher.ViewModels.Pages; using Nebula.Launcher.ViewModels.Pages;
using Nebula.Launcher.Views.Pages; using Nebula.Launcher.Views.Pages;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.Services.Logging; using Nebula.Shared.Services.Logging;
using Nebula.Shared.Utils; using Nebula.Shared.Utils;
using Nebula.Shared.ViewHelper;
using AddFavoriteView = Nebula.Launcher.Views.Popup.AddFavoriteView; using AddFavoriteView = Nebula.Launcher.Views.Popup.AddFavoriteView;
namespace Nebula.Launcher.ViewModels.Popup; namespace Nebula.Launcher.ViewModels.Popup;
@@ -28,7 +31,8 @@ public partial class AddFavoriteViewModel : PopupViewModelBase
public override PopupMessageService PopupMessageService { get; } public override PopupMessageService PopupMessageService { get; }
[GenerateProperty] private ServerOverviewModel ServerOverviewModel { get; } [GenerateProperty] private ServerOverviewModel ServerOverviewModel { get; }
[GenerateProperty] private DebugService DebugService { get; } [GenerateProperty] private DebugService DebugService { get; }
public override string Title => "Add to favorite"; [GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; }
public override string Title => LocalisationService.GetString("popup-add-favorite");
public override bool IsClosable => true; public override bool IsClosable => true;
[ObservableProperty] private string _ipInput; [ObservableProperty] private string _ipInput;
@@ -38,7 +42,11 @@ public partial class AddFavoriteViewModel : PopupViewModelBase
{ {
try try
{ {
if(string.IsNullOrWhiteSpace(IpInput))
throw new Exception(LocalisationService.GetString("popup-add-favorite-invalid-ip"));
var uri = IpInput.ToRobustUrl(); var uri = IpInput.ToRobustUrl();
FavoriteServerListProvider.AddFavorite(uri);
Dispose(); Dispose();
} }
catch (Exception e) catch (Exception e)

View File

@@ -0,0 +1,63 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Nebula.Launcher.Services;
using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup;
[ViewModelRegister(typeof(EditServerNameView), false)]
[ConstructGenerator]
public sealed partial class EditServerNameViewModel : PopupViewModelBase
{
[GenerateProperty] public override PopupMessageService PopupMessageService { get; }
[GenerateProperty] public ConfigurationService ConfigurationService { get; }
public override string Title => LocalisationService.GetString("popup-edit-name");
public override bool IsClosable => true;
[ObservableProperty] private string _ipInput;
[ObservableProperty] private string _nameInput;
public void OnEnter()
{
if(string.IsNullOrWhiteSpace(IpInput))
return;
if (string.IsNullOrWhiteSpace(NameInput))
{
OnClear();
return;
}
AddServerName();
Dispose();
}
public void OnClear()
{
RemoveServerName();
Dispose();
}
private void AddServerName()
{
var currentNames = ConfigurationService.GetConfigValue(LauncherConVar.ServerCustomNames)!;
currentNames.Add(IpInput, NameInput);
ConfigurationService.SetConfigValue(LauncherConVar.ServerCustomNames, currentNames);
}
private void RemoveServerName()
{
var currentNames = ConfigurationService.GetConfigValue(LauncherConVar.ServerCustomNames)!;
currentNames.Remove(IpInput);
ConfigurationService.SetConfigValue(LauncherConVar.ServerCustomNames, currentNames);
}
protected override void InitialiseInDesignMode()
{
}
protected override void Initialise()
{
}
}

View File

@@ -1,7 +1,9 @@
using System; using System;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Nebula.Launcher.Services;
using Nebula.Launcher.Views.Popup; using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup; namespace Nebula.Launcher.ViewModels.Popup;
@@ -10,7 +12,7 @@ namespace Nebula.Launcher.ViewModels.Popup;
public sealed partial class ExceptionListViewModel : PopupViewModelBase public sealed partial class ExceptionListViewModel : PopupViewModelBase
{ {
[GenerateProperty] public override PopupMessageService PopupMessageService { get; } [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
public override string Title => "Exception was thrown"; public override string Title => LocalisationService.GetString("popup-exception");
public override bool IsClosable => true; public override bool IsClosable => true;
public ObservableCollection<Exception> Errors { get; } = new(); public ObservableCollection<Exception> Errors { get; } = new();

View File

@@ -1,6 +1,8 @@
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using Nebula.Launcher.Services;
using Nebula.Launcher.Views.Popup; using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup; namespace Nebula.Launcher.ViewModels.Popup;
@@ -12,7 +14,7 @@ public partial class InfoPopupViewModel : PopupViewModelBase
[ObservableProperty] private string _infoText = "Test"; [ObservableProperty] private string _infoText = "Test";
public override string Title => "Info"; public override string Title => LocalisationService.GetString("popup-information");
public bool IsInfoClosable { get; set; } = true; public bool IsInfoClosable { get; set; } = true;
public override bool IsClosable => IsInfoClosable; public override bool IsClosable => IsInfoClosable;

View File

@@ -0,0 +1,50 @@
using Nebula.Launcher.Services;
using Nebula.Launcher.ViewModels.Pages;
using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup;
[ConstructGenerator, ViewModelRegister(typeof(IsLoginCredentialsNullPopupView))]
public partial class IsLoginCredentialsNullPopupViewModel : PopupViewModelBase
{
private ServerEntryModelView _entry;
[GenerateProperty] public override PopupMessageService PopupMessageService { get; }
[GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; }
protected override void InitialiseInDesignMode()
{
}
protected override void Initialise()
{
}
public IsLoginCredentialsNullPopupViewModel WithServerEntry(ServerEntryModelView entryModelView)
{
_entry = entryModelView;
return this;
}
public void Proceed()
{
_entry.RunInstanceIgnoreAuth();
Dispose();
}
public void Cancel()
{
Dispose();
}
public void GotoAuthPage()
{
ViewHelperService.GetViewModel<MainViewModel>().RequirePage<AccountInfoViewModel>();
Dispose();
}
public override string Title => LocalisationService.GetString("popup-login-credentials-warning");
public override bool IsClosable => true;
}

View File

@@ -1,7 +1,9 @@
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using Nebula.Launcher.Services;
using Nebula.Launcher.Views.Popup; using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Models; using Nebula.Shared.Models;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup; namespace Nebula.Launcher.ViewModels.Popup;
@@ -13,10 +15,10 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
[GenerateProperty] public CancellationService CancellationService { get; } [GenerateProperty] public CancellationService CancellationService { get; }
[ObservableProperty] private int _currJobs; [ObservableProperty] private int _currJobs;
[ObservableProperty] private int _resolvedJobs; [ObservableProperty] private int _resolvedJobs;
[ObservableProperty] private string _message = string.Empty;
public string LoadingName { get; set; } = "Loading..."; public string LoadingName { get; set; } = LocalisationService.GetString("popup-loading");
public bool IsCancellable { get; set; } = true; public bool IsCancellable { get; set; } = true;
public override bool IsClosable => false; public override bool IsClosable => false;
@@ -42,6 +44,11 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
return ResolvedJobs; return ResolvedJobs;
} }
public void SetLoadingMessage(string message)
{
Message = message + "\n" + Message;
}
public void Cancel(){ public void Cancel(){
if(!IsCancellable) return; if(!IsCancellable) return;
CancellationService.Cancel(); CancellationService.Cancel();
@@ -54,5 +61,30 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
protected override void InitialiseInDesignMode() protected override void InitialiseInDesignMode()
{ {
SetJobsCount(5);
SetResolvedJobsCount(2);
string[] debugMessages = {
"Debug: Starting phase 1...",
"Debug: Loading assets...",
"Debug: Connecting to server...",
"Debug: Fetching user data...",
"Debug: Applying configurations...",
"Debug: Starting phase 2...",
"Debug: Rendering UI...",
"Debug: Preparing scene...",
"Debug: Initializing components...",
"Debug: Running diagnostics...",
"Debug: Checking dependencies...",
"Debug: Verifying files...",
"Debug: Cleaning up cache...",
"Debug: Finalizing setup...",
"Debug: Setup complete.",
"Debug: Ready for launch."
};
foreach (string message in debugMessages)
{
SetLoadingMessage(message);
}
} }
} }

View File

@@ -1,6 +1,8 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Nebula.Launcher.Models;
using Nebula.Launcher.Views.Popup; using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup; namespace Nebula.Launcher.ViewModels.Popup;
@@ -35,4 +37,9 @@ public sealed partial class LogPopupModelView : PopupViewModelBase
{ {
Logs.Add(LogInfo.FromString(str)); Logs.Add(LogInfo.FromString(str));
} }
public void Clear()
{
Logs.Clear();
}
} }

View File

@@ -12,6 +12,9 @@ public abstract class PopupViewModelBase : ViewModelBase, IDisposable
public void Dispose() public void Dispose()
{ {
OnDispose();
PopupMessageService.ClosePopup(this); PopupMessageService.ClosePopup(this);
} }
protected virtual void OnDispose(){}
} }

View File

@@ -1,13 +1,19 @@
using System; using System;
using Nebula.Launcher.Services;
using Nebula.Launcher.ViewModels.Pages;
using Nebula.Launcher.Views.Popup; using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup; namespace Nebula.Launcher.ViewModels.Popup;
[ConstructGenerator, ViewModelRegister(typeof(TfaView))] [ConstructGenerator, ViewModelRegister(typeof(TfaView))]
public partial class TfaViewModel : PopupViewModelBase public partial class TfaViewModel : PopupViewModelBase
{ {
public Action<string>? OnTfaEntered; [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
[GenerateProperty] public AccountInfoViewModel AccountInfo { get; }
public override string Title => LocalisationService.GetString("popup-twofa");
public override bool IsClosable => true;
protected override void InitialiseInDesignMode() protected override void InitialiseInDesignMode()
{ {
@@ -19,11 +25,7 @@ public partial class TfaViewModel : PopupViewModelBase
public void OnTfaEnter(string code) public void OnTfaEnter(string code)
{ {
OnTfaEntered?.Invoke(code); AccountInfo.DoAuth(code);
Dispose(); Dispose();
} }
[GenerateProperty] public override PopupMessageService PopupMessageService { get; }
public override string Title => "2fa";
public override bool IsClosable => true;
} }

View File

@@ -0,0 +1,105 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Avalonia.Controls;
using Avalonia.Media;
using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.Extensions.DependencyInjection;
using Nebula.Launcher.Models;
using Nebula.Launcher.ServerListProviders;
using Nebula.Launcher.ViewModels.Pages;
using Nebula.Launcher.Views;
using Nebula.Shared.Models;
using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
using BindingFlags = System.Reflection.BindingFlags;
namespace Nebula.Launcher.ViewModels;
[ViewModelRegister(typeof(ServerCompoundEntryView), false)]
[ConstructGenerator]
public sealed partial class ServerCompoundEntryViewModel :
ViewModelBase, IFavoriteEntryModelView, IFilterConsumer, IListEntryModelView, IEntryNameHolder
{
[ObservableProperty] private ServerEntryModelView? _currentEntry;
[ObservableProperty] private Control? _entryControl;
[ObservableProperty] private string _message = "Loading server entry...";
[ObservableProperty] private bool _isFavorite;
[ObservableProperty] private bool _loading = true;
private string? _name;
private RobustUrl? _url;
private ServerFilter? _currentFilter;
public string? Name
{
get => _name;
set
{
_name = value;
OnPropertyChanged();
if (CurrentEntry != null)
CurrentEntry.Name = value;
}
}
[GenerateProperty] private RestService RestService { get; }
[GenerateProperty] private IServiceProvider ServiceProvider{ get; }
[GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; }
protected override void InitialiseInDesignMode()
{
Name = "TEST.TEST";
}
protected override void Initialise()
{
}
public ServerCompoundEntryViewModel LoadServerEntry(RobustUrl url,string? name, CancellationToken cancellationToken)
{
Task.Run(async () =>
{
_url = url;
try
{
Message = "Loading server entry...";
var status = await RestService.GetAsync<ServerStatus>(_url.StatusUri, cancellationToken);
CurrentEntry = ServiceProvider.GetService<ServerEntryModelView>()!.WithData(_url,name, status);
CurrentEntry.IsFavorite = IsFavorite;
CurrentEntry.Loading = false;
CurrentEntry.ProcessFilter(_currentFilter);
Loading = false;
}
catch (Exception e)
{
Message = e.Message;
}
}, cancellationToken);
return this;
}
public void ToggleFavorites()
{
if (CurrentEntry is null && _url is not null)
{
IsFavorite = !IsFavorite;
if(IsFavorite) FavoriteServerListProvider.AddFavorite(_url);
else FavoriteServerListProvider.RemoveFavorite(_url);
}
CurrentEntry?.ToggleFavorites();
}
public void ProcessFilter(ServerFilter? serverFilter)
{
_currentFilter = serverFilter;
if(CurrentEntry is IFilterConsumer filterConsumer)
filterConsumer.ProcessFilter(serverFilter);
}
}

View File

@@ -1,17 +1,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Diagnostics;
using System.IO;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Input; using System.Windows.Input;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Media;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using Nebula.Launcher.Models;
using Nebula.Launcher.ProcessHelper;
using Nebula.Launcher.ServerListProviders; using Nebula.Launcher.ServerListProviders;
using Nebula.Launcher.Services; using Nebula.Launcher.Services;
using Nebula.Launcher.ViewModels.Pages; using Nebula.Launcher.ViewModels.Pages;
@@ -21,41 +17,45 @@ using Nebula.Shared.Models;
using Nebula.Shared.Services; using Nebula.Shared.Services;
using Nebula.Shared.Services.Logging; using Nebula.Shared.Services.Logging;
using Nebula.Shared.Utils; using Nebula.Shared.Utils;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels; namespace Nebula.Launcher.ViewModels;
[ViewModelRegister(typeof(ServerEntryView), false)] [ViewModelRegister(typeof(ServerEntryView), false)]
[ConstructGenerator] [ConstructGenerator]
public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, IListEntryModelView, IFavoriteEntryModelView, IEntryNameHolder
{ {
[ObservableProperty] private string _description = "Fetching info..."; [ObservableProperty] private string _description = "Fetching info...";
[ObservableProperty] private bool _expandInfo; [ObservableProperty] private bool _expandInfo;
[ObservableProperty] private bool _isFavorite; [ObservableProperty] private bool _isFavorite;
[ObservableProperty] private bool _isVisible; [ObservableProperty] private bool _isVisible;
[ObservableProperty] private bool _runVisible = true;
private string _lastError = "";
private Process? _p;
private ILogger _logger;
private ILogger? _processLogger;
private ServerInfo? _serverInfo;
[ObservableProperty] private bool _tagDataVisible; [ObservableProperty] private bool _tagDataVisible;
[ObservableProperty] private bool _loading;
[ObservableProperty] private string _realName;
public string? Name
{
get => RealName;
set => RealName = value ?? Status.Name;
}
private ILogger _logger;
private ServerInfo? _serverInfo;
private ContentLogConsumer _currentContentLogConsumer;
private ProcessRunHandler<GameProcessStartInfoProvider>? _currentInstance;
public LogPopupModelView CurrLog; public LogPopupModelView CurrLog;
public RobustUrl Address { get; private set; } public RobustUrl Address { get; private set; }
[GenerateProperty] private AccountInfoViewModel AccountInfoViewModel { get; }
[GenerateProperty] private AuthService AuthService { get; } = default!;
[GenerateProperty] private ContentService ContentService { get; } = default!;
[GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
[GenerateProperty] private CancellationService CancellationService { get; } = default!; [GenerateProperty] private CancellationService CancellationService { get; } = default!;
[GenerateProperty] private DebugService DebugService { get; } = default!; [GenerateProperty] private DebugService DebugService { get; } = default!;
[GenerateProperty] private RunnerService RunnerService { get; } = default!;
[GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!; [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
[GenerateProperty] private ViewHelperService ViewHelperService { get; } = default!; [GenerateProperty] private ViewHelperService ViewHelperService { get; } = default!;
[GenerateProperty] private RestService RestService { get; } = default!; [GenerateProperty] private RestService RestService { get; } = default!;
[GenerateProperty] private MainViewModel MainViewModel { get; } = default!; [GenerateProperty] private MainViewModel MainViewModel { get; } = default!;
[GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; } = default!; [GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; } = default!;
[GenerateProperty] private DotnetResolverService DotnetResolverService { get; } = default!; [GenerateProperty] private GameRunnerPreparer GameRunnerPreparer { get; } = default!;
public ServerStatus Status { get; private set; } = public ServerStatus Status { get; private set; } =
new( new(
@@ -71,22 +71,9 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer
); );
public ObservableCollection<ServerLink> Links { get; } = new(); public ObservableCollection<ServerLink> Links { get; } = new();
public bool RunVisible => Process == null;
public ObservableCollection<string> Tags { get; } = []; public ObservableCollection<string> Tags { get; } = [];
public ICommand OnLinkGo { get; } = new LinkGoCommand(); public ICommand OnLinkGo { get; } = new LinkGoCommand();
private Process? Process
{
get => _p;
set
{
_p = value;
OnPropertyChanged(nameof(RunVisible));
}
}
public async Task<ServerInfo?> GetServerInfo() public async Task<ServerInfo?> GetServerInfo()
{ {
if (_serverInfo == null) if (_serverInfo == null)
@@ -105,6 +92,8 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer
protected override void InitialiseInDesignMode() protected override void InitialiseInDesignMode()
{ {
IsVisible = true;
RealName = "TEST.TEST";
Description = "Server of meow girls! Nya~ \nNyaMeow\nOOOINK!!"; Description = "Server of meow girls! Nya~ \nNyaMeow\nOOOINK!!";
Links.Add(new ServerLink("Discord", "discord", "https://cinka.ru")); Links.Add(new ServerLink("Discord", "discord", "https://cinka.ru"));
Status = new ServerStatus("Ameba", Status = new ServerStatus("Ameba",
@@ -119,6 +108,7 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer
{ {
_logger = DebugService.GetLogger(this); _logger = DebugService.GetLogger(this);
CurrLog = ViewHelperService.GetViewModel<LogPopupModelView>(); CurrLog = ViewHelperService.GetViewModel<LogPopupModelView>();
_currentContentLogConsumer = new(CurrLog, PopupMessageService);
} }
public void ProcessFilter(ServerFilter? serverFilter) public void ProcessFilter(ServerFilter? serverFilter)
@@ -139,38 +129,21 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer
foreach (var tag in Status.Tags) Tags.Add(tag); foreach (var tag in Status.Tags) Tags.Add(tag);
OnPropertyChanged(nameof(Status)); OnPropertyChanged(nameof(Status));
} }
public ServerEntryModelView WithData(RobustUrl url, ServerStatus? serverStatus) public ServerEntryModelView WithData(RobustUrl url, string? name,ServerStatus serverStatus)
{ {
Address = url; Address = url;
if (serverStatus is not null) SetStatus(serverStatus);
SetStatus(serverStatus); Name = name;
else
FetchStatus();
IsFavorite = GetFavoriteEntries().Contains(Address.ToString());
return this; return this;
} }
private List<string> GetFavoriteEntries()
{
return ConfigurationService.GetConfigValue(LauncherConVar.Favorites)?.ToList() ?? [];
}
private async void FetchStatus() public void EditName()
{ {
try var popup = ViewHelperService.GetViewModel<EditServerNameViewModel>();
{ popup.IpInput = Address.ToString();
SetStatus(await RestService.GetAsync<ServerStatus>(Address.StatusUri, CancellationService.Token)); popup.NameInput = Name ?? string.Empty;
} PopupMessageService.Popup(popup);
catch (Exception e)
{
_logger.Error(e);
Status = new ServerStatus("ErrorLand", $"ERROR: {e.Message}", [], "", -1, -1, -1, false,
DateTime.Now,
-1);
}
} }
public void OpenContentViewer() public void OpenContentViewer()
@@ -188,125 +161,73 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer
} }
public void RunInstance() public void RunInstance()
{ {
Task.Run(RunAsync); CurrLog.Clear();
Task.Run(async ()=> await RunInstanceAsync());
} }
public async Task RunAsync() public void RunInstanceIgnoreAuth()
{ {
CurrLog.Clear();
Task.Run(async ()=> await RunInstanceAsync(true));
}
private async Task RunInstanceAsync(bool ignoreLoginCredentials = false)
{
_logger.Log("Running instance..." + RealName);
if (!ignoreLoginCredentials && AccountInfoViewModel.Credentials.Value is null)
{
var warningContext = ViewHelperService.GetViewModel<IsLoginCredentialsNullPopupViewModel>()
.WithServerEntry(this);
PopupMessageService.Popup(warningContext);
return;
}
try try
{ {
var authProv = AuthService.SelectedAuth; using var loadingContext = ViewHelperService.GetViewModel<LoadingContextViewModel>();
loadingContext.LoadingName = "Loading instance...";
((ILoadingHandler)loadingContext).AppendJob();
var buildInfo = PopupMessageService.Popup(loadingContext);
await ContentService.GetBuildInfo(Address, CancellationService.Token); _currentInstance =
await GameRunnerPreparer.GetGameProcessStartInfoProvider(Address, loadingContext, CancellationService.Token);
using (var loadingContext = ViewHelperService.GetViewModel<LoadingContextViewModel>()) _logger.Log("Preparing instance...");
{ _currentInstance.RegisterLogger(_currentContentLogConsumer);
loadingContext.LoadingName = "Loading instance..."; _currentInstance.RegisterLogger(new DebugLoggerBridge(DebugService.GetLogger($"PROCESS_{Random.Shared.Next(65535)}")));
((ILoadingHandler)loadingContext).AppendJob(); _currentInstance.OnProcessExited += OnProcessExited;
RunVisible = false;
PopupMessageService.Popup(loadingContext); _currentInstance.Start();
_logger.Log("Starting instance..." + RealName);
await RunnerService.PrepareRun(buildInfo, loadingContext, CancellationService.Token);
var path = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
Process = Process.Start(new ProcessStartInfo
{
FileName = await DotnetResolverService.EnsureDotnet(),
Arguments = Path.Join(path, "Nebula.Runner.dll"),
Environment =
{
{ "ROBUST_AUTH_USERID", authProv?.UserId.ToString() },
{ "ROBUST_AUTH_TOKEN", authProv?.Token.Token },
{ "ROBUST_AUTH_SERVER", authProv?.AuthServer },
{ "ROBUST_AUTH_PUBKEY", buildInfo.BuildInfo.Auth.PublicKey },
{ "GAME_URL", Address.ToString() },
{ "AUTH_LOGIN", authProv?.Login }
},
CreateNoWindow = true,
UseShellExecute = false,
RedirectStandardOutput = true,
RedirectStandardError = true,
StandardOutputEncoding = Encoding.UTF8
});
((ILoadingHandler)loadingContext).AppendResolvedJob();
}
if (Process is null) return;
_processLogger = DebugService.GetLogger($"PROCESS_{Process.Id}");
Process.EnableRaisingEvents = true;
Process.BeginOutputReadLine();
Process.BeginErrorReadLine();
Process.OutputDataReceived += OnOutputDataReceived;
Process.ErrorDataReceived += OnErrorDataReceived;
Process.Exited += OnExited;
}
catch (TaskCanceledException e)
{
PopupMessageService.Popup("Task canceled: " + e.Message);
_logger.Error("Task canceled");
_logger.Error(e);
} }
catch (Exception e) catch (Exception e)
{ {
PopupMessageService.Popup(e); var error = new Exception("Error while attempt run instance", e);
_logger.Error(error);
PopupMessageService.Popup(error);
RunVisible = true;
} }
} }
private void OnExited(object? sender, EventArgs e) private void OnProcessExited(ProcessRunHandler<GameProcessStartInfoProvider> obj)
{ {
if (Process is null) return; RunVisible = true;
if (_currentInstance == null) return;
Process.OutputDataReceived -= OnOutputDataReceived;
Process.ErrorDataReceived -= OnErrorDataReceived;
Process.Exited -= OnExited;
_processLogger?.Log("PROCESS EXIT WITH CODE " + Process.ExitCode);
if (Process.ExitCode != 0)
PopupMessageService.Popup($"Game exit with code {Process.ExitCode}.\nReason: {_lastError}");
_processLogger?.Dispose();
Process.Dispose(); _currentInstance.OnProcessExited -= OnProcessExited;
Process = null; _currentInstance.Dispose();
} _currentInstance = null;
private void OnErrorDataReceived(object sender, DataReceivedEventArgs e)
{
if (e.Data != null)
{
_lastError = e.Data;
_processLogger?.Error(e.Data);
CurrLog.Append(e.Data);
}
}
private void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
{
if (e.Data != null)
{
_processLogger?.Log(e.Data);
CurrLog.Append(e.Data);
}
}
public void ReadLog()
{
PopupMessageService.Popup(CurrLog);
} }
public void StopInstance() public void StopInstance()
{ {
Process?.CloseMainWindow(); _currentInstance?.Stop();
}
public void ReadLog()
{
PopupMessageService.Popup(CurrLog);
} }
public async void ExpandInfoRequired() public async void ExpandInfoRequired()
@@ -323,56 +244,6 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer
if (info.Links is null) return; if (info.Links is null) return;
foreach (var link in info.Links) Links.Add(link); foreach (var link in info.Links) Links.Add(link);
} }
private static string FindDotnetPath()
{
var pathEnv = Environment.GetEnvironmentVariable("PATH");
var paths = pathEnv?.Split(Path.PathSeparator);
if (paths != null)
foreach (var path in paths)
{
var dotnetPath = Path.Combine(path, "dotnet");
if (File.Exists(dotnetPath)) return dotnetPath;
}
return "dotnet";
}
}
public sealed class LogInfo
{
public string Category { get; set; } = "LOG";
public IBrush CategoryColor { get; set; } = Brush.Parse("#424242");
public string Message { get; set; } = "";
public static LogInfo FromString(string input)
{
var matches = Regex.Matches(input, @"(\[(?<c>.*)\] (?<m>.*))|(?<m>.*)");
var category = "All";
if (matches[0].Groups.TryGetValue("c", out var c)) category = c.Value;
var color = Brush.Parse("#444444");
switch (category)
{
case "DEBG":
color = Brush.Parse("#2436d4");
break;
case "ERRO":
color = Brush.Parse("#d42436");
break;
case "INFO":
color = Brush.Parse("#0ab3c9");
break;
}
var message = matches[0].Groups["m"].Value;
return new LogInfo
{
Category = category, Message = message, CategoryColor = color
};
}
} }
public class LinkGoCommand : ICommand public class LinkGoCommand : ICommand
@@ -394,9 +265,4 @@ public class LinkGoCommand : ICommand
} }
public event EventHandler? CanExecuteChanged; public event EventHandler? CanExecuteChanged;
}
public interface IFilterConsumer
{
public void ProcessFilter(ServerFilter? serverFilter);
} }

View File

@@ -0,0 +1,22 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Nebula.Launcher.Views;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels;
[ViewModelRegister(typeof(VisualErrorView))]
public partial class VisualErrorViewModel : ViewModelBase
{
[ObservableProperty] private string _imgPath = "cinka";
[ObservableProperty] private string _title = "Error";
[ObservableProperty] private string _description = "This is an error.";
protected override void InitialiseInDesignMode()
{
}
protected override void Initialise()
{
}
}

View File

@@ -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:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Nebula.Launcher.Views.Config.StringConfigurationView"
x:DataType="pages:StringConfigurationViewModel">
<Design.DataContext>
<pages:StringConfigurationViewModel />
</Design.DataContext>
<StackPanel Orientation="Horizontal" Spacing="5" Margin="5">
<TextBlock VerticalAlignment="Center" Text="{Binding ConfigName}"/>
<TextBlock VerticalAlignment="Center" Text=":"/>
<TextBox Text="{Binding ConfigText}"/>
</StackPanel>
</UserControl>

View File

@@ -1,20 +0,0 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Nebula.Launcher.ViewModels.Pages;
namespace Nebula.Launcher.Views.Config;
public partial class StringConfigurationView : UserControl
{
public StringConfigurationView()
{
InitializeComponent();
}
public StringConfigurationView(StringConfigurationViewModel viewModel)
: this()
{
DataContext = viewModel;
}
}

View File

@@ -1,22 +1,11 @@
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Nebula.Launcher.ViewModels.Pages;
namespace Nebula.Launcher.Views; namespace Nebula.Launcher.Views;
public partial class FileContentEntryView : UserControl public partial class FileContentEntryView : UserControl
{ {
// This constructor is used when the view is created by the XAML Previewer
public FileContentEntryView() public FileContentEntryView()
{ {
InitializeComponent(); InitializeComponent();
} }
// This constructor is used when the view is created via dependency injection
public FileContentEntryView(FolderContentEntry viewModel)
: this()
{
DataContext = viewModel;
}
} }

View File

@@ -8,10 +8,10 @@
xmlns:converters="clr-namespace:Nebula.Launcher.Converters" xmlns:converters="clr-namespace:Nebula.Launcher.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:models="clr-namespace:Nebula.Shared.Models;assembly=Nebula.Shared"
xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels" xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:models1="clr-namespace:Nebula.Launcher.Models"> xmlns:models1="clr-namespace:Nebula.Launcher.Models"
xmlns:services="clr-namespace:Nebula.Launcher.Services">
<Design.DataContext> <Design.DataContext>
<viewModels:MainViewModel /> <viewModels:MainViewModel />
</Design.DataContext> </Design.DataContext>
@@ -121,7 +121,41 @@
https://durenko.tatar/nebula/ https://durenko.tatar/nebula/
</TextBlock> </TextBlock>
</Button> </Button>
<TextBlock HorizontalAlignment="Right" VerticalAlignment="Center" Text="{Binding VersionInfo}"/> <StackPanel Spacing="5" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
<Button
Margin="0"
Padding="0"
CornerRadius="0"
Command="{Binding OpenAuthPage}">
<StackPanel Spacing="5" Orientation="Horizontal">
<Svg
Height="40"
Path="/Assets/svg/user.svg"
Width="10" />
<Panel>
<TextBlock
Foreground="#777777"
Text="{Binding LoginText}"/>
</Panel>
</StackPanel>
</Button>
<TextBlock>|</TextBlock>
<Button
Margin="0"
Padding="0"
CornerRadius="0"
Command="{Binding OpenRootPath}">
<StackPanel Orientation="Horizontal" Spacing="5">
<Svg
Height="40"
Path="/Assets/svg/folder.svg"
Width="10" />
<TextBlock Foreground="#777777" Text="{services:LocaledText goto-path-home}"/>
</StackPanel>
</Button>
<TextBlock>|</TextBlock>
<TextBlock Text="{Binding VersionInfo}"/>
</StackPanel>
</Panel> </Panel>
</Label> </Label>
</Border> </Border>

View File

@@ -1,20 +1,11 @@
using Avalonia.Controls; using Avalonia.Controls;
using Nebula.Launcher.ViewModels;
namespace Nebula.Launcher.Views; namespace Nebula.Launcher.Views;
public partial class MainView : UserControl public partial class MainView : UserControl
{ {
// This constructor is used when the view is created by the XAML Previewer
public MainView() public MainView()
{ {
InitializeComponent(); InitializeComponent();
} }
// This constructor is used when the view is created via dependency injection
public MainView(MainViewModel viewModel)
: this()
{
DataContext = viewModel;
}
} }

View File

@@ -1,14 +1,17 @@
<UserControl <UserControl
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="1000"
mc:Ignorable="d" mc:Ignorable="d"
x:Class="Nebula.Launcher.Views.Pages.AccountInfoView" x:Class="Nebula.Launcher.Views.Pages.AccountInfoView"
x:DataType="pages:AccountInfoViewModel" x:DataType="pages:AccountInfoViewModel"
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:customControls="clr-namespace:Nebula.Launcher.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
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"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:auth="clr-namespace:Nebula.Launcher.Models.Auth"
xmlns:converters="clr-namespace:Nebula.Launcher.Converters">
<Design.DataContext> <Design.DataContext>
<pages:AccountInfoViewModel /> <pages:AccountInfoViewModel />
</Design.DataContext> </Design.DataContext>
@@ -28,7 +31,7 @@
<GradientStop Color="#292222" Offset="1.0" /> <GradientStop Color="#292222" Offset="1.0" />
</LinearGradientBrush> </LinearGradientBrush>
</Border.Background> </Border.Background>
<Label HorizontalAlignment="Center">Profiles:</Label> <customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="account-profiles"/>
</Border> </Border>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<ItemsControl <ItemsControl
@@ -36,44 +39,58 @@
ItemsSource="{Binding Accounts}" ItemsSource="{Binding Accounts}"
Padding="0"> Padding="0">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type pages:ProfileAuthCredentials}"> <DataTemplate DataType="{x:Type auth:ProfileEntry}">
<Border <Grid ColumnDefinitions="4*,*">
BoxShadow="0 1 15 -2 #121212" <Border
CornerRadius="0,10,0,10" BoxShadow="0 1 15 -2 #121212"
Margin="5,5,5,0" CornerRadius="0,10,0,10"
VerticalAlignment="Center"> Margin="5,5,5,0">
<Border.Background> <Border.Background>
<LinearGradientBrush EndPoint="50%,100%" StartPoint="50%,0%"> <LinearGradientBrush EndPoint="100%,50%" StartPoint="20%,50%">
<GradientStop Color="#292222" Offset="0.0" /> <GradientStop Color="{Binding Credentials.AuthServer,
<GradientStop Color="#222222" Offset="1.0" /> Converter={x:Static converters:TypeConverters.NameColorRepresentation}}" Offset="0.0" />
</LinearGradientBrush> <GradientStop Color="#222222" Offset="1.0" />
</Border.Background> </LinearGradientBrush>
<Panel> </Border.Background>
<StackPanel Margin="10,5,5,5" Orientation="Horizontal"> <Label>
<TextBlock Text="{Binding AuthName}" Margin="5"/>
</Label>
</Border>
<Border Grid.Column="0"
CornerRadius="0,10,0,10"
Margin="5,5,5,0">
<Border.Background>
<LinearGradientBrush EndPoint="100%,50%" StartPoint="20%,50%">
<GradientStop Color="#aa222222" Offset="0.0" />
<GradientStop Color="#222222" Offset="0.4" />
</LinearGradientBrush>
</Border.Background>
<Button
HorizontalAlignment="Stretch"
Command="{Binding OnSelect}">
<Label> <Label>
<TextBlock Text="{Binding Login}" /> <TextBlock Text="{Binding Credentials.Login}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,5,0"/>
</Label> </Label>
</StackPanel> </Button>
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> </Border>
<Button <Border
Command="{Binding OnSelect}" BoxShadow="0 1 15 -2 #121212"
CornerRadius="0,0,0,10" CornerRadius="0,10,0,10"
Padding="5"> Margin="0,5,5,0" Grid.Column="1" Padding="0">
<Label> <Border.Background>
Select <LinearGradientBrush EndPoint="100%,50%" StartPoint="20%,50%">
</Label> <GradientStop Color="#292222" Offset="1.0" />
</Button> <GradientStop Color="#222222" Offset="1.0" />
<Button </LinearGradientBrush>
Command="{Binding OnDelete}" </Border.Background>
CornerRadius="0,10,0,0" <Button Command="{Binding OnDelete}" CornerRadius="0,10,0,10" HorizontalAlignment="Stretch">
Padding="5"> <Svg
<Label> Height="15"
Delete Path="/Assets/svg/delete.svg"
</Label> Width="15" />
</Button> </Button>
</StackPanel> </Border>
</Panel> </Grid>
</Border>
</DataTemplate> </DataTemplate>
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl> </ItemsControl>
@@ -102,23 +119,28 @@
Margin="0,0,0,20" Margin="0,0,0,20"
Path="/Assets/svg/user.svg" /> Path="/Assets/svg/user.svg" />
<StackPanel HorizontalAlignment="Center"> <StackPanel HorizontalAlignment="Center">
<StackPanel IsVisible="{Binding DoRetryAuth}">
<Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
<Button
Command="{Binding DoCurrentAuth}"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Center">
<customControls:LocalizedLabel LocalId="account-auth-retry"/>
</Button>
</Border>
<customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="account-auth-try-another"/>
</StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Label VerticalAlignment="Center"> <customControls:LocalizedLabel VerticalAlignment="Center" LocalId="account-auth-login"/>
Login:
</Label>
<TextBox Text="{Binding CurrentLogin}" MinWidth="200" /> <TextBox Text="{Binding CurrentLogin}" MinWidth="200" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Label HorizontalAlignment="Left" VerticalAlignment="Center"> <customControls:LocalizedLabel HorizontalAlignment="Left" VerticalAlignment="Center" LocalId="account-auth-password"/>
Password:
</Label>
<TextBox PasswordChar="#" MinWidth="200" Text="{Binding CurrentPassword}" /> <TextBox PasswordChar="#" MinWidth="200" Text="{Binding CurrentPassword}" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Label VerticalAlignment="Center"> <customControls:LocalizedLabel VerticalAlignment="Center" LocalId="account-auth-server"/>
Auth server: <Button Command="{Binding OnExpandAuthUrl}" VerticalAlignment="Stretch">
</Label>
<Button Command="{Binding ExpandAuthUrlCommand}" VerticalAlignment="Stretch">
<Label>+</Label> <Label>+</Label>
</Button> </Button>
</StackPanel> </StackPanel>
@@ -150,18 +172,10 @@
Command="{Binding DoAuth}" Command="{Binding DoAuth}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
HorizontalContentAlignment="Center"> HorizontalContentAlignment="Center">
<Label>Auth</Label> <customControls:LocalizedLabel LocalId="account-auth-button"/>
</Button> </Button>
</Border> </Border>
<Border BoxShadow="{StaticResource DefaultShadow}"> <Button Command="{Binding OnExpandAuthView}" HorizontalAlignment="Right">
<Button
Command="{Binding SaveProfileCommand}"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Center">
<Label>Save profile</Label>
</Button>
</Border>
<Button Command="{Binding ExpandAuthViewCommand}" HorizontalAlignment="Right">
<Label> <Label>
> >
</Label> </Label>
@@ -174,9 +188,15 @@
Margin="0,0,0,20" Margin="0,0,0,20"
Path="/Assets/svg/user.svg" /> Path="/Assets/svg/user.svg" />
<Label> <Label>
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel>
<TextBlock>Hello,</TextBlock> <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
<TextBlock Text="{Binding CurrentLogin}" /> <customControls:LocalizedLabel LocalId="account-auth-hello"/>
<TextBlock Text="{Binding Credentials.Value.Login}" />
</StackPanel>
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
<customControls:LocalizedLabel LocalId="account-auth-current-server"/>
<TextBlock Text="{Binding Credentials.Value.AuthServer}" />
</StackPanel>
</StackPanel> </StackPanel>
</Label> </Label>
<StackPanel <StackPanel
@@ -186,12 +206,14 @@
Spacing="5"> Spacing="5">
<Border BoxShadow="{StaticResource DefaultShadow}"> <Border BoxShadow="{StaticResource DefaultShadow}">
<Button Command="{Binding Logout}"> <Button Command="{Binding Logout}">
<Label>Logout</Label> <customControls:LocalizedLabel LocalId="account-auth-logout"/>
</Button> </Button>
</Border> </Border>
<Border BoxShadow="{StaticResource DefaultShadow}"> <Border BoxShadow="{StaticResource DefaultShadow}"
<Button Command="{Binding SaveProfileCommand}"> IsVisible="{Binding CurrentPassword,
<Label>Save profile</Label> Converter={x:Static converters:TypeConverters.StringIsNotEmpty}}">
<Button Command="{Binding OnSaveProfile}">
<customControls:LocalizedLabel LocalId="account-auth-save"/>
</Button> </Button>
</Border> </Border>
</StackPanel> </StackPanel>

View File

@@ -1,5 +1,4 @@
using Avalonia.Controls; using Avalonia.Controls;
using AccountInfoViewModel = Nebula.Launcher.ViewModels.Pages.AccountInfoViewModel;
namespace Nebula.Launcher.Views.Pages; namespace Nebula.Launcher.Views.Pages;
@@ -9,10 +8,4 @@ public partial class AccountInfoView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
public AccountInfoView(AccountInfoViewModel viewModel)
: this()
{
DataContext = viewModel;
}
} }

View File

@@ -3,6 +3,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages" xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages"
xmlns:customControls="clr-namespace:Nebula.Launcher.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Nebula.Launcher.Views.Pages.ConfigurationView" x:Class="Nebula.Launcher.Views.Pages.ConfigurationView"
x:DataType="pages:ConfigurationViewModel"> x:DataType="pages:ConfigurationViewModel">
@@ -10,31 +11,67 @@
<pages:ConfigurationViewModel /> <pages:ConfigurationViewModel />
</Design.DataContext> </Design.DataContext>
<Panel> <ScrollViewer>
<Border <StackPanel Spacing="10" Margin="10">
VerticalAlignment="Top" <ItemsControl
Margin="5" Padding="5,2,5,2"> ItemsSource="{Binding ConfigurationVerbose}"
<Border.Background> Padding="0" >
<LinearGradientBrush EndPoint="50%,100%" StartPoint="50%,0%"> <ItemsControl.ItemsPanel>
<GradientStop Color="#222222" Offset="0.0" /> <ItemsPanelTemplate>
<GradientStop Color="#292222" Offset="1.0" /> <StackPanel Spacing="10" />
</LinearGradientBrush> </ItemsPanelTemplate>
</Border.Background> </ItemsControl.ItemsPanel>
<ScrollViewer > </ItemsControl>
<StackPanel>
<ItemsControl <WrapPanel Orientation="Horizontal">
ItemsSource="{Binding ConfigurationVerbose}" <Button
Padding="0" /> Classes="ConfigBorder"
</StackPanel> VerticalAlignment="Bottom"
</ScrollViewer> HorizontalAlignment="Stretch"
</Border> Padding="5"
<Button Margin="5"
VerticalAlignment="Bottom" Command="{Binding InvokeUpdateConfiguration}">
HorizontalAlignment="Stretch" <customControls:LocalizedLabel LocalId="config-save"/>
Padding="5" </Button>
Margin="5" <Button
Command="{Binding InvokeUpdateConfiguration}" Classes="ConfigBorder"
>Save VerticalAlignment="Bottom"
</Button> HorizontalAlignment="Stretch"
</Panel> Padding="5"
Margin="5"
Command="{Binding ResetConfig}">
<customControls:LocalizedLabel LocalId="config-reset"/>
</Button>
<Button
Classes="ConfigBorder"
VerticalAlignment="Bottom"
HorizontalAlignment="Stretch"
Padding="5"
Margin="5"
Command="{Binding OpenDataFolder}">
<customControls:LocalizedLabel LocalId="config-open-data"/>
</Button>
<Button
Classes="ConfigBorder"
VerticalAlignment="Bottom"
HorizontalAlignment="Stretch"
Padding="5"
Margin="5"
Command="{Binding ExportLogs}">
<customControls:LocalizedLabel LocalId="config-export-logs"/>
</Button>
<Button
Classes="ConfigBorder"
VerticalAlignment="Bottom"
HorizontalAlignment="Stretch"
Padding="5"
Margin="5"
Command="{Binding RemoveAllContent}">
<customControls:LocalizedLabel LocalId="config-remove-content-all"/>
</Button>
</WrapPanel>
</StackPanel>
</ScrollViewer>
</UserControl> </UserControl>

View File

@@ -1,7 +1,4 @@
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Nebula.Launcher.ViewModels.Pages;
namespace Nebula.Launcher.Views.Pages; namespace Nebula.Launcher.Views.Pages;
@@ -11,10 +8,4 @@ public partial class ConfigurationView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
public ConfigurationView(ConfigurationViewModel viewModel)
: this()
{
DataContext = viewModel;
}
} }

View File

@@ -8,7 +8,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
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"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:services="clr-namespace:Nebula.Launcher.Services">
<Design.DataContext> <Design.DataContext>
<pages:ContentBrowserViewModel /> <pages:ContentBrowserViewModel />
</Design.DataContext> </Design.DataContext>
@@ -31,14 +32,14 @@
Margin="5" Margin="5"
Text="{Binding ServerText}" Text="{Binding ServerText}"
VerticalAlignment="Center" VerticalAlignment="Center"
Watermark="Server Url..." /> Watermark="{services:LocaledText content-view-server}" />
<TextBox <TextBox
Grid.Column="1" Grid.Column="1"
Grid.Row="0" Grid.Row="0"
Margin="5" Margin="5"
Text="{Binding SearchText}" Text="{Binding SearchText}"
VerticalAlignment="Center" VerticalAlignment="Center"
Watermark="Path..." /> Watermark="{services:LocaledText content-view-path}" />
<Button <Button
Command="{Binding OnBackEnter}" Command="{Binding OnBackEnter}"
Grid.Column="2" Grid.Column="2"

View File

@@ -1,5 +1,4 @@
using Avalonia.Controls; using Avalonia.Controls;
using ContentBrowserViewModel = Nebula.Launcher.ViewModels.Pages.ContentBrowserViewModel;
namespace Nebula.Launcher.Views.Pages; namespace Nebula.Launcher.Views.Pages;
@@ -9,10 +8,4 @@ public partial class ContentBrowserView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
public ContentBrowserView(ContentBrowserViewModel viewModel)
: this()
{
DataContext = viewModel;
}
} }

View File

@@ -10,7 +10,8 @@
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" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Nebula.Launcher.Controls" xmlns:controls="clr-namespace:Nebula.Launcher.Controls"
xmlns:models="clr-namespace:Nebula.Launcher.Models"> xmlns:models="clr-namespace:Nebula.Launcher.Models"
xmlns:services="clr-namespace:Nebula.Launcher.Services">
<Design.DataContext> <Design.DataContext>
<pages:ServerOverviewModel /> <pages:ServerOverviewModel />
@@ -51,8 +52,8 @@
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
IsVisible="{Binding IsFilterVisible}"> IsVisible="{Binding IsFilterVisible}">
<StackPanel Orientation="Vertical" Spacing="2" Margin="15"> <StackPanel Orientation="Vertical" Spacing="2" Margin="15">
<controls:FilterBox Name="EssentialFilters" FilterBoxName="Roleplay" FilterCommand="{Binding OnFilterChanged}"/> <controls:FilterBox Name="EssentialFilters" FilterBoxName="filter-roleplay" FilterCommand="{Binding OnFilterChanged}"/>
<controls:FilterBox Name="LanguageFilters" FilterBoxName="Language" FilterCommand="{Binding OnFilterChanged}"/> <controls:FilterBox Name="LanguageFilters" FilterBoxName="filter-language" FilterCommand="{Binding OnFilterChanged}"/>
</StackPanel> </StackPanel>
</Border> </Border>
@@ -70,9 +71,8 @@
<TextBox <TextBox
Margin="25,0,0,0" Margin="25,0,0,0"
Text="{Binding SearchText}" Text="{Binding SearchText}"
TextChanged="TextBox_OnTextChanged"
VerticalAlignment="Center" VerticalAlignment="Center"
Watermark="Server name..." /> Watermark="{services:LocaledText 'server-search'}" />
<Button <Button
Command="{Binding FilterRequired}" Command="{Binding FilterRequired}"
Grid.Column="2" Grid.Column="2"

View File

@@ -1,11 +1,9 @@
using Avalonia.Controls; using Avalonia.Controls;
using Nebula.Launcher.ViewModels.Pages;
namespace Nebula.Launcher.Views.Pages; namespace Nebula.Launcher.Views.Pages;
public partial class ServerOverviewView : UserControl public partial class ServerOverviewView : UserControl
{ {
// This constructor is used when the view is created by the XAML Previewer
public ServerOverviewView() public ServerOverviewView()
{ {
InitializeComponent(); InitializeComponent();
@@ -19,17 +17,4 @@ public partial class ServerOverviewView : UserControl
LanguageFilters.AddFilter("RU","lang:ru"); LanguageFilters.AddFilter("RU","lang:ru");
LanguageFilters.AddFilter("EN","lang:en"); LanguageFilters.AddFilter("EN","lang:en");
} }
// This constructor is used when the view is created via dependency injection
public ServerOverviewView(ServerOverviewModel viewModel)
: this()
{
DataContext = viewModel;
}
private void TextBox_OnTextChanged(object? sender, TextChangedEventArgs e)
{
var context = (ServerOverviewModel?)DataContext;
context?.OnSearchChange?.Invoke();
}
} }

View File

@@ -8,6 +8,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup" xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup"
xmlns:customControls="clr-namespace:Nebula.Launcher.Controls"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Design.DataContext> <Design.DataContext>
<popup:AddFavoriteViewModel /> <popup:AddFavoriteViewModel />
@@ -18,7 +19,7 @@
</Border> </Border>
<Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}"> <Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
<Button Command="{Binding OnEnter}" HorizontalAlignment="Stretch"> <Button Command="{Binding OnEnter}" HorizontalAlignment="Stretch">
<Label HorizontalAlignment="Center">Add</Label> <customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="favorite-add"/>
</Button> </Button>
</Border> </Border>
<Label> <Label>

View File

@@ -1,5 +1,4 @@
using Avalonia.Controls; using Avalonia.Controls;
using Nebula.Launcher.ViewModels.Popup;
namespace Nebula.Launcher.Views.Popup; namespace Nebula.Launcher.Views.Popup;
@@ -9,10 +8,4 @@ public partial class AddFavoriteView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
public AddFavoriteView(AddFavoriteViewModel viewModel)
: this()
{
DataContext = viewModel;
}
} }

View File

@@ -0,0 +1,32 @@
<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:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup"
xmlns:customControls="clr-namespace:Nebula.Launcher.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Nebula.Launcher.Views.Popup.EditServerNameView"
x:DataType="popup:EditServerNameViewModel">
<Design.DataContext>
<popup:EditServerNameViewModel />
</Design.DataContext>
<StackPanel Margin="15" Spacing="10">
<Border BoxShadow="{StaticResource DefaultShadow}">
<TextBlock Text="{Binding IpInput}" Margin="10,8,10,8"/>
</Border>
<Border BoxShadow="{StaticResource DefaultShadow}">
<TextBox Text="{Binding NameInput}" Watermark="custom server name" />
</Border>
<Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
<Button Command="{Binding OnEnter}" HorizontalAlignment="Stretch">
<customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="servername-set"/>
</Button>
</Border>
<Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
<Button Command="{Binding OnClear}" HorizontalAlignment="Stretch">
<customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="servername-clear"/>
</Button>
</Border>
</StackPanel>
</UserControl>

View File

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

View File

@@ -1,5 +1,4 @@
using Avalonia.Controls; using Avalonia.Controls;
using Nebula.Launcher.ViewModels.Popup;
namespace Nebula.Launcher.Views.Popup; namespace Nebula.Launcher.Views.Popup;
@@ -9,9 +8,4 @@ public partial class ExceptionListView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
public ExceptionListView(ExceptionListViewModel listViewModel) : this()
{
DataContext = listViewModel;
}
} }

View File

@@ -15,7 +15,7 @@
<Panel HorizontalAlignment="Center" VerticalAlignment="Center"> <Panel HorizontalAlignment="Center" VerticalAlignment="Center">
<Label> <Label>
<TextBlock Text="{Binding InfoText}" /> <TextBlock Text="{Binding InfoText}" TextWrapping="Wrap"/>
</Label> </Label>
</Panel> </Panel>
</UserControl> </UserControl>

View File

@@ -1,5 +1,4 @@
using Avalonia.Controls; using Avalonia.Controls;
using InfoPopupViewModel = Nebula.Launcher.ViewModels.Popup.InfoPopupViewModel;
namespace Nebula.Launcher.Views.Popup; namespace Nebula.Launcher.Views.Popup;
@@ -9,9 +8,4 @@ public partial class InfoPopupView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
public InfoPopupView(InfoPopupViewModel viewModel) : this()
{
DataContext = viewModel;
}
} }

View File

@@ -0,0 +1,35 @@
<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:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup"
xmlns:controls="clr-namespace:Nebula.Launcher.Controls"
xmlns:services="clr-namespace:Nebula.Launcher.Services"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Nebula.Launcher.Views.Popup.IsLoginCredentialsNullPopupView"
x:DataType="popup:IsLoginCredentialsNullPopupViewModel">
<Design.DataContext>
<popup:IsLoginCredentialsNullPopupViewModel />
</Design.DataContext>
<StackPanel Margin="15" Orientation="Vertical" Spacing="15">
<TextBlock HorizontalAlignment="Center" Text="{services:LocaledText popup-login-credentials-warning-label}" TextWrapping="Wrap"/>
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
<Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
<Button Command="{Binding GotoAuthPage}">
<TextBlock Text="{services:LocaledText popup-login-credentials-warning-go-auth}"/>
</Button>
</Border>
<Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
<Button Command="{Binding Cancel}">
<TextBlock Text="{services:LocaledText popup-login-credentials-warning-cancel}"/>
</Button>
</Border>
<Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
<Button Command="{Binding Proceed}">
<TextBlock Text="{services:LocaledText popup-login-credentials-warning-proceed}"/>
</Button>
</Border>
</StackPanel>
</StackPanel>
</UserControl>

View File

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

View File

@@ -2,6 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:customControls="clr-namespace:Nebula.Launcher.Controls"
xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup" xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Nebula.Launcher.Views.Popup.LoadingContextView" x:Class="Nebula.Launcher.Views.Popup.LoadingContextView"
@@ -29,8 +30,13 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Command="{Binding Cancel}" Command="{Binding Cancel}"
IsVisible="{Binding IsCancellable}"> IsVisible="{Binding IsCancellable}">
<Label>Cancel</Label> <customControls:LocalizedLabel LocalId="task-cancel"/>
</Button> </Button>
</Panel> </Panel>
<Panel>
<Border Background="{StaticResource DefaultForeground}" MinHeight="210">
<TextBlock TextWrapping="Wrap" Text="{Binding Message}" MaxLines="10" Margin="15"/>
</Border>
</Panel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

View File

@@ -1,5 +1,4 @@
using Avalonia.Controls; using Avalonia.Controls;
using LoadingContextViewModel = Nebula.Launcher.ViewModels.Popup.LoadingContextViewModel;
namespace Nebula.Launcher.Views.Popup; namespace Nebula.Launcher.Views.Popup;
@@ -9,9 +8,4 @@ public partial class LoadingContextView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
public LoadingContextView(LoadingContextViewModel viewModel) : this()
{
DataContext = viewModel;
}
} }

View File

@@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels" xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels"
xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup" xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup"
xmlns:models="clr-namespace:Nebula.Launcher.Models"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Nebula.Launcher.Views.Popup.LogPopupView" x:Class="Nebula.Launcher.Views.Popup.LogPopupView"
x:DataType="popup:LogPopupModelView"> x:DataType="popup:LogPopupModelView">
@@ -17,7 +18,7 @@
ItemsSource="{Binding Logs}" ItemsSource="{Binding Logs}"
Padding="0"> Padding="0">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type viewModels:LogInfo}"> <DataTemplate DataType="{x:Type models:LogInfo}">
<Border CornerRadius="5" Margin="0,0,0,5"> <Border CornerRadius="5" Margin="0,0,0,5">
<StackPanel Orientation="Horizontal" Spacing="5" Margin="0"> <StackPanel Orientation="Horizontal" Spacing="5" Margin="0">
<Border MinWidth="100" <Border MinWidth="100"

View File

@@ -1,5 +1,4 @@
using Avalonia.Controls; using Avalonia.Controls;
using Nebula.Launcher.ViewModels.Popup;
namespace Nebula.Launcher.Views.Popup; namespace Nebula.Launcher.Views.Popup;
@@ -9,9 +8,4 @@ public partial class LogPopupView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
public LogPopupView(LogPopupModelView viewModel) : this()
{
DataContext = viewModel;
}
} }

View File

@@ -2,6 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:customControls="clr-namespace:Nebula.Launcher.Controls"
xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup" xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Nebula.Launcher.Views.Popup.TfaView"> x:Class="Nebula.Launcher.Views.Popup.TfaView">
@@ -9,7 +10,7 @@
<popup:TfaViewModel /> <popup:TfaViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel HorizontalAlignment="Stretch" Spacing="25" VerticalAlignment="Center"> <StackPanel HorizontalAlignment="Stretch" Spacing="25" VerticalAlignment="Center">
<Label HorizontalAlignment="Center">You have two-factor authentication enabled. Please enter the code.</Label> <customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="twofa-enabled"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10" x:Name="TContainer"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10" x:Name="TContainer">
<Border BoxShadow="{StaticResource DefaultShadow}"> <Border BoxShadow="{StaticResource DefaultShadow}">
<TextBox MaxLength="1"/> <TextBox MaxLength="1"/>
@@ -32,7 +33,7 @@
</StackPanel> </StackPanel>
<Border BoxShadow="{StaticResource DefaultShadow}" Background="{StaticResource DefaultSelected}" HorizontalAlignment="Center"> <Border BoxShadow="{StaticResource DefaultShadow}" Background="{StaticResource DefaultSelected}" HorizontalAlignment="Center">
<Button Click="Button_OnClick"> <Button Click="Button_OnClick">
<Label HorizontalAlignment="Center" Margin="15,5,15,5">OK</Label> <customControls:LocalizedLabel HorizontalAlignment="Center" Margin="15,5,15,5" LocalId="twofa-set"/>
</Button> </Button>
</Border> </Border>
</StackPanel> </StackPanel>

View File

@@ -1,11 +1,8 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
using Nebula.Launcher.ViewModels.Popup; using Nebula.Launcher.ViewModels.Popup;
namespace Nebula.Launcher.Views.Popup; namespace Nebula.Launcher.Views.Popup;
@@ -88,11 +85,6 @@ public partial class TfaView : UserControl
return (TextBox)box.Child!; return (TextBox)box.Child!;
} }
public TfaView(TfaViewModel tfaViewModel) : this()
{
DataContext = tfaViewModel;
}
private void Button_OnClick(object? sender, RoutedEventArgs e) private void Button_OnClick(object? sender, RoutedEventArgs e)
{ {
CheckupCode(); CheckupCode();

View File

@@ -0,0 +1,78 @@
<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:viewModels="clr-namespace:Nebula.Launcher.ViewModels"
xmlns:views="clr-namespace:Nebula.Launcher.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Nebula.Launcher.Views.ServerCompoundEntryView"
x:DataType="viewModels:ServerCompoundEntryViewModel">
<Design.DataContext>
<viewModels:ServerCompoundEntryViewModel />
</Design.DataContext>
<Panel>
<Border IsVisible="{Binding Loading}"
Background="{StaticResource DefaultGrad}"
BoxShadow="-2 0 5 -1 #121212"
CornerRadius="10"
Margin="5">
<Grid ColumnDefinitions="*,80,50,50" RowDefinitions="35,*,*">
<Border
Background="Transparent"
BoxShadow="0 3 3 -2 #121212"
CornerRadius="10"
Grid.Column="0"
Grid.ColumnSpan="2"
Grid.Row="0"/>
<ScrollViewer
Grid.Column="0"
Grid.Row="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
HorizontalScrollBarVisibility="Hidden"
Margin="10,0,0,0"
VerticalScrollBarVisibility="Disabled"
x:Name="AutoScrollViewer">
<StackPanel Orientation="Horizontal">
<Label VerticalAlignment="Center">
<TextBlock Text="{Binding Name}" />
</Label>
<Label VerticalAlignment="Center">
<TextBlock Text="{Binding Message}" />
</Label>
</StackPanel>
</ScrollViewer>
<Panel
Grid.Column="2"
Grid.Row="0"
Margin="5,0,0,0">
<Button
Command="{Binding ToggleFavorites}"
CornerRadius="10,10,10,10"
HorizontalAlignment="Stretch"
IsVisible="{Binding !IsFavorite}"
VerticalAlignment="Stretch">
<Svg Margin="4" Path="/Assets/svg/star.svg" />
</Button>
<Button
Command="{Binding ToggleFavorites}"
CornerRadius="10,10,10,10"
HorizontalAlignment="Stretch"
IsVisible="{Binding IsFavorite}"
VerticalAlignment="Stretch">
<Svg Margin="4" Path="/Assets/svg/starfull.svg" />
</Button>
</Panel>
</Grid>
</Border>
<Panel IsVisible="{Binding !Loading}">
<views:ServerEntryView IsVisible="{Binding !Loading}" DataContext="{Binding CurrentEntry}"/>
</Panel>
</Panel>
</UserControl>

View File

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

Some files were not shown because too many files have changed in this diff Show More