Browse Source

misc: chore: Collapse HLE swkbd character validation utils into a single class

Evan Husted 1 year ago
parent
commit
ad9d6588e8

+ 0 - 9
src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CJKCharacterValidation.cs

@@ -1,9 +0,0 @@
-using Ryujinx.Common.Helper;
-
-namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
-{
-    public static class CJKCharacterValidation
-    {
-        public static bool IsCJK(char value) => Patterns.CJK.IsMatch(value.ToString());
-    }
-}

+ 2 - 1
src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/NumericCharacterValidation.cs → src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CharacterValidation.cs

@@ -2,8 +2,9 @@ using Ryujinx.Common.Helper;
 
 
 namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
 namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
 {
 {
-    public static class NumericCharacterValidation
+    public static class CharacterValidation
     {
     {
         public static bool IsNumeric(char value) => Patterns.Numeric.IsMatch(value.ToString());
         public static bool IsNumeric(char value) => Patterns.Numeric.IsMatch(value.ToString());
+        public static bool IsCJK(char value) => Patterns.CJK.IsMatch(value.ToString());
     }
     }
 }
 }

+ 2 - 2
src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml.cs

@@ -144,12 +144,12 @@ namespace Ryujinx.Ava.UI.Controls
                 case KeyboardMode.Numeric:
                 case KeyboardMode.Numeric:
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeNumeric);
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeNumeric);
                     validationInfoText = string.IsNullOrEmpty(validationInfoText) ? localeText : string.Join("\n", validationInfoText, localeText);
                     validationInfoText = string.IsNullOrEmpty(validationInfoText) ? localeText : string.Join("\n", validationInfoText, localeText);
-                    _checkInput = text => text.All(NumericCharacterValidation.IsNumeric);
+                    _checkInput = text => text.All(CharacterValidation.IsNumeric);
                     break;
                     break;
                 case KeyboardMode.Alphabet:
                 case KeyboardMode.Alphabet:
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeAlphabet);
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeAlphabet);
                     validationInfoText = string.IsNullOrEmpty(validationInfoText) ? localeText : string.Join("\n", validationInfoText, localeText);
                     validationInfoText = string.IsNullOrEmpty(validationInfoText) ? localeText : string.Join("\n", validationInfoText, localeText);
-                    _checkInput = text => text.All(value => !CJKCharacterValidation.IsCJK(value));
+                    _checkInput = text => text.All(value => !CharacterValidation.IsCJK(value));
                     break;
                     break;
                 case KeyboardMode.ASCII:
                 case KeyboardMode.ASCII:
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeASCII);
                     localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeASCII);