Refactor the views names used in Settings

vincode-io · Dec 27, 2023 · 2e22146 · 2e22146
1 parent 1feb316
commit 2e22146
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 48 deletions.
diff --git a/Zavala.xcodeproj/project.pbxproj b/Zavala.xcodeproj/project.pbxproj
@@ -184,13 +184,13 @@
 		51F2859B25AD12800019C573 /* CollectionsSearchContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F2859A25AD12800019C573 /* CollectionsSearchContentView.swift */; };
 		51F2DC7B2586E101003BD5CE /* EditorRowNoteTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F2DC7A2586E101003BD5CE /* EditorRowNoteTextView.swift */; };
 		51F83B862725BFF30015FC06 /* ReloadVisibleItemsOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F83B852725BFF30015FC06 /* ReloadVisibleItemsOperation.swift */; };
-		51FA273A2B3B6493008B665E /* AccountsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA27392B3B6493008B665E /* AccountsView.swift */; };
-		51FA273C2B3B68DE008B665E /* OutlineOwnerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA273B2B3B68DE008B665E /* OutlineOwnerView.swift */; };
+		51FA273A2B3B6493008B665E /* SettingsAccountsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA27392B3B6493008B665E /* SettingsAccountsView.swift */; };
+		51FA273C2B3B68DE008B665E /* SettingsOutlineOwnerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA273B2B3B68DE008B665E /* SettingsOutlineOwnerView.swift */; };
 		51FA273E2B3B6A12008B665E /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA273D2B3B6A12008B665E /* SettingsView.swift */; };
-		51FA27402B3B718B008B665E /* OutlineDefaultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA273F2B3B718B008B665E /* OutlineDefaultsView.swift */; };
-		51FA27422B3B748C008B665E /* AppearanceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA27412B3B748C008B665E /* AppearanceView.swift */; };
-		51FA27442B3B8F2B008B665E /* FontsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA27432B3B8F2B008B665E /* FontsView.swift */; };
-		51FA27462B3B9337008B665E /* HelpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA27452B3B9337008B665E /* HelpView.swift */; };
+		51FA27402B3B718B008B665E /* SettingsOutlineDefaultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA273F2B3B718B008B665E /* SettingsOutlineDefaultsView.swift */; };
+		51FA27422B3B748C008B665E /* SettingsAppearanceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA27412B3B748C008B665E /* SettingsAppearanceView.swift */; };
+		51FA27442B3B8F2B008B665E /* SettingsFontsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA27432B3B8F2B008B665E /* SettingsFontsView.swift */; };
+		51FA27462B3B9337008B665E /* SettingsHelpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FA27452B3B9337008B665E /* SettingsHelpView.swift */; };
 		51FF2A6B2732B97800208A75 /* ValidatingMenuToolbarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FF2A6A2732B97800208A75 /* ValidatingMenuToolbarItem.swift */; };
 /* End PBXBuildFile section */
 
@@ -432,13 +432,13 @@
 		51F2859A25AD12800019C573 /* CollectionsSearchContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionsSearchContentView.swift; sourceTree = "<group>"; };
 		51F2DC7A2586E101003BD5CE /* EditorRowNoteTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorRowNoteTextView.swift; sourceTree = "<group>"; };
 		51F83B852725BFF30015FC06 /* ReloadVisibleItemsOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReloadVisibleItemsOperation.swift; sourceTree = "<group>"; };
-		51FA27392B3B6493008B665E /* AccountsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsView.swift; sourceTree = "<group>"; };
-		51FA273B2B3B68DE008B665E /* OutlineOwnerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineOwnerView.swift; sourceTree = "<group>"; };
+		51FA27392B3B6493008B665E /* SettingsAccountsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsAccountsView.swift; sourceTree = "<group>"; };
+		51FA273B2B3B68DE008B665E /* SettingsOutlineOwnerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsOutlineOwnerView.swift; sourceTree = "<group>"; };
 		51FA273D2B3B6A12008B665E /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
-		51FA273F2B3B718B008B665E /* OutlineDefaultsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineDefaultsView.swift; sourceTree = "<group>"; };
-		51FA27412B3B748C008B665E /* AppearanceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearanceView.swift; sourceTree = "<group>"; };
-		51FA27432B3B8F2B008B665E /* FontsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontsView.swift; sourceTree = "<group>"; };
-		51FA27452B3B9337008B665E /* HelpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpView.swift; sourceTree = "<group>"; };
+		51FA273F2B3B718B008B665E /* SettingsOutlineDefaultsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsOutlineDefaultsView.swift; sourceTree = "<group>"; };
+		51FA27412B3B748C008B665E /* SettingsAppearanceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsAppearanceView.swift; sourceTree = "<group>"; };
+		51FA27432B3B8F2B008B665E /* SettingsFontsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsFontsView.swift; sourceTree = "<group>"; };
+		51FA27452B3B9337008B665E /* SettingsHelpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsHelpView.swift; sourceTree = "<group>"; };
 		51FF2A6A2732B97800208A75 /* ValidatingMenuToolbarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidatingMenuToolbarItem.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -628,12 +628,12 @@
 			isa = PBXGroup;
 			children = (
 				51FA273D2B3B6A12008B665E /* SettingsView.swift */,
