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

- tweak: View autogenerator

Browse Source
This commit is contained in:
Cinka
2025-07-02 21:32:51 +03:00
parent 9e95d68c4a
commit 517fadaab8
57 changed files with 316 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Nebula.Launcher/ViewModels/MainViewModel.cs
View File

@@ -10,10 +10,10 @@ using Nebula.Launcher.Services;
using Nebula.Launcher.ViewModels.Pages;
using Nebula.Launcher.ViewModels.Popup;
using Nebula.Launcher.Views;
using Nebula.Shared.Models;
using Nebula.Shared.Services;
using Nebula.Shared.Services.Logging;
using Nebula.Shared.Utils;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels;

18
Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs
View File

@@ -3,17 +3,17 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Net.Http;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
using System.Windows.Input;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Nebula.Launcher.Models.Auth;
using Nebula.Launcher.Services;
using Nebula.Launcher.ViewModels.Popup;
using Nebula.Launcher.Views.Pages;
using Nebula.Shared.Services;
using Nebula.Shared.Services.Logging;
using Nebula.Shared.Utils;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Pages;
@@ -322,16 +322,4 @@ public partial class AccountInfoViewModel : ViewModelBase
ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles,
Accounts.ToArray());
}
}
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
);
}

23
Nebula.Launcher/ViewModels/Pages/ConfigurationViewModel.cs
View File

@@ -7,13 +7,17 @@ using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Layout;
using Nebula.Launcher.Services;
using Nebula.Launcher.ViewModels.Popup;
using Nebula.Launcher.Views.Pages;
using Nebula.Shared;
using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Pages;
@@ -26,13 +30,17 @@ public partial class ConfigurationViewModel : ViewModelBase
[GenerateProperty] private ConfigurationService ConfigurationService { 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 List<(object, Type)> ConVarList = new();
public void AddCvarConf<T>(ConVar<T> cvar)
{
ConfigurationVerbose.Add(
ConfigControlHelper.GetConfigControl(cvar.Name, ConfigurationService.GetConfigValue(cvar)));
ConfigControlHelper.GetConfigControl(cvar.Name, ConfigurationService.GetConfigValue(cvar)!));
ConVarList.Add((cvar, cvar.Type));
}
@@ -80,7 +88,18 @@ public partial class ConfigurationViewModel : ViewModelBase
ZipFile.CreateFromDirectory(logPath, Path.Join(path, DateTime.Now.ToString("yyyy-MM-dd") + ".zip"));
ExplorerHelper.OpenFolder(path);
}
public void RemoveAllContent()
{
Task.Run(() =>
{
using var loader = ViewHelperService.GetViewModel<LoadingContextViewModel>();
loader.LoadingName = "Removing content";
PopupService.Popup(loader);
ContentService.RemoveAllContent(loader, CancellationService.Token);
});
}
private void InitConfiguration()
{
AddCvarConf(LauncherConVar.ILSpyUrl);

1
Nebula.Launcher/ViewModels/Pages/ContentBrowserViewModel.cs
View File

@@ -18,6 +18,7 @@ using Nebula.Shared.FileApis;
using Nebula.Shared.Models;
using Nebula.Shared.Services;
using Nebula.Shared.Utils;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Pages;

5
Nebula.Launcher/ViewModels/Pages/ServerOverviewModel.cs
View File

@@ -14,6 +14,7 @@ using Nebula.Launcher.Views.Pages;
using Nebula.Shared;
using Nebula.Shared.Models;
using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Pages;
@@ -315,6 +316,4 @@ public sealed class ServerFilter
{
return IsMatchByName(name) && IsMatchByTags(itemTags);
}
}
public sealed record ServerCustomNameEntry(string Url, string Name);
}

1
Nebula.Launcher/ViewModels/Popup/AddFavoriteViewModel.cs
View File

@@ -7,6 +7,7 @@ using Nebula.Launcher.Views.Pages;
using Nebula.Shared.Services;
using Nebula.Shared.Services.Logging;
using Nebula.Shared.Utils;
using Nebula.Shared.ViewHelper;
using AddFavoriteView = Nebula.Launcher.Views.Popup.AddFavoriteView;
namespace Nebula.Launcher.ViewModels.Popup;

1
Nebula.Launcher/ViewModels/Popup/EditServerNameViewModel.cs
View File

@@ -2,6 +2,7 @@ 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;

1
Nebula.Launcher/ViewModels/Popup/ExceptionListViewModel.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.ObjectModel;
using Nebula.Launcher.Services;
using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup;

1
Nebula.Launcher/ViewModels/Popup/InfoPopupViewModel.cs
View File

@@ -2,6 +2,7 @@ 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;

1
Nebula.Launcher/ViewModels/Popup/LoadingContextViewModel.cs
View File

@@ -3,6 +3,7 @@ using Nebula.Launcher.Services;
using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Models;
using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup;

40
Nebula.Launcher/ViewModels/Popup/LogPopupModelView.cs
View File

@@ -1,8 +1,8 @@
using System.Collections.ObjectModel;
using System.Text.RegularExpressions;
using Avalonia.Media;
using Nebula.Launcher.Models;
using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup;
@@ -42,40 +42,4 @@ public sealed partial class LogPopupModelView : PopupViewModelBase
{
Logs.Clear();
}
}
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
};
}
}

1
Nebula.Launcher/ViewModels/Popup/TfaViewModel.cs
View File

@@ -2,6 +2,7 @@ using System;
using Nebula.Launcher.Services;
using Nebula.Launcher.Views.Popup;
using Nebula.Shared.Services;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels.Popup;

2
Nebula.Launcher/ViewModels/ServerCompoundEntryModelView.cs
View File

@@ -6,11 +6,13 @@ 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;

36
Nebula.Launcher/ViewModels/ServerEntryModelView.cs
View File

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using System.Windows.Input;
using Avalonia.Controls;
using CommunityToolkit.Mvvm.ComponentModel;
using Nebula.Launcher.Models;
using Nebula.Launcher.ProcessHelper;
using Nebula.Launcher.ServerListProviders;
using Nebula.Launcher.Services;
@@ -16,6 +17,7 @@ using Nebula.Shared.Models;
using Nebula.Shared.Services;
using Nebula.Shared.Services.Logging;
using Nebula.Shared.Utils;
using Nebula.Shared.ViewHelper;
namespace Nebula.Launcher.ViewModels;
@@ -217,35 +219,6 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, ILis
}
}
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);
}
}
public class LinkGoCommand : ICommand
{
public LinkGoCommand()
@@ -265,9 +238,4 @@ public class LinkGoCommand : ICommand
}
public event EventHandler? CanExecuteChanged;
}
public interface IFilterConsumer
{
public void ProcessFilter(ServerFilter? serverFilter);
}