From deb99d2cae3e80bdf70cb52c6c160094dc7c9292 Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Sun, 15 May 2022 11:30:15 +0000 Subject: Avalonia UI - Part 1 (#3270) * avalonia part 1 * remove vulkan ui backend * move ui common files to ui common project * get name for oading screen from device * rebase. * review 1 * review 1.1 * review * cleanup * addressed review * use cancellation token * review * review * rebased * cancel library loading when closing window * remove star image, use fonticon instead * delete render control frame buffer when game ends. change position of fav star * addressed @Thog review * ensure the right ui is downloaded in updates * fix crash when showing not supported dialog during controller request * add prefix to artifact names * Auto-format Avalonia project * Fix input * Fix build, simplify app disposal * remove nv stutter thread * addressed review * add missing change * maintain window size if new size is zero length * add game, handheld, docked to local * reverse scale main window * Update de_DE.json * Update de_DE.json * Update de_DE.json * Update italian json * Update it_IT.json * let render timer poll with no wait * remove unused code * more unused code * enabled tiered compilation and trimming * check if window event is not closed before signaling * fix atmospher case * locale fix * locale fix * remove explicit tiered compilation declarations * Remove ) it_IT.json * Remove ) de_DE.json * Update it_IT.json * Update pt_BR locale with latest strings * Remove ')' * add more strings to locale * update locale * remove extra slash * remove extra slash * set firmware version to 0 if key's not found * fix * revert timer changes * lock on object instead * Update it_IT.json * remove unused method * add load screen text to locale * drop swap event * Update de_DE.json * Update de_DE.json * do null check when stopping emulator * Update de_DE.json * Create tr_TR.json * Add tr_TR * Add tr_TR + Turkish * Update it_IT.json * Update Ryujinx.Ava/Input/AvaloniaMappingHelper.cs Co-authored-by: Ac_K * Apply suggestions from code review Co-authored-by: Ac_K * Apply suggestions from code review Co-authored-by: Ac_K * addressed review * Update Ryujinx.Ava/Ui/Backend/OpenGl/OpenGlRenderTarget.cs Co-authored-by: gdkchan * use avalonia's inbuilt renderer on linux * removed whitespace * workaround for queue render crash with vsync off * drop custom backend * format files * fix not closing issue * remove warnings * rebase * update avalonia library * Reposition the Text and Button on About Page * Assign build version * Remove appveyor text Co-authored-by: gdk Co-authored-by: Niwu34 <67392333+Niwu34@users.noreply.github.com> Co-authored-by: Antonio Brugnolo <36473846+AntoSkate@users.noreply.github.com> Co-authored-by: aegiff <99728970+aegiff@users.noreply.github.com> Co-authored-by: Ac_K Co-authored-by: MostlyWhat <78652091+MostlyWhat@users.noreply.github.com> --- Ryujinx.Ava/Common/Locale/LocaleExtension.cs | 30 ++++++++ Ryujinx.Ava/Common/Locale/LocaleManager.cs | 105 +++++++++++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 Ryujinx.Ava/Common/Locale/LocaleExtension.cs create mode 100644 Ryujinx.Ava/Common/Locale/LocaleManager.cs (limited to 'Ryujinx.Ava/Common/Locale') diff --git a/Ryujinx.Ava/Common/Locale/LocaleExtension.cs b/Ryujinx.Ava/Common/Locale/LocaleExtension.cs new file mode 100644 index 00000000..a9e5cac5 --- /dev/null +++ b/Ryujinx.Ava/Common/Locale/LocaleExtension.cs @@ -0,0 +1,30 @@ +using Avalonia.Data; +using Avalonia.Markup.Xaml; +using Avalonia.Markup.Xaml.MarkupExtensions; +using System; + +namespace Ryujinx.Ava.Common.Locale +{ + public class LocaleExtension : MarkupExtension + { + public LocaleExtension(string key) + { + Key = key; + } + + public string Key { get; } + + public override object ProvideValue(IServiceProvider serviceProvider) + { + string keyToUse = Key; + + ReflectionBindingExtension binding = new($"[{keyToUse}]") + { + Mode = BindingMode.OneWay, + Source = LocaleManager.Instance + }; + + return binding.ProvideValue(serviceProvider); + } + } +} \ No newline at end of file diff --git a/Ryujinx.Ava/Common/Locale/LocaleManager.cs b/Ryujinx.Ava/Common/Locale/LocaleManager.cs new file mode 100644 index 00000000..daa0328f --- /dev/null +++ b/Ryujinx.Ava/Common/Locale/LocaleManager.cs @@ -0,0 +1,105 @@ +using Ryujinx.Ava.Ui.ViewModels; +using Ryujinx.Common; +using Ryujinx.Ui.Common.Configuration; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Globalization; +using System.Text.Json; + +namespace Ryujinx.Ava.Common.Locale +{ + class LocaleManager : BaseModel + { + private const string DefaultLanguageCode = "en_US"; + + private Dictionary _localeStrings; + private ConcurrentDictionary _dynamicValues; + + public static LocaleManager Instance { get; } = new LocaleManager(); + public Dictionary LocaleStrings { get => _localeStrings; set => _localeStrings = value; } + + + public LocaleManager() + { + _localeStrings = new Dictionary(); + _dynamicValues = new ConcurrentDictionary(); + + Load(); + } + + public void Load() + { + string localeLanguageCode = CultureInfo.CurrentCulture.Name.Replace('-', '_'); + + if (Program.PreviewerDetached) + { + if (!string.IsNullOrEmpty(ConfigurationState.Instance.Ui.LanguageCode.Value)) + { + localeLanguageCode = ConfigurationState.Instance.Ui.LanguageCode.Value; + } + } + + // Load english first, if the target language translation is incomplete, we default to english. + LoadLanguage(DefaultLanguageCode); + + if (localeLanguageCode != DefaultLanguageCode) + { + LoadLanguage(localeLanguageCode); + } + } + + public string this[string key] + { + get + { + if (_localeStrings.TryGetValue(key, out string value)) + { + if (_dynamicValues.TryGetValue(key, out var dynamicValue)) + { + return string.Format(value, dynamicValue); + } + + return value; + } + + return key; + } + set + { + _localeStrings[key] = value; + + OnPropertyChanged(); + } + } + + public void UpdateDynamicValue(string key, params object[] values) + { + _dynamicValues[key] = values; + + OnPropertyChanged("Item"); + } + + public void LoadLanguage(string languageCode) + { + string languageJson = EmbeddedResources.ReadAllText($"Ryujinx.Ava/Assets/Locales/{languageCode}.json"); + + if (languageJson == null) + { + return; + } + + var strings = JsonSerializer.Deserialize>(languageJson); + + foreach (var item in strings) + { + this[item.Key] = item.Value; + } + + if (Program.PreviewerDetached) + { + ConfigurationState.Instance.Ui.LanguageCode.Value = languageCode; + ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath); + } + } + } +} \ No newline at end of file -- cgit v1.2.3