Dev

src/Gml.Launcher/App.axaml

@@ -30,6 +30,7 @@
         <StyleInclude Source="/Views/Components/ProfileUserControl.axaml" />
         <StyleInclude Source="/Views/Components/ProfileInfoComponent.axaml" />
         <StyleInclude Source="/Views/Components/ProgressBar.axaml" />
+        <StyleInclude Source="/Views/Components/OnlineComponent.axaml" />
 
         <StyleInclude Source="Assets/Styles/Classes.axaml"/>
 

src/Gml.Launcher/Assets/Resources/ResourceKeysDictionary.Template.cs

@@ -20,6 +20,7 @@ public static class ResourceKeysDictionary
     public const string CheckUpdates = "CheckUpdates";
     public const string InstallingUpdates = "InstallingUpdates";
     public const string FailedOs = "FailedOs";
+    public const string JavaNotFound = "JavaNotFound";
     public const string Host = "{{HOST}}";
     public const string FolderName = "{{FOLDER_NAME}}";
 }

src/Gml.Launcher/Assets/Resources/ResourceKeysDictionary.cs

@@ -20,8 +20,9 @@ public static class ResourceKeysDictionary
     public const string CheckUpdates = "CheckUpdates";
     public const string InstallingUpdates = "InstallingUpdates";
     public const string FailedOs = "FailedOs";
-    public const string Host = "http://192.168.31.199:5000";
-    // public const string Host = "https://gmlb.recloud.tech";
+    public const string JavaNotFound = "JavaNotFound";
+    // public const string Host = "http://192.168.31.199:5000";
+    public const string Host = "https://gmlb.recloud.tech";
     // public const string Host = "https://gmlb-test.recloud.tech";
     public const string FolderName = "GamerVIILacunerhV2";
 }

src/Gml.Launcher/Assets/Resources/Resources.en.resx

@@ -107,4 +107,13 @@
   <data name="FailedOs" xml:space="preserve">
     <value>Failed to determine the operating system</value>
   </data>
+  <data name="OnServers" xml:space="preserve">
+    <value>On servers</value>
+  </data>
+  <data name="PlayersShort" xml:space="preserve">
+    <value>pl.</value>
+  </data>
+  <data name="JavaNotFound" xml:space="preserve">
+    <value>Unable to detect a loaded Java for your operating system, please contact support or the project administrator.</value>
+  </data>
 </root>

src/Gml.Launcher/Assets/Resources/Resources.resx

@@ -114,4 +114,13 @@
   <data name="FailedOs" xml:space="preserve">
     <value>Failed to determine the operating system</value>
   </data>
+  <data name="OnServers" xml:space="preserve">
+    <value>On servers</value>
+  </data>
+  <data name="PlayersShort" xml:space="preserve">
+    <value>pl.</value>
+  </data>
+  <data name="JavaNotFound" xml:space="preserve">
+    <value>Unable to detect a loaded Java for your operating system, please contact support or the project administrator.</value>
+  </data>
 </root>

src/Gml.Launcher/Assets/Resources/Resources.ru.resx

@@ -107,4 +107,13 @@
   <data name="FailedOs" xml:space="preserve">
     <value>Не удалось определить операционную систему</value>
   </data>
+  <data name="OnServers" xml:space="preserve">
+    <value>На серверах</value>
+  </data>
+  <data name="PlayersShort" xml:space="preserve">
+    <value>чел.</value>
+  </data>
+  <data name="JavaNotFound" xml:space="preserve">
+    <value>Не удалось обнаружить загруженную Java для Вашей операционной системы, обратитесь в поддержку или к администратору проекта</value>
+  </data>
 </root>

src/Gml.Launcher/Core/Converters/SumServersOnlineConverter.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Data.Converters;
+using Avalonia.Markup.Xaml;
+using Gml.Web.Api.Dto.Servers;
+
+namespace Gml.Launcher.Core.Converters;
+
+public class SumServersOnlineConverter : MarkupExtension, IValueConverter
+{
+    public override object ProvideValue(IServiceProvider serviceProvider) => this;
+
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is List<ServerReadDto> server)
+        {
+            return server
+                .Where(c => c.IsOnline)
+                .Sum(c => c.Online)?
+                .ToString() ?? "0";
+        }
+
+        return "0";
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        return "0";
+    }
+}

src/Gml.Launcher/Core/Converters/UrlRedirectProperty.cs