-				51FA27392B3B6493008B665E /* AccountsView.swift */,
-				51FA273F2B3B718B008B665E /* OutlineDefaultsView.swift */,
-				51FA273B2B3B68DE008B665E /* OutlineOwnerView.swift */,
-				51FA27412B3B748C008B665E /* AppearanceView.swift */,
-				51FA27432B3B8F2B008B665E /* FontsView.swift */,
-				51FA27452B3B9337008B665E /* HelpView.swift */,
+				51FA27392B3B6493008B665E /* SettingsAccountsView.swift */,
+				51FA273F2B3B718B008B665E /* SettingsOutlineDefaultsView.swift */,
+				51FA273B2B3B68DE008B665E /* SettingsOutlineOwnerView.swift */,
+				51FA27412B3B748C008B665E /* SettingsAppearanceView.swift */,
+				51FA27432B3B8F2B008B665E /* SettingsFontsView.swift */,
+				51FA27452B3B9337008B665E /* SettingsHelpView.swift */,
 				517AF69F25E08A6B0044DBAB /* Settings.storyboard */,
 				5113B094260E638400DBD11B /* SettingsFontConfigViewController.swift */,
 				5113B091260E45B400DBD11B /* SettingsFontViewController.swift */,
@@ -1136,20 +1136,20 @@
 				517AF6A725E08CB80044DBAB /* NonIntrinsicLabel.swift in Sources */,
 				5116894029BD72DE00318832 /* AttributedLabelView.swift in Sources */,
 				5147D0AD25CB6F2D004673C3 /* KeyboardTableView.swift in Sources */,
-				51FA27422B3B748C008B665E /* AppearanceView.swift in Sources */,
+				51FA27422B3B748C008B665E /* SettingsAppearanceView.swift in Sources */,
 				5147D0B825CCAB2A004673C3 /* DocumentsViewController+Drop.swift in Sources */,
 				51C030AC257E0A7200609262 /* ReloadItemsOperation.swift in Sources */,
 				514F222A25C4FF02004E02CD /* EditorTagInputTextField.swift in Sources */,
 				5147D0B525CB95B4004673C3 /* DocumentsViewController+Drag.swift in Sources */,
 				51077C5227A752DF000C71DB /* UIFont+.swift in Sources */,
-				51FA273A2B3B6493008B665E /* AccountsView.swift in Sources */,
+				51FA273A2B3B6493008B665E /* SettingsAccountsView.swift in Sources */,
 				51D977FA257A2E4F00D98490 /* EditorRowPreviewParameters.swift in Sources */,
 				5191850927137DFD00B7E177 /* GetCurrentTagsIntentHandler.swift in Sources */,
 				517AF69C25E0862E0044DBAB /* AppDefaults.swift in Sources */,
 				51FF2A6B2732B97800208A75 /* ValidatingMenuToolbarItem.swift in Sources */,
 				517A9E1B2602ACE000EF346A /* OutlineEditorSceneDelegate.swift in Sources */,
 				51F2859B25AD12800019C573 /* CollectionsSearchContentView.swift in Sources */,
-				51FA27462B3B9337008B665E /* HelpView.swift in Sources */,
+				51FA27462B3B9337008B665E /* SettingsHelpView.swift in Sources */,
 				51C030B8257E198B00609262 /* EditorTitleTextView.swift in Sources */,
 				51F13EFE255E13A9004B85CA /* ZavalaImageAssets.swift in Sources */,
 				510471BD2719AEFA001DEFD5 /* RemoveRowsIntentHandler.swift in Sources */,
