Enhanced launcher UI with modern design

src/Launcher/ViewModels/AddServer.cs

@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 using Launcher.Extensions;
 using Launcher.Helpers;
@@ -17,12 +18,19 @@ public partial class AddServer : Popup
 {
     private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
+    private readonly ServerInfo? _editingInfo;
+
     [Required]
     [ObservableProperty]
     [NotifyDataErrorInfo]
     [CustomValidation(typeof(AddServer), nameof(ValidateServerUrl))]
     private string serverUrl = string.Empty;
 
+    [ObservableProperty]
+    private string serverName = string.Empty;
+
+    public bool IsEditMode => _editingInfo is not null;
+
     public AddServer()
     {
         View = new Views.AddServer
@@ -31,6 +39,42 @@ public AddServer()
         };
     }
 
+    public AddServer(ServerInfo info)
+    {
+        _editingInfo = info;
+
+        ServerUrl = info.Url;
+        ServerName = info.Name;
+
+        View = new Views.AddServer
+        {
+            DataContext = this
+        };
+    }
+
+    [RelayCommand]
+    public void Delete()
+    {
+        if (_editingInfo is null)
+            return;
+
+        Settings.Instance.ServerInfoList.Remove(_editingInfo);
+        Settings.Instance.Save();
+
+        App.CancelPopup();
+        App.AddNotification("Server deleted.", false);
+    }
+
+    [RelayCommand]
+    public void Register()
+    {
+        if (_editingInfo is null)
+            return;
+
+        App.CancelPopup();
+        App.ShowPopup(new Register(_editingInfo));
+    }
+
     public static ValidationResult? ValidateServerUrl(string serverUrl, ValidationContext context)
     {
         if (string.IsNullOrWhiteSpace(serverUrl))
@@ -54,7 +98,26 @@ public override Task<bool> ProcessAsync()
     {
         ProgressDescription = App.GetText("Text.Add_Server.Loading");
 
-        return TryAddServerAsync(ServerUrl);
+        return IsEditMode ? OnEditServerAsync() : TryAddServerAsync(ServerUrl);
+    }
+
+    private Task<bool> OnEditServerAsync()
+    {
+        try
+        {
+            _editingInfo!.Url = ServerUrl.Trim();
+            _editingInfo.Name = ServerName.Trim();
+
+            Settings.Instance.Save();
+
+            return Task.FromResult(true);
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "An exception occurred while updating server.");
+            App.AddNotification("An error occurred while updating server.", true);
+            return Task.FromResult(false);
+        }
     }
 
     public static async Task<bool> TryAddServerAsync(string serverUrl)

src/Launcher/ViewModels/Main.cs

@@ -36,6 +36,10 @@ public partial class Main : ObservableObject
     [ObservableProperty]
     private SemanticVersion version = App.CurrentVersion;
 
+    public string DisplayName => Settings.Instance.DisplayName;
+
+    public bool IsGameRunning => Servers.Any(x => x.Process is not null);
+
     public AvaloniaList<Server> Servers { get; } = [];
     public AvaloniaList<Notification> Notifications { get; } = [];
 
@@ -54,6 +58,11 @@ public Main()
         // Subscribe to changes in the server list from settings to keep the UI in sync.
         Settings.Instance.ServerInfoList.CollectionChanged += ServerInfoList_CollectionChanged;
         Settings.Instance.DiscordActivityChanged += (_, _) => UpdateDiscordActivity();
+        Settings.Instance.PropertyChanged += (_, e) =>
+        {
+            if (e.PropertyName == nameof(Settings.DisplayName))
+                OnPropertyChanged(nameof(DisplayName));
+        };
     }
 
     private void ServerInfoList_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
@@ -85,7 +94,7 @@ public void OnLoad()
             _logger.Info("No servers found in settings. Adding default servers.");
             foreach (var defaultServerUrl in Constants.DefaultServerUrls)
             {
-                _ = AddServer.TryAddServerAsync(defaultServerUrl);
+                _ = ViewModels.AddServer.TryAddServerAsync(defaultServerUrl);
             }
         }
 
@@ -107,6 +116,11 @@ public void UpdateDiscordActivity()
         DiscordService.UpdateActivity(details, playingOn);
     }
 
+    public void RefreshRuntimeState()
+    {
+        OnPropertyChanged(nameof(IsGameRunning));
+    }
+
     [RelayCommand]
     public Task CheckForUpdates() => App.CheckForUpdatesAsync();
 
@@ -122,6 +136,43 @@ public void ShowSettings()
     [RelayCommand]
     public void ShowAddServer() => App.ShowPopup(new AddServer());
 
