Refactor String identifiers (#920)

- Group all views under "views.*" - Split global strings into actions and nouns - Use underscores - Clean up unused Fixes #835
passepartoutvpn · Nov 23, 2024 · f13a292 · f13a292
1 parent 3e2823c
commit f13a292
Show file tree

Hide file tree

Showing 71 changed files with 735 additions and 776 deletions.
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/About/AboutCoordinator.swift b/Passepartout/Library/Sources/AppUIMain/Views/About/AboutCoordinator.swift
@@ -96,7 +96,7 @@ extension AboutCoordinator {
             LinksView()
 
         default:
-            Text(Strings.Global.noSelection)
+            Text(Strings.Global.Nouns.noSelection)
                 .themeEmptyMessage()
         }
     }
@@ -124,7 +124,7 @@ extension AboutCoordinator {
             }
 
         default:
-            Text(Strings.Global.noSelection)
+            Text(Strings.Global.Nouns.noSelection)
                 .themeEmptyMessage()
         }
     }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/About/iOS/AboutContentView+iOS.swift b/Passepartout/Library/Sources/AppUIMain/Views/About/iOS/AboutContentView+iOS.swift
@@ -74,11 +74,11 @@ private extension AboutContentView {
             .themeSection(header: Strings.Views.About.Sections.resources)
             Section {
                 linkContent(.diagnostics)
-                Text(Strings.Global.version)
+                Text(Strings.Global.Nouns.version)
                     .themeTrailingValue(BundleConfiguration.mainVersionString)
             }
         }