@@ -1202,7 +1202,7 @@
 				5116894529BDA0E500318832 /* AboutSceneDelegate.swift in Sources */,
 				511B29FD2601901C00C04239 /* EditorBacklinkViewCell.swift in Sources */,
 				51B2B2CE2563AAF60090C56B /* EditorRowContentConfiguration.swift in Sources */,
-				51FA273C2B3B68DE008B665E /* OutlineOwnerView.swift in Sources */,
+				51FA273C2B3B68DE008B665E /* SettingsOutlineOwnerView.swift in Sources */,
 				51C030BE257E1B9400609262 /* EditorRowTextView.swift in Sources */,
 				51F83B862725BFF30015FC06 /* ReloadVisibleItemsOperation.swift in Sources */,
 				514F221B25C4D08D004E02CD /* EditorTagInputContentConfiguration.swift in Sources */,
@@ -1238,7 +1238,7 @@
 				51C030A6257E084E00609262 /* EditorTitleContentView.swift in Sources */,
 				519897C42ADE13F3008A6FA4 /* ButtonGroup.swift in Sources */,
 				51E5C49127221F6F00A38983 /* IntentRow+.swift in Sources */,
-				51FA27402B3B718B008B665E /* OutlineDefaultsView.swift in Sources */,
+				51FA27402B3B718B008B665E /* SettingsOutlineDefaultsView.swift in Sources */,
 				5109BC52293445EB0022E90B /* DocumentsActivityItemsConfiguration.swift in Sources */,
 				51C71C74273F264600F6C779 /* ImageSceneDelegate.swift in Sources */,
 				511A99F727B9B596001BD443 /* ToolbarButton.swift in Sources */,
@@ -1271,7 +1271,7 @@
 				519184EE270FAFE100B7E177 /* GetImagesForOutlineIntentHandler.swift in Sources */,
 				51C4C45B255ACA1B004E0206 /* EditorViewController.swift in Sources */,
 				514F220D25C4CCA7004E02CD /* EditorTagViewCell.swift in Sources */,