@@ -0,0 +1,30 @@
+using System.Diagnostics;
+using Avalonia;
+using Avalonia.Controls;
+
+namespace Gml.Launcher.Core.Converters;
+
+public class UrlRedirectProperty
+{
+    public static readonly AttachedProperty<string> RedirectUrlProperty =
+        AvaloniaProperty.RegisterAttached<UrlRedirectProperty, Control, string>("RedirectUrl");
+
+    public static void SetRedirectUrl(Control obj, string value) => obj.SetValue(RedirectUrlProperty, value);
+    public static string GetRedirectUrl(Control obj) => obj.GetValue(RedirectUrlProperty);
+
+    public UrlRedirectProperty()
+    {
+        RedirectUrlProperty.Changed.AddClassHandler<Control>(OnSourceChanged);
+    }
+
+    private void OnSourceChanged(Control control, AvaloniaPropertyChangedEventArgs args)
+    {
+        var url = args.GetNewValue<string>();
+
+        Process.Start(new ProcessStartInfo
+        {
+            FileName = url,
+            UseShellExecute = true
+        });
+    }
+}

src/Gml.Launcher/Models/SettingsInfo.cs

@@ -2,4 +2,6 @@
 
 public record SettingsInfo(int GameWidth, int GameHeight, bool FullScreen, bool IsDynamicRam, double RamValue, string? LanguageCode)
 {
+    public static SettingsInfo Default
+        => new SettingsInfo(900, 600, false, true, 0, "ru-RU");
 }

