Skip to content

Code Quality: Enforced centralized Strings class in helpers and services #16936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Lamparter wants to merge 3 commits into from
Closed

Code Quality: Enforced centralized Strings class in helpers and services #16936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a8a20c
Files.App.Services
Lamparter Mar 16, 2025
48a52fd
Files.App.Helpers
Lamparter Mar 16, 2025
8aa2da5
Files.App.Extensions
Lamparter Mar 16, 2025
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
16 changes: 8 additions & 8 deletions src/Files.App/Extensions/StringExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ public static string WithEnding(this string str, string ending)

private static readonly Dictionary<string, string> abbreviations = new()
{
{ "KiB", "KiloByteSymbol".GetLocalizedResource() },
{ "MiB", "MegaByteSymbol".GetLocalizedResource() },
{ "GiB", "GigaByteSymbol".GetLocalizedResource() },
{ "TiB", "TeraByteSymbol".GetLocalizedResource() },
{ "PiB", "PetaByteSymbol".GetLocalizedResource() },
{ "B", "ByteSymbol".GetLocalizedResource() },
{ "b", "ByteSymbol".GetLocalizedResource() }
{ "KiB", Strings.KiloByteSymbol.GetLocalizedResource() },
{ "MiB", Strings.MegaByteSymbol.GetLocalizedResource() },
{ "GiB", Strings.GigaByteSymbol.GetLocalizedResource() },
{ "TiB", Strings.TeraByteSymbol.GetLocalizedResource() },
{ "PiB", Strings.PetaByteSymbol.GetLocalizedResource() },
{ "B", Strings.ByteSymbol.GetLocalizedResource() },
{ "b", Strings.ByteSymbol.GetLocalizedResource() }
};

public static string ConvertSizeAbbreviation(this string value)
Expand All @@ -87,7 +87,7 @@ public static string ConvertSizeAbbreviation(this string value)

public static string ToLongSizeString(this long size) => ByteSize.FromBytes(size).ToLongSizeString();
public static string ToLongSizeString(this ulong size) => ByteSize.FromBytes(size).ToLongSizeString();
public static string ToLongSizeString(this ByteSize size) => $"{size.ToSizeString()} ({size.Bytes:#,##0} {"ItemSizeBytes".GetLocalizedResource()})";
public static string ToLongSizeString(this ByteSize size) => $"{size.ToSizeString()} ({size.Bytes:#,##0} {Strings.ItemSizeBytes.GetLocalizedResource()})";

//public static string GetLocalizedResource(this string s) => s.GetLocalized("Resources");