-        .navigationTitle(Strings.Global.settings)
+        .navigationTitle(Strings.Global.Nouns.settings)
     }
 }
 

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/About/macOS/AboutContentView+macOS.swift b/Passepartout/Library/Sources/AppUIMain/Views/About/macOS/AboutContentView+macOS.swift
@@ -60,7 +60,7 @@ struct AboutContentView<LinkContent, AboutDestination, LogDestination>: View whe
                 .themeNavigationStack(closable: false, path: $path)
                 .toolbar {
                     ToolbarItem(placement: .confirmationAction) {
-                        Button(Strings.Global.ok) {
+                        Button(Strings.Global.Nouns.ok) {
                             dismiss()
                         }
                     }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/AddProfileMenu.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/AddProfileMenu.swift
@@ -52,24 +52,24 @@ struct AddProfileMenu: View {
 private extension AddProfileMenu {
     var newProfileButton: some View {
         Button {
-            let profile = profileManager.new(withName: Strings.Entities.Profile.Name.new)
+            let profile = profileManager.new(withName: Strings.Placeholders.Profile.name)
             onNewProfile(profile)
         } label: {
-            ThemeImageLabel(Strings.Views.Profiles.Toolbar.newProfile, .profileEdit)
+            ThemeImageLabel(Strings.Views.App.Toolbar.newProfile, .profileEdit)
         }
     }
 
     var importProfileButton: some View {
         Button {
             isImporting = true
         } label: {
-            ThemeImageLabel(Strings.Views.Profiles.Toolbar.importProfile.withTrailingDots, .profileImport)
+            ThemeImageLabel(Strings.Views.App.Toolbar.importProfile.withTrailingDots, .profileImport)
         }
     }
 
     var migrateProfilesButton: some View {
         Button(action: onMigrateProfiles) {
-            ThemeImageLabel(Strings.Views.Profiles.Toolbar.migrateProfiles.withTrailingDots, .profileMigrate)
+            ThemeImageLabel(Strings.Views.App.Toolbar.migrateProfiles.withTrailingDots, .profileMigrate)
         }
     }
 }
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/InstalledProfileView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/InstalledProfileView.swift
@@ -90,7 +90,7 @@ private extension InstalledProfileView {
     }
 
     var nameView: some View {
-        Text(profile?.name ?? Strings.Views.Profiles.Rows.notInstalled)
+        Text(profile?.name ?? Strings.Views.App.Rows.notInstalled)
             .font(.title2)
             .fontWeight(theme.relevantWeight)
             .themeTruncating(.tail)

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileAttributesView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileAttributesView.swift
@@ -70,7 +70,7 @@ struct ProfileAttributesView: View {
             case .tv:
                 return (
                     isRemoteImportingEnabled ? .tvOn : .tvOff,
-                    Strings.Modules.General.Rows.appleTv(Strings.Unlocalized.appleTV)
+                    Strings.Modules.General.Rows.appletv(Strings.Unlocalized.appleTV)
                 )
             }
         }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileCardView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileCardView.swift
@@ -50,7 +50,7 @@ struct ProfileCardView: View {
                     .font(.headline)
                     .themeTruncating()
 
-                Text(preview.subtitle ?? Strings.Views.Profiles.Rows.noModules)
+                Text(preview.subtitle ?? Strings.Views.App.Rows.noModules)
                     .multilineTextAlignment(.leading)
                     .font(.subheadline)
                     .foregroundStyle(.secondary)

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContainerView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContainerView.swift
@@ -96,8 +96,8 @@ private extension ProfileContainerView {
         InteractiveCoordinator(style: .modal, manager: interactiveManager) {
             errorHandler.handle(
                 $0,
-                title: Strings.Global.connection,
-                message: Strings.Views.Profiles.Errors.tunnel
+                title: Strings.Global.Nouns.connection,
+                message: Strings.Views.App.Errors.tunnel
             )
         }
         .presentationDetents([.medium])
@@ -122,10 +122,10 @@ private struct ContainerModifier: ViewModifier {
                 isEmpty: !profileManager.hasProfiles,
                 emptyContent: {
                     VStack(spacing: 16) {
-                        Text(Strings.Views.Profiles.Folders.noProfiles)
+                        Text(Strings.Views.App.Folders.noProfiles)
                             .themeEmptyMessage(fullScreen: false)
 
-                        Button(Strings.Views.Profiles.Folders.NoProfiles.migrate) {
+                        Button(Strings.Views.App.Folders.NoProfiles.migrate) {
                             flow?.onMigrateProfiles()
                         }
                     }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContextMenu.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContextMenu.swift
@@ -78,7 +78,7 @@ private extension ProfileContextMenu {
             },
             label: {
                 ThemeImageLabel(
-                    $0 ? Strings.Global.enable : Strings.Global.disable,
+                    $0 ? Strings.Global.Actions.enable : Strings.Global.Actions.disable,
                     $0 ? .tunnelEnable : .tunnelDisable
                 )
             }
@@ -89,7 +89,7 @@ private extension ProfileContextMenu {
         profile?
             .selectedProvider
             .map { _ in
-                Button(Strings.Ui.ProfileContext.connectTo) {
+                Button(Strings.Views.App.ProfileContext.connectTo) {
                     flow?.onEditProviderEntity(profile!)
                 }
             }
@@ -104,7 +104,7 @@ private extension ProfileContextMenu {
                 flow?.onPurchaseRequired($0)
             },
             label: {
-                ThemeImageLabel(Strings.Global.restart, .tunnelRestart)
+                ThemeImageLabel(Strings.Global.Actions.restart, .tunnelRestart)
             }
         )
     }
@@ -113,7 +113,7 @@ private extension ProfileContextMenu {
         Button {
             flow?.onEditProfile(preview)
         } label: {
-            ThemeImageLabel(Strings.Global.edit.withTrailingDots, .profileEdit)
+            ThemeImageLabel(Strings.Global.Actions.edit.withTrailingDots, .profileEdit)
         }
     }
 
@@ -123,7 +123,7 @@ private extension ProfileContextMenu {
             preview: preview,
             errorHandler: errorHandler
         ) {
-            ThemeImageLabel(Strings.Global.duplicate, .contextDuplicate)
+            ThemeImageLabel(Strings.Global.Actions.duplicate, .contextDuplicate)
         }
     }
 
@@ -132,7 +132,7 @@ private extension ProfileContextMenu {
             profileManager: profileManager,
             preview: preview
         ) {
-            ThemeImageLabel(Strings.Global.remove, .contextRemove)
+            ThemeImageLabel(Strings.Global.Actions.remove, .contextRemove)
         }
     }
 }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileDuplicateButton.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileDuplicateButton.swift
@@ -44,8 +44,8 @@ struct ProfileDuplicateButton<Label>: View where Label: View {
                 } catch {
                     errorHandler.handle(
                         error,
-                        title: Strings.Global.duplicate,
-                        message: Strings.Views.Profiles.Errors.duplicate(preview.name)
+                        title: Strings.Global.Actions.duplicate,
+                        message: Strings.Views.App.Errors.duplicate(preview.name)
                     )
                 }
             }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileGridView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileGridView.swift
@@ -71,7 +71,7 @@ struct ProfileGridView: View, Routable, TunnelInstallationProviding {
                                 }
                             }
                     }
-                    .themeGridHeader(title: Strings.Views.Profiles.Folders.default)
+                    .themeGridHeader(title: Strings.Views.App.Folders.default)
                 }
                 .padding(.horizontal)
             }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileImporterModifier.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileImporterModifier.swift