src/Gml.Launcher/ViewModels/Pages/OverviewPageViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Reactive.Concurrency;
@@ -130,7 +131,7 @@ await ExecuteFromNewThread(async () =>
         {
             try
             {
-                var profileInfo = await PrepareLaunch();
+                var profileInfo = await GetProfileInfo();
 
                 if (profileInfo is { Data: not null })
                 {
@@ -147,6 +148,12 @@ await ExecuteFromNewThread(async () =>
                     ShowError(ResourceKeysDictionary.Error, ResourceKeysDictionary.ProfileNotConfigured);
                 }
             }
+            catch (FileNotFoundException exception)
+            {
+                ShowError(ResourceKeysDictionary.Error, LocalizationService.GetString(ResourceKeysDictionary.JavaNotFound));
+
+                Console.WriteLine(exception);
+            }
             catch (Exception exception)
             {
                 ShowError(ResourceKeysDictionary.Error, string.Join(". ", exception.Message));
@@ -191,7 +198,7 @@ private async Task<Process> GenerateProcess(CancellationToken cancellationToken,
         return process;
     }
 
-    private async Task<ResponseMessage<ProfileReadInfoDto?>?> PrepareLaunch()
+    private async Task<ResponseMessage<ProfileReadInfoDto?>?> GetProfileInfo()
     {
         UpdateProgress(
             LocalizationService.GetString(ResourceKeysDictionary.Updating),
@@ -200,23 +207,20 @@ private async Task<Process> GenerateProcess(CancellationToken cancellationToken,
 
         await _gmlManager.UpdateDiscordRpcState($"{LocalizationService.GetString(ResourceKeysDictionary.PlayDRpcText)} \"{ListViewModel.SelectedProfile!.Name}\"");
 
-        var settings = await _storageService.GetAsync<SettingsInfo>(StorageConstants.Settings);
-
-        if (settings is null)
-        {
-            throw new Exception(LocalizationService.GetString(ResourceKeysDictionary.NotSetting));
-        }
+        var settings = await _storageService.GetAsync<SettingsInfo>(StorageConstants.Settings) ?? SettingsInfo.Default;
 
         var localProfile = new ProfileCreateInfoDto
         {
             ProfileName = ListViewModel.SelectedProfile!.Name,
             RamSize = Convert.ToInt32(settings.RamValue),
-            IsFullScreen = false,
+            IsFullScreen = settings.FullScreen,
             OsType = ((int)_systemService.GetOsType()).ToString(),
             OsArchitecture = Environment.Is64BitOperatingSystem ? "64" : "32",
             UserAccessToken = User.AccessToken,
             UserName = User.Name,
-            UserUuid = User.Uuid
+            UserUuid = User.Uuid,
+            WindowWidth = settings.GameWidth,
+            WindowHeight = settings.GameHeight
         };
 
         var profileInfo = await _gmlManager.GetProfileInfo(localProfile);

src/Gml.Launcher/ViewModels/SplashScreenViewModel.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls.Shapes;
 using Gml.Client;
@@ -46,11 +47,12 @@ public SplashScreenViewModel(ISystemService? systemService = null, IGmlClientMan
     public async Task InitializeAsync()
     {
         var osType = _systemService.GetOsType();
+        var osArch = RuntimeInformation.ProcessArchitecture;
 
         await _systemService.LoadSystemData();
         ChangeState(_localizationService.GetString(ResourceKeysDictionary.CheckUpdates), true);
 
-        var versionInfo = await CheckActualVersion(osType);
+        var versionInfo = await CheckActualVersion(osType, osArch);
 
         if (!versionInfo.IsActuallVersion)
         {
@@ -68,9 +70,10 @@ public async Task InitializeAsync()
         }
     }
 
-    private async Task<(IVersionFile? ActualVersion, bool IsActuallVersion)> CheckActualVersion(OsType osType)
+    private async Task<(IVersionFile? ActualVersion, bool IsActuallVersion)> CheckActualVersion(OsType osType,
+        Architecture osArch)
     {
-        var actualVersion = await _manager.GetActualVersion(osType);
+        var actualVersion = await _manager.GetActualVersion(osType, osArch);
 
         if (actualVersion is null)
         {

src/Gml.Launcher/Views/Components/OnlineComponent.axaml

@@ -0,0 +1,64 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:controls="using:Gml.Launcher.Views.Components"
+        xmlns:lang="clr-namespace:Gml.Launcher.Assets.Resources">
+    <Design.PreviewWith>
+        <Grid Width="350" Height="100">
+            <controls:BackgroundComponent Classes="Image" Source="/Assets/Images/background.jpg" />
+            <Rectangle Fill="{DynamicResource BackgroundOverlay}" />
+
+            <Border Padding="20">
+                <controls:OnlineComponent />
+            </Border>
+        </Grid>
+    </Design.PreviewWith>
+
+    <Style Selector="controls|OnlineComponent">
+
+        <Setter Property="Background" Value="{DynamicResource FrameBackgroundColor}" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+
+        <Setter Property="Template">
+            <ControlTemplate>
+                <!-- Component Border -->
+                <Border Background="{TemplateBinding Background}"
+                        Padding="10, 8, 15, 8"
+                        CornerRadius="12"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        HorizontalAlignment="Left">
+                    <Grid ColumnDefinitions="Auto, 10, Auto">
+
+                        <!-- Icon -->
+                        <Border Background="{DynamicResource PrimaryColor}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"
+                                Padding="12"
+                                CornerRadius="{TemplateBinding CornerRadius}">
+                            <Svg Path="/Assets/Images/users.svg" Width="18" />
+                        </Border>
+
+                        <!-- Content -->
+                        <StackPanel Grid.Column="2">
+                            <TextBlock Text="{x:Static lang:Resources.OnServers}"
+                                       Foreground="{DynamicResource ContentColor}"
+                                       FontSize="14"
+                                       FontWeight="Medium" />
+                            <TextBlock>
+                                <Run Text="{TemplateBinding Online}"
+                                     Foreground="{DynamicResource HeadlineColor}"
+                                     FontSize="20"
+                                     FontWeight="Bold" />
+                                <Run Text="{x:Static lang:Resources.PlayersShort}"
+                                     Foreground="{DynamicResource ContentColor}"
+                                     FontSize="14"
+                                     FontWeight="Medium" />
+                            </TextBlock>
+                        </StackPanel>
+
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+</Styles>

src/Gml.Launcher/Views/Components/OnlineComponent.axaml.cs

@@ -0,0 +1,18 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+
+namespace Gml.Launcher.Views.Components;
+
+public class OnlineComponent : TemplatedControl
+{
+    public static readonly StyledProperty<string> OnlineProperty = AvaloniaProperty.Register<OnlineComponent, string>(
+        "Online", "0");
+
+    public string Online
+    {
+        get => GetValue(OnlineProperty);
+        set => SetValue(OnlineProperty, value);
+    }
+}
+

src/Gml.Launcher/Views/Components/ProfileInfoComponent.axaml.cs

@@ -12,10 +12,10 @@ public class ProfileInfoComponent : TemplatedControl
         AvaloniaProperty.Register<ProfileUserControl, IEnumerable<ProfileInfoItem>>(
             nameof(ProfileInfoItems), new List<ProfileInfoItem>
             {
-                new("На проекте", "150 дней"),
-                new("Наиграно", " 551 час 45 мин"),
-                new("Баланс", "150 руб."),
-                new("Группа", "Premium"),
+                // new("На проекте", "150 дней"),
+                // new("Наиграно", " 551 час 45 мин"),
+                // new("Баланс", "150 руб."),
+                // new("Группа", "Premium"),
             });
 
 

src/Gml.Launcher/Views/Components/ProfileUserControl.axaml

@@ -54,14 +54,7 @@
                                        FontWeight="ExtraBlack" />
                         </Grid>
                         <StackPanel Grid.Row="1" Margin="30">
-
-                            <controls:ProfileInfoComponent />
-
-                            <controls:GmlButton Classes="TextIcon Primary"
-                                                Margin="0, 15, 0, 0"
-                                                Padding="15, 10, 10, 10"
-                                                Text="{x:Static lang:Resources.Cabinet}"
-                                                HorizontalAlignment="Center" />
+                            <ItemsPresenter/>
                         </StackPanel>
                     </Grid>