+    [RelayCommand]
+    public void AddServer() => App.ShowPopup(new AddServer());
+
+    public void EditServer(Server server)
+    {
+        var viewModel = new AddServer(server.Info);
+        App.ShowPopup(viewModel, process: false);
+    }
+
+    [RelayCommand]
+    public async Task OpenDiscordAsync()
+    {
+        try
+        {
+            var window = App.GetWindow();
+            await window.Launcher.LaunchUriAsync(new Uri("https://discord.gg/x7Xfz99Ydv"));
+        }
+        catch
+        {
+            App.AddNotification("Unable to open Discord link.", true);
+        }
+    }
+
+    [RelayCommand]
+    public async Task OpenRedditAsync()
+    {
+        try
+        {
+            var window = App.GetWindow();
+            await window.Launcher.LaunchUriAsync(new Uri("https://www.reddit.com/r/freerealms/"));
+        }
+        catch
+        {
+            App.AddNotification("Unable to open Reddit link.", true);
+        }
+    }
+
     [RelayCommand]
     public async Task OpenLogsAsync()
     {

src/Launcher/ViewModels/Register.cs

@@ -15,7 +15,8 @@ namespace Launcher.ViewModels;
 
 public partial class Register : Popup
 {
-    private readonly Server _server;
+    private readonly Server? _server;
+    private readonly ServerInfo? _serverInfo;
     private readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
     [ObservableProperty]
@@ -57,6 +58,20 @@ public Register(Server server)
         };
     }
 
+    public Register(ServerInfo serverInfo)
+    {
+        _serverInfo = serverInfo;
+
+        AddSecureWarning();
+
+        View = new Views.Register
+        {
+            DataContext = this
+        };
+    }
+
+    private ServerInfo Info => _server?.Info ?? _serverInfo!;
+
     public static ValidationResult? ValidateConfirmPassword(string confirmPassword, ValidationContext context)
     {
         if (context.ObjectInstance is not Register register)
@@ -82,7 +97,7 @@ public override async Task<bool> ProcessAsync()
                 Password = Password
             };
 
-            var baseUri = new Uri(_server.Info.WebApiUrl);
+            var baseUri = new Uri(Info.WebApiUrl);
 
             var registerUri = new Uri(baseUri, "register");
 
@@ -101,7 +116,7 @@ public override async Task<bool> ProcessAsync()
             {
                 App.AddNotification("Registration failed. Please check your username and password and try again", true);
 
-                _logger.Warn("Registration failed for server: '{Name}'. API returned {StatusCode}: {Reason}.", _server.Info.Name, httpResponse.StatusCode, httpResponse.ReasonPhrase);
+                _logger.Warn("Registration failed for server: '{Name}'. API returned {StatusCode}: {Reason}.", Info.Name, httpResponse.StatusCode, httpResponse.ReasonPhrase);
 
                 Username = string.Empty;
                 Password = string.Empty;
@@ -117,15 +132,15 @@ public override async Task<bool> ProcessAsync()
         {
             App.AddNotification("Registration failed. Please check your username and password and try again", true);
 
-            _logger.Error(ex, "An exception occurred registering on server: '{Name}'.", _server.Info.Name);
+            _logger.Error(ex, "An exception occurred registering on server: '{Name}'.", Info.Name);
 
             return false;
         }
     }
 
     private void AddSecureWarning()
     {
-        if (Uri.TryCreate(_server.Info.WebApiUrl, UriKind.Absolute, out var webApiUrl)
+        if (Uri.TryCreate(Info.WebApiUrl, UriKind.Absolute, out var webApiUrl)
             && webApiUrl.Scheme != Uri.UriSchemeHttps)
         {
             Warning = App.GetText("Text.Server.SecureApiWarning");

src/Launcher/ViewModels/Server.cs

@@ -9,6 +9,8 @@
 using System.Threading.Tasks;
 
 using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 using Avalonia.Platform.Storage;
 
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -67,6 +69,17 @@ public partial class Server : ObservableObject
     [ObservableProperty]
     private ObservableStringBuilder markdownBuilder = new();
 
+    public bool IsLocalServer => false;
+
+    public string ProfileTitle => Info?.Name ?? "Unknown Server";
+
+    public string ProfileSubtitle => IsOnline ? "Online" : "Offline";
+
+    private static readonly IImage IconGreen = new Bitmap(AssetLoader.Open(new Uri("avares://Launcher/Assets/ServerIcons/Server_Icon_Green.png")));
+    private static readonly IImage IconRed = new Bitmap(AssetLoader.Open(new Uri("avares://Launcher/Assets/ServerIcons/Server_Icon_Red.png")));
+
+    public IImage ServerIconSource => IsOnline ? IconGreen : IconRed;
+
     public Server()
     {
 #if DEBUG && DESIGNMODE
@@ -107,6 +120,13 @@ public void ClientProcessExited(object? sender, EventArgs e)
         Process = null;
     }
 
+    [RelayCommand]
+    private async Task EditAsync()
+    {
+        _main.EditServer(this);
+        await OnShowAsync();
+    }
+
     [RelayCommand]
     private async Task OpenUriAsync(LinkClickedEventArgs args)
     {

src/Launcher/ViewModels/Settings.cs

@@ -34,6 +34,9 @@ public partial class Settings : ObservableObject
     [ObservableProperty]
     private LocaleType locale = LocaleType.en_US;
 
+    [ObservableProperty]
+    private string displayName = "User";
+
     [ObservableProperty]
     private AvaloniaList<ServerInfo> serverInfoList = [];
 
@@ -71,6 +74,9 @@ public void Save()
     partial void OnLocaleChanged(LocaleType value)
         => LocaleChanged?.Invoke(this, EventArgs.Empty);
 
+    partial void OnDisplayNameChanged(string value)
+        => Save();
+
     partial void OnDiscordActivityChanged(bool value)
     {
         if (value)