@@ -53,7 +53,7 @@ struct ProfileImporterModifier: ViewModifier {
                 handleResult(.success($0))
             }
             .alert(
-                Strings.Views.Profiles.Toolbar.importProfile,
+                Strings.Views.App.Toolbar.importProfile,
                 isPresented: $importer.isPresentingPassphrase,
                 presenting: importer.nextURL,
                 actions: actions,
@@ -79,7 +79,7 @@ private extension ProfileImporterModifier {
                 )
             }
         }
-        Button(Strings.Global.cancel, role: .cancel) {
+        Button(Strings.Global.Actions.cancel, role: .cancel) {
             importer.cancelImport()
         }
     }
@@ -100,8 +100,8 @@ private extension ProfileImporterModifier {
             } catch {
                 await errorHandler.handle(
                     error,
-                    title: Strings.Views.Profiles.Toolbar.importProfile,
-                    message: Strings.Views.Profiles.Errors.import
+                    title: Strings.Views.App.Toolbar.importProfile,
+                    message: Strings.Views.App.Errors.import
                 )
             }
         }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileListView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileListView.swift
@@ -70,7 +70,7 @@ struct ProfileListView: View, Routable, TunnelInstallationProviding {
                             }
                         }
                 }
-                .themeSection(header: Strings.Views.Profiles.Folders.default)
+                .themeSection(header: Strings.Views.App.Folders.default)
             }
             .themeForm()
         }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/TunnelRestartButton.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/TunnelRestartButton.swift
@@ -59,8 +59,8 @@ struct TunnelRestartButton<Label>: View where Label: View {
                 } catch {
                     errorHandler.handle(
                         error,
-                        title: Strings.Global.connection,
-                        message: Strings.Views.Profiles.Errors.tunnel
+                        title: Strings.Global.Nouns.connection,
+                        message: Strings.Views.App.Errors.tunnel
                     )
                 }
             }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenu.swift b/Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenu.swift
