Refactor Every namespace Keyword Usage

Data/Input/DoubleInputValidator.cs

@@ -3,75 +3,74 @@ using System.Linq;
 using MelonLoader;
 using UnityEngine.UIElements;
 
-namespace ADOFAIRenderer.Data.Input
+namespace ADOFAIRenderer.Data.Input;
+
+internal class DoubleInputValidator
 {
-    internal class DoubleInputValidator
+    private struct FieldEntry
     {
-        private struct FieldEntry
-        {
-            public List<DoubleLimit> Limits;
-        }
+        public List<DoubleLimit> Limits;
+    }
 
-        private readonly VisualElement _rootVisualElement;
-        private readonly Dictionary<string, FieldEntry> _fields = new();
+    private readonly VisualElement _rootVisualElement;
+    private readonly Dictionary<string, FieldEntry> _fields = new();
 
-        public DoubleInputValidator(VisualElement rootVisualElement)
-        {
-            _rootVisualElement = rootVisualElement;
-        }
+    public DoubleInputValidator(VisualElement rootVisualElement)
+    {
+        _rootVisualElement = rootVisualElement;
+    }
 
-        /// <summary>
-        /// Registers one or more <see cref="DoubleLimit"/>s for the field with the given name.
-        /// Multiple limits can be added to the same field — they are all checked in order.
-        /// </summary>
-        /// <param name="fieldName">The name of the DoubleField in the UXML.</param>
-        /// <param name="limits">The limits to apply.</param>
-        public DoubleInputValidator AddLimits(string fieldName, params DoubleLimit[] limits)
+    /// <summary>
+    /// Registers one or more <see cref="DoubleLimit"/>s for the field with the given name.
+    /// Multiple limits can be added to the same field — they are all checked in order.
+    /// </summary>
+    /// <param name="fieldName">The name of the DoubleField in the UXML.</param>
+    /// <param name="limits">The limits to apply.</param>
+    public DoubleInputValidator AddLimits(string fieldName, params DoubleLimit[] limits)
+    {
+        if (!_fields.TryGetValue(fieldName, out var entry))
         {
-            if (!_fields.TryGetValue(fieldName, out var entry))
+            entry = new FieldEntry
             {
-                entry = new FieldEntry
-                {
-                    Limits = new List<DoubleLimit>()
-                };
+                Limits = new List<DoubleLimit>()
+            };
+        }
+
+        entry.Limits.AddRange(limits);
+        _fields[fieldName] = entry;
+        return this;
+    }
+
+    /// <summary>
+    /// Queries all registered fields from the root VisualElement and
+    /// registers value-changed callbacks that rollback invalid values.
+    /// </summary>
+    public void SetupValidation()
+    {
+        foreach (var (fieldName, entry) in _fields)
+        {
+            var field = _rootVisualElement.Q<DoubleField>(fieldName);
+            if (field == null)
+            {
+                Melon<RenderMod>.Logger.Warning(
+                    $"DoubleField '{fieldName}'을(를) 찾을 수 없습니다. 유효성 검사를 건너뜁니다.");
+                continue;
             }
 
-            entry.Limits.AddRange(limits);
-            _fields[fieldName] = entry;
-            return this;
-        }
+            var limits = entry.Limits;
 
-        /// <summary>
-        /// Queries all registered fields from the root VisualElement and
-        /// registers value-changed callbacks that rollback invalid values.
-        /// </summary>
-        public void SetupValidation()
-        {
-            foreach (var (fieldName, entry) in _fields)
+            field.RegisterValueChangedCallback(evt =>
             {
-                var field = _rootVisualElement.Q<DoubleField>(fieldName);
-                if (field == null)
+                if (string.IsNullOrEmpty(field.text))
                 {
-                    Melon<RenderMod>.Logger.Warning(
-                        $"DoubleField '{fieldName}'을(를) 찾을 수 없습니다. 유효성 검사를 건너뜁니다.");
-                    continue;
+                    return;
                 }
 
-                var limits = entry.Limits;
-
-                field.RegisterValueChangedCallback(evt =>
+                if (limits.Any(limit => !limit.Validate(evt.newValue, out _)))
                 {
-                    if (string.IsNullOrEmpty(field.text))
-                    {
-                        return;
-                    }
-
-                    if (limits.Any(limit => !limit.Validate(evt.newValue, out _)))
-                    {
-                        field.SetValueWithoutNotify(evt.previousValue);
-                    }
-                });
-            }
+                    field.SetValueWithoutNotify(evt.previousValue);
+                }
+            });
         }
     }
-}
+}

Data/Input/EnumDropdownBinder.cs

@@ -1,86 +1,87 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using MelonLoader;
 using UnityEngine.UIElements;
 