-				51FA27442B3B8F2B008B665E /* FontsView.swift in Sources */,
+				51FA27442B3B8F2B008B665E /* SettingsFontsView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Zavala/Settings/AccountsView.swift → Zavala/Settings/SettingsAccountsView.swift b/Zavala/Settings/AccountsView.swift → Zavala/Settings/SettingsAccountsView.swift
@@ -1,5 +1,5 @@
 //
-//  AccountsView.swift
+//  SettingsAccountsView.swift
 //  Zavala
 //
 //  Created by Maurice Parker on 12/26/23.
@@ -8,7 +8,7 @@
 import SwiftUI
 import UIKit
 
-struct AccountsView: View {
+struct SettingsAccountsView: View {
 
 	@State var enableLocalAccount = AppDefaults.shared.enableLocalAccount
 	@State var enableCloudKit = AppDefaults.shared.enableCloudKit
@@ -55,5 +55,5 @@ struct AccountsView: View {
 }
 
 #Preview {
-    AccountsView()
+    SettingsAccountsView()
 }
diff --git a/Zavala/Settings/AppearanceView.swift → Zavala/Settings/SettingsAppearanceView.swift b/Zavala/Settings/AppearanceView.swift → Zavala/Settings/SettingsAppearanceView.swift
@@ -1,5 +1,5 @@
 //
-//  AppearanceView.swift
+//  SettingsAppearanceView.swift
 //  Zavala
 //
 //  Created by Maurice Parker on 12/26/23.
@@ -8,7 +8,7 @@
 import UIKit
 import SwiftUI
 
-struct AppearanceView: View {
+struct SettingsAppearanceView: View {
 
 	@State var rowIndent = AppDefaults.shared.rowIndentSize
 	@State var rowSpacing = AppDefaults.shared.rowSpacingSize
@@ -54,13 +54,13 @@ struct AppearanceView: View {
 
 			if UIDevice.current.userInterfaceIdiom != .mac {
 				NavigationLink(AppStringAssets.fontsControlLabel) {
-					FontsView()
+					SettingsFontsView()
 				}
 			}
 		}
     }
 }
 
 #Preview {
-    AppearanceView()
+    SettingsAppearanceView()
 }
diff --git a/Zavala/Settings/FontsView.swift → Zavala/Settings/SettingsFontsView.swift b/Zavala/Settings/FontsView.swift → Zavala/Settings/SettingsFontsView.swift
@@ -1,13 +1,13 @@
 //
-//  FontsView.swift
+//  SettingsFontsView.swift
 //  Zavala
 //
 //  Created by Maurice Parker on 12/26/23.
 //
 
 import SwiftUI
 
-struct FontsView: UIViewControllerRepresentable {
+struct SettingsFontsView: UIViewControllerRepresentable {
 
 	func makeUIViewController(context: Context) -> SettingsFontViewController {
 		return UIStoryboard.settings.instantiateInitialViewController() as! SettingsFontViewController
@@ -19,5 +19,5 @@ struct FontsView: UIViewControllerRepresentable {
 }
 
 #Preview {
-    FontsView()
+    SettingsFontsView()
 }
diff --git a/Zavala/Settings/HelpView.swift → Zavala/Settings/SettingsHelpView.swift b/Zavala/Settings/HelpView.swift → Zavala/Settings/SettingsHelpView.swift
@@ -1,5 +1,5 @@
 //
-//  HelpView.swift
+//  SettingsHelpView.swift
 //  Zavala
 //
 //  Created by Maurice Parker on 12/26/23.
@@ -8,7 +8,7 @@
 import SwiftUI
 import VinUtility
 
-struct HelpView: View {
+struct SettingsHelpView: View {
 
 	@Environment(\.openURL) private var openURL
 	@State var isPresentingAbout = false
@@ -44,5 +44,5 @@ struct HelpView: View {
 }
 
 #Preview {
-    HelpView()
+    SettingsHelpView()
 }
diff --git a/Zavala/Settings/OutlineDefaultsView.swift → ...ettings/SettingsOutlineDefaultsView.swift b/Zavala/Settings/OutlineDefaultsView.swift → ...ettings/SettingsOutlineDefaultsView.swift
@@ -1,13 +1,13 @@
 //
-//  OutlineDefaultsView.swift
+//  SettingsOutlineDefaultsView.swift
 //  Zavala
 //
 //  Created by Maurice Parker on 12/26/23.
 //
 
 import SwiftUI
 
-struct OutlineDefaultsView: View {
+struct SettingsOutlineDefaultsView: View {
 
 	@State var autoLinking = AppDefaults.shared.autoLinkingEnabled
 
@@ -25,5 +25,5 @@ struct OutlineDefaultsView: View {
 }
 
 #Preview {
-    OutlineDefaultsView()
+    SettingsOutlineDefaultsView()
 }
diff --git a/Zavala/Settings/OutlineOwnerView.swift → ...a/Settings/SettingsOutlineOwnerView.swift b/Zavala/Settings/OutlineOwnerView.swift → ...a/Settings/SettingsOutlineOwnerView.swift
@@ -1,13 +1,13 @@
 //
-//  OutlineOwnerView.swift
+//  SettingsOutlineOwnerView.swift
 //  Zavala
 //
 //  Created by Maurice Parker on 12/26/23.
 //
 
 import SwiftUI
 
-struct OutlineOwnerView: View {
+struct SettingsOutlineOwnerView: View {
 
 	@State var name = AppDefaults.shared.ownerName ?? ""
 	@State var email = AppDefaults.shared.ownerEmail ?? ""
@@ -40,5 +40,5 @@ struct OutlineOwnerView: View {
 }
 
 #Preview {
-    OutlineOwnerView()
+    SettingsOutlineOwnerView()
 }
diff --git a/Zavala/Settings/SettingsView.swift b/Zavala/Settings/SettingsView.swift
@@ -14,11 +14,11 @@ struct SettingsView: View {
     var body: some View {
 		NavigationStack {
 			Form {
-				AccountsView()
-				OutlineDefaultsView()
-				OutlineOwnerView()
-				AppearanceView()
-				HelpView()
+				SettingsAccountsView()
+				SettingsOutlineDefaultsView()
+				SettingsOutlineOwnerView()
+				SettingsAppearanceView()
+				SettingsHelpView()
 			}
 			.navigationTitle(AppStringAssets.settingsControlLabel)
 			.navigationBarTitleDisplayMode(.inline)