UI: Button to set emulator time based on system time in settings, under the time settings.

Partially resolves #355. I think that wanted automatic. If automatic functionality is still desired even with this change then that will be considered.

src/Ryujinx.Common/Utilities/JsonHelper.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Text;
 using System.Text.Json;
@@ -27,9 +28,14 @@ namespace Ryujinx.Common.Utilities
                 ReadCommentHandling = JsonCommentHandling.Skip
             };
 
-        public static string Serialize<T>(T value, JsonTypeInfo<T> typeInfo) => JsonSerializer.Serialize(value, typeInfo);
+        public static string Serialize<T>(T value, JsonTypeInfo<T> typeInfo) 
+            => JsonSerializer.Serialize(value, typeInfo);
 
-        public static T Deserialize<T>(string value, JsonTypeInfo<T> typeInfo) => JsonSerializer.Deserialize(value, typeInfo);
+        public static T Deserialize<T>(string value, JsonTypeInfo<T> typeInfo) 
+            => JsonSerializer.Deserialize(value, typeInfo);
+
+        public static T Deserialize<T>(ReadOnlySpan<byte> utf8Value, JsonTypeInfo<T> typeInfo) 
+            => JsonSerializer.Deserialize<T>(utf8Value, typeInfo);
 
         public static void SerializeToFile<T>(string filePath, T value, JsonTypeInfo<T> typeInfo)
         {

src/Ryujinx/Assets/locales.json

@@ -2429,19 +2429,19 @@
         "el_GR": "",
         "en_US": "Firmware Version: {0}",
         "es_ES": "",
-        "fr_FR": "",
+        "fr_FR": "Version du Firmware: {0}",
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
-        "pt_BR": "",
+        "pt_BR": "Versão do firmware: {0}",
-        "ru_RU": "",
+        "ru_RU": "Версия прошивки: {0}",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "系统固件版本：{0}",
         "zh_TW": ""
       }
     },

src/Ryujinx/Common/LocaleManager.cs

@@ -1,3 +1,4 @@
+using Gommon;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
@@ -7,12 +8,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text.Encodings.Web;
-using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Text.Unicode;
 
 namespace Ryujinx.Ava.Common.Locale
 {
@@ -147,39 +143,33 @@ namespace Ryujinx.Ava.Common.Locale
             LocaleChanged?.Invoke();
         }
 
+        #nullable enable
+
+        private static LocalesJson? _localeData;
+        
+        #nullable disable
+
         private static Dictionary<LocaleKeys, string> LoadJsonLanguage(string languageCode)
         {
             var localeStrings = new Dictionary<LocaleKeys, string>();
-            string fileData = EmbeddedResources.ReadAllText($"Ryujinx/Assets/locales.json");
 
-            if (fileData == null)
+            _localeData ??= EmbeddedResources.ReadAllText("Ryujinx/Assets/locales.json")
+                .Into(it => JsonHelper.Deserialize(it, LocalesJsonContext.Default.LocalesJson));
+
+            foreach (LocalesEntry locale in _localeData.Value.Locales)
             {
-                // We were unable to find file for that language code.
+                if (locale.Translations.Count != _localeData.Value.Languages.Count)
-                return null;
+                {
+                    throw new Exception($"Locale key {{{locale.ID}}} is missing languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
                 }
 
-            LocalesJson json = JsonHelper.Deserialize(fileData, LocalesJsonContext.Default.LocalesJson);
+                if (!Enum.TryParse<LocaleKeys>(locale.ID, out var localeKey))
+                    continue;
 
-            foreach (LocalesEntry locale in json.Locales)
+                localeStrings[localeKey] =
-            {
+                    locale.Translations.TryGetValue(languageCode, out string val) && val != string.Empty
-                if (locale.Translations.Count != json.Languages.Count)
+                        ? val
-                {
+                        : locale.Translations[DefaultLanguageCode];
-                    Logger.Error?.Print(LogClass.UI, $"Locale key {{{locale.ID}}} is missing languages!");
-                    throw new Exception("Missing locale data!");
-                }
-
-                if (Enum.TryParse<LocaleKeys>(locale.ID, out var localeKey))
-                {
-                    if (locale.Translations.TryGetValue(languageCode, out string val) && val != "")
-                    {
-                        localeStrings[localeKey] = val;
-                    }
-                    else
-                    {
-                        locale.Translations.TryGetValue("en_US", out val);
-                        localeStrings[localeKey] = val;
-                    }
-                }
             }
 
             return localeStrings;
@@ -200,5 +190,5 @@ namespace Ryujinx.Ava.Common.Locale
 
     [JsonSourceGenerationOptions(WriteIndented = true)]
     [JsonSerializable(typeof(LocalesJson))]
-    internal partial class LocalesJsonContext : JsonSerializerContext { }
+    internal partial class LocalesJsonContext : JsonSerializerContext;
 }

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -329,7 +329,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        //private DateTimeOffset _currentDate;
+        //private TimeSpan _currentTime;
+
         public DateTimeOffset CurrentDate { get; set; }
+
         public TimeSpan CurrentTime { get; set; }
 
         internal AvaloniaList<TimeZone> TimeZones { get; set; }
@@ -453,6 +457,18 @@ namespace Ryujinx.Ava.UI.ViewModels
             Dispatcher.UIThread.Post(() => OnPropertyChanged(nameof(PreferredGpuIndex)));
         }
 
+        public void MatchSystemTime()
+        {
+            var dto = DateTimeOffset.Now;
+
+            CurrentDate = new DateTimeOffset(dto.Year, dto.Month, dto.Day, 0, 0, 0, dto.Offset);
+            
+            CurrentTime = dto.TimeOfDay;
+            
+            OnPropertyChanged(nameof(CurrentDate));
+            OnPropertyChanged(nameof(CurrentTime));
+        }
+
         public async Task LoadTimeZones()
         {
             _timeZoneContentManager = new TimeZoneContentManager();

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml

@@ -182,7 +182,20 @@
                             Width="350"
                             ToolTip.Tip="{ext:Locale TimeTooltip}" />
                     </StackPanel>
-                    <StackPanel Margin="0,0,0,10"
+                    <StackPanel
+                        Margin="250,0,0,10"
+                        Orientation="Horizontal">
+                        <Button
+                            VerticalAlignment="Center"
+                            Click="MatchSystemTime_OnClick"
+                            Background="{DynamicResource SystemAccentColor}"
+                            Width="350"
+                            ToolTip.Tip="{ext:Locale TimeTooltip}">
+                            <TextBlock Text="Match System Time" />
+                        </Button>
+                    </StackPanel>
+                    <Separator />
+                    <StackPanel Margin="0,10,0,10"
                                 Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs

@@ -1,5 +1,7 @@
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.ViewModels;
+using System;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
 
 namespace Ryujinx.Ava.UI.Views.Settings
@@ -33,5 +35,7 @@ namespace Ryujinx.Ava.UI.Views.Settings
                 ViewModel.ValidateAndSetTimeZone(timeZone.Location);
             }
         }
+
+        private void MatchSystemTime_OnClick(object sender, RoutedEventArgs e) => ViewModel.MatchSystemTime();
     }
 }