Expand Down
14 changes: 7 additions & 7 deletions src/Files.App/Helpers/Application/AppToastNotificationHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ internal static class AppToastNotificationHelper
public static void ShowUnhandledExceptionToast()
{
var toastContent = new AppNotificationBuilder()
.AddText("ExceptionNotificationHeader".GetLocalizedResource())
.AddText("ExceptionNotificationBody".GetLocalizedResource())
.AddText(Strings.ExceptionNotificationHeader.GetLocalizedResource())
.AddText(Strings.ExceptionNotificationBody.GetLocalizedResource())
.SetAppLogoOverride(new Uri("ms-appx:///Assets/error.png"))
.AddButton(new AppNotificationButton("ExceptionNotificationReportButton".GetLocalizedResource())
.AddButton(new AppNotificationButton(Strings.ExceptionNotificationReportButton.GetLocalizedResource())
.SetInvokeUri(new Uri(Constants.ExternalUrl.BugReportUrl)))
.BuildNotification();
AppNotificationManager.Default.Show(toastContent);
Expand All @@ -25,17 +25,17 @@ public static void ShowUnhandledExceptionToast()
public static void ShowBackgroundRunningToast()
{
var toastContent = new AppNotificationBuilder()
.AddText("BackgroundRunningNotificationHeader".GetLocalizedResource())
.AddText("BackgroundRunningNotificationBody".GetLocalizedResource())
.AddText(Strings.BackgroundRunningNotificationHeader.GetLocalizedResource())
.AddText(Strings.BackgroundRunningNotificationBody.GetLocalizedResource())
.BuildNotification();
AppNotificationManager.Default.Show(toastContent);
}

public static void ShowDriveEjectToast()
{
var toastContent = new AppNotificationBuilder()
.AddText("EjectNotificationHeader".GetLocalizedResource())
.AddText("EjectNotificationBody".GetLocalizedResource())
.AddText(Strings.EjectNotificationHeader.GetLocalizedResource())
.AddText(Strings.EjectNotificationBody.GetLocalizedResource())
.SetAttributionText("SettingsAboutAppName".GetLocalizedResource())
.BuildNotification();
AppNotificationManager.Default.Show(toastContent);
Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/Helpers/BitmapHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ public static async Task RotateAsync(string filePath, BitmapRotation rotation)
{
var errorDialog = new ContentDialog()
{
Title = "FailedToRotateImage".GetLocalizedResource(),
Title = Strings.FailedToRotateImage.GetLocalizedResource(),
Content = ex.Message,
PrimaryButtonText = "OK".GetLocalizedResource(),
PrimaryButtonText = Strings.OK.GetLocalizedResource(),
};

if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
Expand Down
92 changes: 46 additions & 46 deletions src/Files.App/Helpers/Dialog/DynamicDialogFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ public static DynamicDialog GetFor_PropertySaveErrorDialog()
{
DynamicDialog dialog = new DynamicDialog(new DynamicDialogViewModel()
{
TitleText = "PropertySaveErrorDialog/Title".GetLocalizedResource(),
SubtitleText = "PropertySaveErrorMessage/Text".GetLocalizedResource(), // We can use subtitle here as our content
PrimaryButtonText = "Retry".GetLocalizedResource(),
SecondaryButtonText = "PropertySaveErrorDialog/SecondaryButtonText".GetLocalizedResource(),
CloseButtonText = "Cancel".GetLocalizedResource(),
TitleText = Strings.PropertySaveErrorDialog_Title.GetLocalizedResource(),
SubtitleText = Strings.PropertySaveErrorMessage_Text.GetLocalizedResource(), // We can use subtitle here as our content
PrimaryButtonText = Strings.Retry.GetLocalizedResource(),
SecondaryButtonText = Strings.PropertySaveErrorDialog_SecondaryButtonText.GetLocalizedResource(),
CloseButtonText = Strings.Cancel.GetLocalizedResource(),
DynamicButtons = DynamicDialogButtons.Primary | DynamicDialogButtons.Secondary | DynamicDialogButtons.Cancel
});
return dialog;
Expand All @@ -33,9 +33,9 @@ public static DynamicDialog GetFor_ConsentDialog()
{
DynamicDialog dialog = new DynamicDialog(new DynamicDialogViewModel()
{
TitleText = "WelcomeDialog/Title".GetLocalizedResource(),
SubtitleText = "WelcomeDialogTextBlock/Text".GetLocalizedResource(), // We can use subtitle here as our content
PrimaryButtonText = "WelcomeDialog/PrimaryButtonText".GetLocalizedResource(),
TitleText = Strings.WelcomeDialog_Title.GetLocalizedResource(),
SubtitleText = Strings.WelcomeDialogTextBlock_Text.GetLocalizedResource(), // We can use subtitle here as our content
PrimaryButtonText = Strings.WelcomeDialog_PrimaryButtonText.GetLocalizedResource(),
PrimaryButtonAction = async (vm, e) => await Launcher.LaunchUriAsync(new Uri("ms-settings:privacy-broadfilesystemaccess")),
DynamicButtons = DynamicDialogButtons.Primary
});
Expand All @@ -46,10 +46,10 @@ public static DynamicDialog GetFor_ShortcutNotFound(string targetPath)
{
DynamicDialog dialog = new(new DynamicDialogViewModel
{
TitleText = "ShortcutCannotBeOpened".GetLocalizedResource(),
SubtitleText = string.Format("DeleteShortcutDescription".GetLocalizedResource(), targetPath),
PrimaryButtonText = "Delete".GetLocalizedResource(),
SecondaryButtonText = "No".GetLocalizedResource(),
TitleText = Strings.ShortcutCannotBeOpened.GetLocalizedResource(),
SubtitleText = string.Format(Strings.DeleteShortcutDescription.GetLocalizedResource(), targetPath),
PrimaryButtonText = Strings.Delete.GetLocalizedResource(),
SecondaryButtonText = Strings.No.GetLocalizedResource(),
DynamicButtons = DynamicDialogButtons.Primary | DynamicDialogButtons.Secondary
});
return dialog;
Expand All @@ -60,12 +60,12 @@ public static DynamicDialog GetFor_CreateItemDialog(string itemType)
DynamicDialog? dialog = null;
TextBox inputText = new()
{
PlaceholderText = "EnterAnItemName".GetLocalizedResource()
PlaceholderText = Strings.EnterAnItemName.GetLocalizedResource()
};

TeachingTip warning = new()
{
Title = "InvalidFilename/Text".GetLocalizedResource(),
Title = Strings.InvalidFilename_Text.GetLocalizedResource(),
PreferredPlacement = TeachingTipPlacementMode.Bottom,
DataContext = new CreateItemDialogViewModel(),
};
Expand Down Expand Up @@ -101,7 +101,7 @@ public static DynamicDialog GetFor_CreateItemDialog(string itemType)

dialog = new DynamicDialog(new DynamicDialogViewModel()
{
TitleText = string.Format("CreateNewItemTitle".GetLocalizedResource(), itemType),
TitleText = string.Format(Strings.CreateNewItemTitle.GetLocalizedResource(), itemType),
SubtitleText = null,
DisplayControl = new Grid()
{
Expand All @@ -115,8 +115,8 @@ public static DynamicDialog GetFor_CreateItemDialog(string itemType)
{
vm.HideDialog(); // Rename successful
},
PrimaryButtonText = "Create".GetLocalizedResource(),
CloseButtonText = "Cancel".GetLocalizedResource(),
PrimaryButtonText = Strings.Create.GetLocalizedResource(),
CloseButtonText = Strings.Cancel.GetLocalizedResource(),
DynamicButtonsEnabled = DynamicDialogButtons.Cancel,
DynamicButtons = DynamicDialogButtons.Primary | DynamicDialogButtons.Cancel
});
Expand All @@ -133,9 +133,9 @@ public static DynamicDialog GetFor_FileInUseDialog(List<Win32Process> lockingPro
{
DynamicDialog dialog = new DynamicDialog(new DynamicDialogViewModel()
{
TitleText = "FileInUseDialog/Title".GetLocalizedResource(),
SubtitleText = lockingProcess.IsEmpty() ? "FileInUseDialog/Text".GetLocalizedResource() :
string.Format("FileInUseByDialog/Text".GetLocalizedResource(), string.Join(", ", lockingProcess.Select(x => $"{x.AppName ?? x.Name} (PID: {x.Pid})"))),
TitleText = Strings.FileInUseDialog_Title.GetLocalizedResource(),
SubtitleText = lockingProcess.IsEmpty() ? Strings.FileInUseDialog_Text.GetLocalizedResource() :
string.Format(Strings.FileInUseByDialog_Text.GetLocalizedResource(), string.Join(", ", lockingProcess.Select(x => $"{x.AppName ?? x.Name} (PID: {x.Pid})"))),
PrimaryButtonText = "OK",
DynamicButtons = DynamicDialogButtons.Primary
});
Expand All @@ -149,17 +149,17 @@ public static DynamicDialog GetFor_CredentialEntryDialog(string path)

TextBox inputUsername = new()
{
PlaceholderText = "CredentialDialogUserName/PlaceholderText".GetLocalizedResource()
PlaceholderText = Strings.CredentialDialogUserName_PlaceholderText.GetLocalizedResource()
};

PasswordBox inputPassword = new()
{
PlaceholderText = "Password".GetLocalizedResource()
PlaceholderText = Strings.Password.GetLocalizedResource()
};

CheckBox saveCreds = new()
{
Content = "NetworkAuthenticationSaveCheckbox".GetLocalizedResource()
Content = Strings.NetworkAuthenticationSaveCheckbox.GetLocalizedResource()
};

inputUsername.TextChanged += (textBox, args) =>
Expand Down Expand Up @@ -188,10 +188,10 @@ public static DynamicDialog GetFor_CredentialEntryDialog(string path)

dialog = new DynamicDialog(new DynamicDialogViewModel()
{
TitleText = "NetworkAuthenticationDialogTitle".GetLocalizedResource(),
PrimaryButtonText = "OK".GetLocalizedResource(),
CloseButtonText = "Cancel".GetLocalizedResource(),
SubtitleText = string.Format("NetworkAuthenticationDialogMessage".GetLocalizedResource(), path.Substring(2)),
TitleText = Strings.NetworkAuthenticationDialogTitle.GetLocalizedResource(),
PrimaryButtonText = Strings.OK.GetLocalizedResource(),
CloseButtonText = Strings.Cancel.GetLocalizedResource(),
SubtitleText = string.Format(Strings.NetworkAuthenticationDialogMessage.GetLocalizedResource(), path.Substring(2)),
DisplayControl = new Grid()
{
MinWidth = 250d,
Expand Down Expand Up @@ -228,9 +228,9 @@ public static DynamicDialog GetFor_GitCheckoutConflicts(string checkoutBranchNam
{
ItemsSource = new string[]
{
string.Format("BringChanges".GetLocalizedResource(), checkoutBranchName),
string.Format("StashChanges".GetLocalizedResource(), headBranchName),
"DiscardChanges".GetLocalizedResource()
string.Format(Strings.BringChanges.GetLocalizedResource(), checkoutBranchName),
string.Format(Strings.StashChanges.GetLocalizedResource(), headBranchName),
Strings.DiscardChanges.GetLocalizedResource()
},
SelectionMode = ListViewSelectionMode.Single
};
Expand All @@ -243,10 +243,10 @@ public static DynamicDialog GetFor_GitCheckoutConflicts(string checkoutBranchNam

dialog = new DynamicDialog(new DynamicDialogViewModel()
{
TitleText = "SwitchBranch".GetLocalizedResource(),
PrimaryButtonText = "Switch".GetLocalizedResource(),
CloseButtonText = "Cancel".GetLocalizedResource(),
SubtitleText = "UncommittedChanges".GetLocalizedResource(),
TitleText = Strings.SwitchBranch.GetLocalizedResource(),
PrimaryButtonText = Strings.Switch.GetLocalizedResource(),
CloseButtonText = Strings.Cancel.GetLocalizedResource(),
SubtitleText = Strings.UncommittedChanges.GetLocalizedResource(),
DisplayControl = new Grid()
{
MinWidth = 250d,
Expand All @@ -271,8 +271,8 @@ public static DynamicDialog GetFor_GitHubConnectionError()
DynamicDialog dialog = new DynamicDialog(new DynamicDialogViewModel()
{
TitleText = "Error".GetLocalizedResource(),
SubtitleText = "CannotReachGitHubError".GetLocalizedResource(),
PrimaryButtonText = "Close".GetLocalizedResource(),
SubtitleText = Strings.CannotReachGitHubError.GetLocalizedResource(),
PrimaryButtonText = Strings.Close.GetLocalizedResource(),
DynamicButtons = DynamicDialogButtons.Primary
});
return dialog;
Expand All @@ -283,8 +283,8 @@ public static DynamicDialog GetFor_GitCannotInitializeqRepositoryHere()
return new DynamicDialog(new DynamicDialogViewModel()
{
TitleText = "Error".GetLocalizedResource(),
SubtitleText = "CannotInitializeGitRepo".GetLocalizedResource(),
PrimaryButtonText = "Close".GetLocalizedResource(),
SubtitleText = Strings.CannotInitializeGitRepo.GetLocalizedResource(),
PrimaryButtonText = Strings.Close.GetLocalizedResource(),
DynamicButtons = DynamicDialogButtons.Primary
});
}
Expand All @@ -294,10 +294,10 @@ public static DynamicDialog GetFor_DeleteGitBranchConfirmation(string branchName
DynamicDialog dialog = null!;
dialog = new DynamicDialog(new DynamicDialogViewModel()
{
TitleText = "GitDeleteBranch".GetLocalizedResource(),
SubtitleText = string.Format("GitDeleteBranchSubtitle".GetLocalizedResource(), branchName),
PrimaryButtonText = "OK".GetLocalizedResource(),
CloseButtonText = "Cancel".GetLocalizedResource(),
TitleText = Strings.GitDeleteBranch.GetLocalizedResource(),
SubtitleText = string.Format(Strings.GitDeleteBranchSubtitle.GetLocalizedResource(), branchName),
PrimaryButtonText = Strings.OK.GetLocalizedResource(),
CloseButtonText = Strings.Cancel.GetLocalizedResource(),
AdditionalData = true,
CloseButtonAction = (vm, e) =>
{
Expand All @@ -314,10 +314,10 @@ public static DynamicDialog GetFor_RenameRequiresHigherPermissions(string path)
DynamicDialog dialog = null!;
dialog = new DynamicDialog(new DynamicDialogViewModel()
{
TitleText = "ItemRenameFailed".GetLocalizedResource(),
SubtitleText = string.Format("HigherPermissionsRequired".GetLocalizedResource(), path),
PrimaryButtonText = "OK".GetLocalizedResource(),
SecondaryButtonText = "EditPermissions".GetLocalizedResource(),
TitleText = Strings.ItemRenameFailed.GetLocalizedResource(),
SubtitleText = string.Format(Strings.HigherPermissionsRequired.GetLocalizedResource(), path),
PrimaryButtonText = Strings.OK.GetLocalizedResource(),
SecondaryButtonText = Strings.EditPermissions.GetLocalizedResource(),
SecondaryButtonAction = (vm, e) =>
{
var context = Ioc.Default.GetRequiredService<IContentPageContext>();
Expand Down
14 changes: 7 additions & 7 deletions src/Files.App/Helpers/Navigation/NavigationHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,19 +189,19 @@ private static async Task UpdateTabInfoAsync(TabBarItem tabItem, object navigati

if (string.IsNullOrEmpty(currentPath) || currentPath == "Home")
{
tabLocationHeader = "Home".GetLocalizedResource();
tabLocationHeader = Strings.Home.GetLocalizedResource();
iconSource.ImageSource = new BitmapImage(new Uri(Constants.FluentIconsPaths.HomeIcon));
}
else if (currentPath.Equals(Constants.UserEnvironmentPaths.DesktopPath, StringComparison.OrdinalIgnoreCase))
tabLocationHeader = "Desktop".GetLocalizedResource();
tabLocationHeader = Strings.Desktop.GetLocalizedResource();
else if (currentPath.Equals(Constants.UserEnvironmentPaths.DownloadsPath, StringComparison.OrdinalIgnoreCase))
tabLocationHeader = "Downloads".GetLocalizedResource();
tabLocationHeader = Strings.Downloads.GetLocalizedResource();
else if (currentPath.Equals(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
tabLocationHeader = "RecycleBin".GetLocalizedResource();
tabLocationHeader = Strings.RecycleBin.GetLocalizedResource();
else if (currentPath.Equals(Constants.UserEnvironmentPaths.MyComputerPath, StringComparison.OrdinalIgnoreCase))
tabLocationHeader = "ThisPC".GetLocalizedResource();
tabLocationHeader = Strings.ThisPC.GetLocalizedResource();
else if (currentPath.Equals(Constants.UserEnvironmentPaths.NetworkFolderPath, StringComparison.OrdinalIgnoreCase))
tabLocationHeader = "Network".GetLocalizedResource();
tabLocationHeader = Strings.Network.GetLocalizedResource();
else if (App.LibraryManager.TryGetLibrary(currentPath, out LibraryLocationItem library))
{
var libName = System.IO.Path.GetFileNameWithoutExtension(library.Path).GetLocalizedResource();
Expand Down Expand Up @@ -477,7 +477,7 @@ public static async Task<bool> OpenPath(string path, IShellPage associatedInstan

if (opened.ErrorCode == FileSystemStatusCode.NotFound && !openSilent)
{
await DialogDisplayHelper.ShowDialogAsync("FileNotFoundDialog/Title".GetLocalizedResource(), "FileNotFoundDialog/Text".GetLocalizedResource());
await DialogDisplayHelper.ShowDialogAsync(Strings.FileNotFoundDialog_Title.GetLocalizedResource(), Strings.FileNotFoundDialog_Text.GetLocalizedResource());
associatedInstance.ToolbarViewModel.CanRefresh = false;
associatedInstance.ShellViewModel?.RefreshItems(previousDir);
}
Expand Down
Loading
Loading