-namespace ADOFAIRenderer.Data.Input
+namespace ADOFAIRenderer.Data.Input;
+
+/// <summary>
+/// Binds a UI Toolkit <see cref="DropdownField"/> to an enum type.
+/// Populates choices from enum names and provides typed access to the selected value.
+/// </summary>
+/// <typeparam name="T">The enum type to bind.</typeparam>
+[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal class EnumDropdownBinder<T> where T : struct, Enum
 {
+    private readonly DropdownField? _dropdown;
+    private readonly List<T> _values;
+    private Action<T>? _onValueChanged;
+
     /// <summary>
-    /// Binds a UI Toolkit <see cref="DropdownField"/> to an enum type.
-    /// Populates choices from enum names and provides typed access to the selected value.
+    /// The currently selected enum value.
     /// </summary>
-    /// <typeparam name="T">The enum type to bind.</typeparam>
-    internal class EnumDropdownBinder<T> where T : struct, Enum
+    public T Value => _dropdown is { index: >= 0 } && _dropdown.index < _values.Count
+        ? _values[_dropdown.index]
+        : default;
+
+    /// <summary>
+    /// Queries a <see cref="DropdownField"/> by name from the root VisualElement,
+    /// populates it with enum names, and selects the default value.
+    /// </summary>
+    /// <param name="rootVisualElement">The root VisualElement loaded from the UXML bundle.</param>
+    /// <param name="fieldName">The name of the DropdownField in the UXML.</param>
+    /// <param name="defaultValue">The initial selected value. Defaults to the first enum member.</param>
+    public EnumDropdownBinder(VisualElement rootVisualElement, string fieldName, T? defaultValue = null)
     {
-        private readonly DropdownField? _dropdown;
-        private readonly List<T> _values;
-        private Action<T>? _onValueChanged;
+        _values = Enum.GetValues(typeof(T)).Cast<T>().ToList();
 
-        /// <summary>
-        /// The currently selected enum value.
-        /// </summary>
-        public T Value => _dropdown is { index: >= 0 } && _dropdown.index < _values.Count
-            ? _values[_dropdown.index]
-            : default;
-
-        /// <summary>
-        /// Queries a <see cref="DropdownField"/> by name from the root VisualElement,
-        /// populates it with enum names, and selects the default value.
-        /// </summary>
-        /// <param name="rootVisualElement">The root VisualElement loaded from the UXML bundle.</param>
-        /// <param name="fieldName">The name of the DropdownField in the UXML.</param>
-        /// <param name="defaultValue">The initial selected value. Defaults to the first enum member.</param>
-        public EnumDropdownBinder(VisualElement rootVisualElement, string fieldName, T? defaultValue = null)
+        _dropdown = rootVisualElement.Q<DropdownField>(fieldName);
+        if (_dropdown == null)
         {
-            _values = Enum.GetValues(typeof(T)).Cast<T>().ToList();
-
-            _dropdown = rootVisualElement.Q<DropdownField>(fieldName);
-            if (_dropdown == null)
-            {
-                Melon<RenderMod>.Logger.Error(
-                    $"DropdownField '{fieldName}'을(를) 찾을 수 없습니다.");
-                return;
-            }
-
-            _dropdown.choices = _values.Select(v => v.ToString()).ToList();
-
-            // Register the callback BEFORE setting index so the initial selection fires it too
-            _dropdown.RegisterValueChangedCallback(_ =>
-            {
-                _onValueChanged?.Invoke(Value);
-            });
-
-            var initial = defaultValue ?? _values[0];
-            _dropdown.index = _values.IndexOf(initial);
+            Melon<RenderMod>.Logger.Error(
+                $"DropdownField '{fieldName}'을(를) 찾을 수 없습니다.");
+            return;
         }
 
-        /// <summary>
-        /// Registers a callback that fires when the selection changes, providing the new enum value.
-        /// </summary>
-        public void OnValueChanged(Action<T> callback)
-        {
-            _onValueChanged = callback;
+        _dropdown.choices = _values.Select(v => v.ToString()).ToList();
 
-            // Fire immediately with current value so the caller gets the initial state
-            if (_dropdown != null)
-            {
-                callback(Value);
-            }
-        }
-
-        /// <summary>
-        /// Sets the selected enum value and updates the dropdown index.
-        /// </summary>
-        /// <param name="value">The enum value to set.</param>
-        public void SetValue(T value)
+        // Register the callback BEFORE setting index so the initial selection fires it too
+        _dropdown.RegisterValueChangedCallback(_ =>
         {
-            if (_dropdown == null) return;
-            int idx = _values.IndexOf(value);
-            if (idx >= 0)
-            {
-                _dropdown.index = idx;
-            }
+            _onValueChanged?.Invoke(Value);
+        });
+
+        var initial = defaultValue ?? _values[0];
+        _dropdown.index = _values.IndexOf(initial);
+    }
+
+    /// <summary>
+    /// Registers a callback that fires when the selection changes, providing the new enum value.
+    /// </summary>
+    public void OnValueChanged(Action<T> callback)
+    {
+        _onValueChanged = callback;
+
+        // Fire immediately with current value so the caller gets the initial state
+        if (_dropdown != null)
+        {
+            callback(Value);
         }
     }
-}
+
+    /// <summary>
+    /// Sets the selected enum value and updates the dropdown index.
+    /// </summary>
+    /// <param name="value">The enum value to set.</param>
+    public void SetValue(T value)
+    {
+        if (_dropdown == null) return;
+        int idx = _values.IndexOf(value);
+        if (idx >= 0)
+        {
+            _dropdown.index = idx;
+        }
+    }
+}