@@ -66,24 +66,24 @@ private extension AppMenu {
     }
 
     var showToggle: some View {
-        Button(Strings.Global.show) {
+        Button(Strings.Global.Actions.show) {
             settings.isVisible = true
         }
     }
 
     var loginToggle: some View {
-        Toggle(Strings.Views.Settings.launchesOnLogin, isOn: $settings.launchesOnLogin)
+        Toggle(Strings.Views.Preferences.launchesOnLogin, isOn: $settings.launchesOnLogin)
     }
 
     var keepToggle: some View {
-        Toggle(Strings.Views.Settings.keepsInMenu, isOn: $settings.keepsInMenu)
+        Toggle(Strings.Views.Preferences.keepsInMenu, isOn: $settings.keepsInMenu)
     }
 
     var profilesList: some View {
         Group {
             ForEach(profileManager.previews, id: \.id, content: profileToggle)
         }
-        .themeSection(header: Strings.Views.Profiles.Folders.default)
+        .themeSection(header: Strings.Views.App.Folders.default)
     }
 
     func profileToggle(for preview: ProfilePreview) -> some View {
@@ -112,14 +112,14 @@ private extension AppMenu {
     }
 
     var aboutButton: some View {
-        Button(Strings.Global.about.withTrailingDots) {
+        Button(Strings.Global.Nouns.about.withTrailingDots) {
             NSApp.activate(ignoringOtherApps: true)
             NSApp.orderFrontStandardAboutPanel(self)
         }
     }
 
     var quitButton: some View {
-        Button(Strings.AppMenu.Items.quit(BundleConfiguration.mainDisplayName)) {
+        Button(Strings.Views.AppMenu.Items.quit(BundleConfiguration.mainDisplayName)) {
             NSApp.terminate(self)
         }
     }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DiagnosticsView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DiagnosticsView.swift
@@ -90,7 +90,7 @@ struct DiagnosticsView: View {
         .themeForm()
         .navigationTitle(Strings.Views.Diagnostics.title)
         .alert(Strings.Views.Diagnostics.ReportIssue.title, isPresented: $isPresentingUnableToEmail) {
-            Button(Strings.Global.ok, role: .cancel) {
+            Button(Strings.Global.Nouns.ok, role: .cancel) {
                 isPresentingUnableToEmail = false
             }
         } message: {

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Migration/MigrateButton.swift b/Passepartout/Library/Sources/AppUIMain/Views/Migration/MigrateButton.swift
@@ -40,10 +40,10 @@ private extension MigrateButton {
     var title: String {
         switch step {
         case .initial, .fetching, .fetched:
-            return Strings.Views.Migrate.Items.migrate
+            return Strings.Views.Migration.Items.migrate
 
         case .migrating, .migrated:
-            return Strings.Global.done
+            return Strings.Global.Nouns.done
         }
     }
 

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Migration/MigrateContentView+List.swift b/Passepartout/Library/Sources/AppUIMain/Views/Migration/MigrateContentView+List.swift
@@ -67,7 +67,7 @@ private extension MigrateContentView.ListView {
     }
 
     var messageView: some View {
-        Text(Strings.Views.Migrate.Sections.Main.header(Strings.Unlocalized.appName))
+        Text(Strings.Views.Migration.Sections.Main.header(Strings.Unlocalized.appName))
             .padding([.top, .leading, .trailing])
     }
 
@@ -98,7 +98,7 @@ private extension MigrateContentView.ListView {
         }
         .listStyle(.plain)
         .disabled(!step.canSelect)
-        .themeEmpty(if: isEmpty, message: Strings.Views.Migrate.noProfiles)
+        .themeEmpty(if: isEmpty, message: Strings.Views.Migration.noProfiles)
     }
 
     func isIncludedBinding(for profileId: UUID) -> Binding<Bool> {
@@ -142,7 +142,7 @@ private extension MigrateContentView.ListView {
         var body: some View {
             HStack {
                 if isEditing {
-                    Button(Strings.Global.cancel) {
+                    Button(Strings.Global.Actions.cancel) {
                         isEditing = false
                     }
                 }
@@ -165,7 +165,7 @@ private extension MigrateContentView.ListView {
         }
 
         var title: String {
-            isEditing ? Strings.Views.Migrate.Items.discard : Strings.Global.edit
+            isEditing ? Strings.Views.Migration.Items.discard : Strings.Global.Actions.edit
         }
 
         var role: ButtonRole? {

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Migration/MigrateContentView+Table.swift b/Passepartout/Library/Sources/AppUIMain/Views/Migration/MigrateContentView+Table.swift
@@ -61,18 +61,18 @@ private extension MigrateContentView.TableView {
     }
 
     var messageView: some View {
-        Text(Strings.Views.Migrate.Sections.Main.header(Strings.Unlocalized.appName))
+        Text(Strings.Views.Migration.Sections.Main.header(Strings.Unlocalized.appName))
             .padding([.top, .leading, .trailing])
     }
 
     var profilesForm: some View {
         Form {
             Table(profiles) {
-                TableColumn(Strings.Global.name) {
+                TableColumn(Strings.Global.Nouns.name) {
                     Text($0.name)
                         .foregroundStyle(statuses.style(for: $0.id))
                 }
-                TableColumn(Strings.Global.lastUpdate) {
+                TableColumn(Strings.Global.Nouns.lastUpdate) {
                     Text($0.timestamp)
                         .foregroundStyle(statuses.style(for: $0.id))
                 }
@@ -98,7 +98,7 @@ private extension MigrateContentView.TableView {
         }
         .disabled(!step.canSelect)
         .themeForm()
-        .themeEmpty(if: isEmpty, message: Strings.Views.Migrate.noProfiles)
+        .themeEmpty(if: isEmpty, message: Strings.Views.Migration.noProfiles)
     }
 
     func isIncludedBinding(for profileId: UUID) -> Binding<Bool> {