Add operators for Language and use them

Also fix small issue with enabling update presence button when it should be disabled and made logging be done how it should be in some places it wasn't being done correctly

Author: Azyyyyyy

src/MultiRPC/Language.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -16,7 +16,7 @@ namespace MultiRPC;
 public static class LanguageGrab
 {
     internal static Dictionary<LanguageText, string> EnglishLanguage;
-    internal static Dictionary<LanguageText, string>? Language;
+    internal static Dictionary<LanguageText, string>? CurrentLanguage;
     private static readonly ILogging Logger = LoggingCreator.CreateLogger(nameof(LanguageGrab));
     private static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions(JsonSerializerDefaults.General)
     {
@@ -45,11 +45,11 @@ private static void GrabLanguage()
             GeneralSettings.GetLanguages();
             if (GeneralSettings.Languages.ContainsKey(langName))
             {
-                Language = GrabLanguageFile(GeneralSettings.Languages[langName]);
+                CurrentLanguage = GrabLanguageFile(GeneralSettings.Languages[langName]);
             }
         }
 
-        if (Language != null)
+        if (CurrentLanguage != null)
             return;
 
         /*If we wasn't able to load the users language from
@@ -61,7 +61,7 @@ private static void GrabLanguage()
         if (currentLang != "en-gb")
         {
             var currentLangTwoLetter = currentCulture.TwoLetterISOLanguageName.ToLower();
-            Language =
+            CurrentLanguage =
                 GrabLanguageFile(GetFilePath(currentLang)) 
                 ?? GrabLanguageFile(GetFilePath(currentLangTwoLetter));
         }
@@ -91,7 +91,7 @@ internal static void ChangeLanguage(string file)
         var lan = GrabLanguageFile(file);
         if (lan != null)
         {
-            Language = lan;
+            CurrentLanguage = lan;
             LanguageChanged?.Invoke(null, EventArgs.Empty);
         }
     }
@@ -141,7 +141,11 @@ public string Text
     public static Language GetLanguage(LanguageText? languageText)
     {
         languageText ??= LanguageText.NA;
-        var lang = CachedLanguages.FirstOrDefault(x => x._textObservable.Value.JsonNames.Any(y => y == languageText));
+        var lang = CachedLanguages.FirstOrDefault(x => 
+            (x._textObservable.IsValueCreated ? 
+                x._textObservable.Value.JsonNames : 
+                (x._jsonNames ?? x._textObservable.Value.JsonNames))
+            .Any(y => y == languageText));
         if (lang == null)
         {
             lang = new Language((LanguageText)languageText);
@@ -159,9 +163,9 @@ public static string GetText(LanguageText? jsonName)
         {
             return GetText(LanguageText.NA);
         }
-        if (LanguageGrab.Language?.ContainsKey((LanguageText)jsonName) ?? false)
+        if (LanguageGrab.CurrentLanguage?.ContainsKey((LanguageText)jsonName) ?? false)
         {
-            return LanguageGrab.Language[(LanguageText)jsonName];
+            return LanguageGrab.CurrentLanguage[(LanguageText)jsonName];
         }
         //We manually have the N/A here in case it isn't seen anywhere (But that would also show a bigger issue)
         return LanguageGrab.EnglishLanguage.ContainsKey((LanguageText)jsonName) ?
@@ -189,6 +193,10 @@ public static string GetText(LanguageText? jsonName)
 
         return null;
     }
+
+    public override string ToString() => Text;
+    public static implicit operator Language(LanguageText b) => GetLanguage(b);
+    public static implicit operator Language(string b) => GetLanguage(b);
 }
 
 public class LanguageObservable : IObservable<string>

src/MultiRPC/Logging/LoggingPageLogger.cs

@@ -11,10 +11,10 @@ public class LoggingPageLogger : ILogging
 {
     private static Action<TextBlock>? _action;
     private static readonly List<string[]> StoredLogging = new List<string[]>();
-    private static readonly Language DebugLanguage = Language.GetLanguage(LanguageText.Debug);
-    private static readonly Language InfoLanguage = Language.GetLanguage(LanguageText.Info);
-    private static readonly Language WarnLanguage = Language.GetLanguage(LanguageText.Warn);
-    private static readonly Language ErrorLanguage = Language.GetLanguage(LanguageText.Error);
+    private static readonly Language DebugLanguage = LanguageText.Debug;
+    private static readonly Language InfoLanguage = LanguageText.Info;
+    private static readonly Language WarnLanguage = LanguageText.Warn;
+    private static readonly Language ErrorLanguage = LanguageText.Error;
 
     internal static void AddAction(Action<TextBlock> action)
     {

src/MultiRPC/Program.cs

@@ -13,7 +13,6 @@
 using TinyUpdate.Core.Logging;
 using TinyUpdate.Core.Logging.Loggers;
 
-//TODO: Go through app for text that needs to be localized
 //TODO: When reattempting Lottie animations, use https://github.com/AvaloniaUI/Avalonia.Lottie/tree/layercache-impl as a starting point (It works on some animations but crashes on others)
 [assembly: SemanticVersion("7.0.0-beta7")]
 namespace MultiRPC;

src/MultiRPC/Rpc/Page/RpcPageManager.cs

@@ -7,18 +7,19 @@ namespace MultiRPC.Rpc.Page;
 public static class RpcPageManager
 {
     public static RpcPage? CurrentPage { get; private set; }
+    public static RpcPage? PendingPage { get; private set; }
 
     private static RpcClient? _rpcClient;
-    private static RpcPage? _pendingPage;
+
     private static void RpcClient_Disconnected(object? sender, EventArgs e)
     {
-        if (_pendingPage == null)
+        if (PendingPage == null)
         {
             return;
         }
 
-        CurrentPage = _pendingPage;
-        _pendingPage = null;
+        CurrentPage = PendingPage;
+        PendingPage = null;
         NewCurrentPage?.Invoke(sender, CurrentPage);
         PageChanged?.Invoke(sender, CurrentPage);
     }
@@ -33,7 +34,7 @@ internal static void NewActivePage(RpcPage page)
 
         if (_rpcClient.IsRunning)
         {
-            _pendingPage = page;
+            PendingPage = page;
             PageChanged?.Invoke(null, page);
             return;
         }

src/MultiRPC/Rpc/RpcClient.cs

@@ -67,6 +67,8 @@ private async Task<bool> CheckPresence(string? text)
 
     public void Start(long? applicationId, string? applicationName)
     {
+        //TODO: Check if discord is running under admin and if we need to restart under admin (But warn about having both apps open with admin in the first place)
+        
         _presenceId = applicationId ?? RpcPageManager.CurrentPage?.RichPresence.Id ?? Constants.MultiRPCID;
         var idS = _presenceId.ToString();
 
@@ -95,9 +97,9 @@ public void Start(long? applicationId, string? applicationName)
         if (LoggingCreator.ShouldProcess(_logger.LogLevel, LogLevel.Trace))
         {
             var debugMessage = Language.GetText(LanguageText.DiscordClientCheck)
-                .Replace("{discordProcess}", (Language.GetText(processName ?? "NA")))
-                .Replace("{wasFound}", (pipe != -1).ToString());
-            _logger.Debug(debugMessage);
+                .Replace("{discordProcess}", "{0}")
+                .Replace("{wasFound}", "{1}");
+            _logger.Debug(debugMessage, (Language.GetText(processName ?? "NA")), (pipe != -1).ToString());
         }
         _client = new DiscordRpcClient(idS, pipe)
         {

src/MultiRPC/UI/Controls/ColourButton.axaml.cs

@@ -19,7 +19,7 @@ public ImmutableSolidColorBrush BtnColor
         }
     }
 
-    private readonly StyledProperty<Language> _languageProperty = AvaloniaProperty.Register<ColourButton, Language>(nameof(Language), Language.GetLanguage(LanguageText.NA));
+    private readonly StyledProperty<Language> _languageProperty = AvaloniaProperty.Register<ColourButton, Language>(nameof(Language), LanguageText.NA);
     public Language Language
     {
         get => GetValue(_languageProperty);

src/MultiRPC/UI/Controls/Settings/SettingDropdown.cs

@@ -56,7 +56,7 @@ public SettingDropdown(Language header, BaseSetting setting, MethodInfo getMetho
         //Set what should be shown
         if (languageSourceAttribute == null)
         {
-            _cboSelection.Items = isLocalizable ? values.Select(x => Language.GetLanguage(x?.ToString() ?? "")) : values;
+            _cboSelection.Items = isLocalizable ? values.Select(x => (Language)(x?.ToString() ?? "")) : values;
         }
         else
         {

src/MultiRPC/UI/Controls/TabsPage.axaml.cs

@@ -24,7 +24,7 @@ public sealed partial class TabsPage : UserControl
 
     private readonly List<ITabPage> _pages = new List<ITabPage>();
     private Rectangle? _activePageRectangle;
-    private static readonly Language NaLang = Language.GetLanguage(LanguageText.NA);
+    private static readonly Language NaLang = LanguageText.NA;
     private static DisableSettings _disableSettings => SettingManager<DisableSettings>.Setting;
     private static readonly PointerPressedEventArgs PointerArg = new PointerPressedEventArgs(null!, null!, null!,
         new Point(), 0, PointerPointProperties.None, KeyModifiers.None);

src/MultiRPC/UI/MainPage.axaml.cs

@@ -144,7 +144,7 @@ private Button AddSidePage(ISidePage page)
             }
         });
 
-        var lang = Language.GetLanguage(page.LocalizableName);
+        Language lang = page.LocalizableName;
         lang.TextObservable.Subscribe(s => CustomToolTip.SetTip(btn,  _disableSetting.ShowPageTooltips ? null : s));
         _disableSetting.PropertyChanged += (sender, args) =>
         {

src/MultiRPC/UI/MainWindow.axaml.cs

@@ -201,7 +201,7 @@ private void InitializeExtra()
         };
         grdContent.Children.Insert(3, _control);
 
-        var lang = Language.GetLanguage(LanguageText.MultiRPC);
+        Language lang = LanguageText.MultiRPC;
         if (_control is ITitlePage titlePage)
         {
             lang.TextObservable.Subscribe(s => UpdateTitle(s, titlePage.Title.Text));