Data/Input/IntegerInputValidator.cs

@@ -3,75 +3,74 @@ using System.Linq;
 using MelonLoader;
 using UnityEngine.UIElements;
 
-namespace ADOFAIRenderer.Data.Input
+namespace ADOFAIRenderer.Data.Input;
+
+internal class IntegerInputValidator
 {
-    internal class IntegerInputValidator
+    private struct FieldEntry
     {
-        private struct FieldEntry
-        {
-            public List<IntegerLimit> Limits;
-        }
+        public List<IntegerLimit> Limits;
+    }
 
-        private readonly VisualElement _rootVisualElement;
-        private readonly Dictionary<string, FieldEntry> _fields = new();
+    private readonly VisualElement _rootVisualElement;
+    private readonly Dictionary<string, FieldEntry> _fields = new();
 
-        public IntegerInputValidator(VisualElement rootVisualElement)
-        {
-            _rootVisualElement = rootVisualElement;
-        }
+    public IntegerInputValidator(VisualElement rootVisualElement)
+    {
+        _rootVisualElement = rootVisualElement;
+    }
 
-        /// <summary>
-        /// Registers one or more <see cref="IntegerLimit"/>s for the field with the given name.
-        /// Multiple limits can be added to the same field — they are all checked in order.
-        /// </summary>
-        /// <param name="fieldName">The name of the IntegerField in the UXML.</param>
-        /// <param name="limits">The limits to apply.</param>
-        public IntegerInputValidator AddLimits(string fieldName, params IntegerLimit[] limits)
+    /// <summary>
+    /// Registers one or more <see cref="IntegerLimit"/>s for the field with the given name.
+    /// Multiple limits can be added to the same field — they are all checked in order.
+    /// </summary>
+    /// <param name="fieldName">The name of the IntegerField in the UXML.</param>
+    /// <param name="limits">The limits to apply.</param>
+    public IntegerInputValidator AddLimits(string fieldName, params IntegerLimit[] limits)
+    {
+        if (!_fields.TryGetValue(fieldName, out var entry))
         {
-            if (!_fields.TryGetValue(fieldName, out var entry))
+            entry = new FieldEntry
             {
-                entry = new FieldEntry
-                {
-                    Limits = new List<IntegerLimit>()
-                };
+                Limits = new List<IntegerLimit>()
+            };
+        }
+
+        entry.Limits.AddRange(limits);
+        _fields[fieldName] = entry;
+        return this;
+    }
+
+    /// <summary>
+    /// Queries all registered fields from the root VisualElement and
+    /// registers value-changed callbacks that rollback invalid values.
+    /// </summary>
+    public void SetupValidation()
+    {
+        foreach (var (fieldName, entry) in _fields)
+        {
+            var field = _rootVisualElement.Q<IntegerField>(fieldName);
+            if (field == null)
+            {
+                Melon<RenderMod>.Logger.Warning(
+                    $"IntegerField '{fieldName}'을(를) 찾을 수 없습니다. 유효성 검사를 건너뜁니다.");
+                continue;
             }
 
-            entry.Limits.AddRange(limits);
-            _fields[fieldName] = entry;
-            return this;
-        }
+            var limits = entry.Limits;
 
-        /// <summary>
-        /// Queries all registered fields from the root VisualElement and
-        /// registers value-changed callbacks that rollback invalid values.
-        /// </summary>
-        public void SetupValidation()
-        {
-            foreach (var (fieldName, entry) in _fields)
+            field.RegisterValueChangedCallback(evt =>
             {
-                var field = _rootVisualElement.Q<IntegerField>(fieldName);
-                if (field == null)
+                if (string.IsNullOrEmpty(field.text))
                 {
-                    Melon<RenderMod>.Logger.Warning(
-                        $"IntegerField '{fieldName}'을(를) 찾을 수 없습니다. 유효성 검사를 건너뜁니다.");
-                    continue;
+                    return;
                 }
 
-                var limits = entry.Limits;
-
-                field.RegisterValueChangedCallback(evt =>
+                if (limits.Any(limit => !limit.Validate(evt.newValue, out _)))
                 {
-                    if (string.IsNullOrEmpty(field.text))
-                    {
-                        return;
-                    }
-
-                    if (limits.Any(limit => !limit.Validate(evt.newValue, out _)))
-                    {
-                        field.SetValueWithoutNotify(evt.previousValue);
-                    }
-                });
-            }
+                    field.SetValueWithoutNotify(evt.previousValue);
+                }
+            });
         }
     }
 }