Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions WheelWizard/Services/ModManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ public void ToggleAllMods(bool enable)
// TODO: Use this validation method when refactoring the ModManager
public OperationResult ValidateModName(string? oldName, string newName)
{
newName = newName?.Trim();
if (string.IsNullOrWhiteSpace(newName))
return Fail("Mod name cannot be empty.");

Expand Down
1 change: 1 addition & 0 deletions WheelWizard/Views/Pages/UserProfilePage.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ private void CopyFriendCode_OnClick(object? sender, EventArgs e)
// But we as team wheel wizard don't think it makes sense to have a mii name shorter than 3, and so from the UI we don't allow it
private OperationResult ValidateMiiName(string? oldName, string newName)
{
newName = newName?.Trim();
if (newName.Length is > 10 or < 3)
return Fail(Phrases.HelperNote_NameMustBetween);

Expand Down
6 changes: 3 additions & 3 deletions WheelWizard/Views/Popups/Generic/TextInputWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private void InputField_TextChanged(object sender, TextChangedEventArgs e)
// Update the Submit button's IsEnabled property based on input
private void UpdateSubmitButtonState()
{
var inputText = GetTrimmedTextInput();
var inputText = GetInputText();
var validationResultError = inputValidationFunc?.Invoke(_initialText, inputText!).Error?.Message;

SubmitButton.IsEnabled = validationResultError == null;
Expand All @@ -132,12 +132,12 @@ private void CustomCharsButton_Click(object sender, EventArgs e)

private void SubmitButton_Click(object sender, RoutedEventArgs e)
{
_result = GetTrimmedTextInput();
_result = GetInputText();
_tcs?.TrySetResult(_result); // Set the result of the task
Close();
}

private string? GetTrimmedTextInput() => InputField.Text?.Trim();
private string? GetInputText() => InputField.Text;

private void CancelButton_Click(object sender, RoutedEventArgs e) => Close();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ private void Name_TextChanged(object sender, TextChangedEventArgs e)

private OperationResult ValidateMiiName(string? _, string newName)
{
newName = newName?.Trim();
if (newName.Length is > 10 or < 3)
return Fail(Phrases.HelperNote_NameMustBetween);

Expand All @@ -90,6 +91,7 @@ private OperationResult ValidateMiiName(string? _, string newName)

private OperationResult ValidateCreatorName(string newName)
{
newName = newName?.Trim();
if (newName.Length > 10)
return Fail(Phrases.HelperNote_CreatorNameLess10);

Expand Down
Loading