Added source control settings header. Moved feature icon into new view for reuse.

austincondiff · austincondiff · commit 464bdeaeba0f · 2024-12-02T12:19:40.000-06:00
diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj
@@ -571,6 +571,7 @@
 		B6966A302C33282200259C2D /* RemoteBranchPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6966A2F2C33282200259C2D /* RemoteBranchPicker.swift */; };
 		B6966A322C3348D300259C2D /* WorkspaceSheets.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6966A312C3348D300259C2D /* WorkspaceSheets.swift */; };
 		B6966A342C34996B00259C2D /* SourceControlManager+GitClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6966A332C34996B00259C2D /* SourceControlManager+GitClient.swift */; };
+		B696A7E62CFE20C40048CFE1 /* FeatureIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = B696A7E52CFE20C40048CFE1 /* FeatureIcon.swift */; };
 		B697937A29FF5668002027EC /* AccountsSettingsAccountLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B697937929FF5668002027EC /* AccountsSettingsAccountLink.swift */; };
 		B69BFDC72B0686910050D9A6 /* GitClient+Initiate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69BFDC62B0686910050D9A6 /* GitClient+Initiate.swift */; };
 		B69D3EDE2C5E85A2005CF43A /* StopTaskToolbarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69D3EDD2C5E85A2005CF43A /* StopTaskToolbarButton.swift */; };
@@ -1246,6 +1247,7 @@
 		B6966A2F2C33282200259C2D /* RemoteBranchPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteBranchPicker.swift; sourceTree = "<group>"; };
 		B6966A312C3348D300259C2D /* WorkspaceSheets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkspaceSheets.swift; sourceTree = "<group>"; };
 		B6966A332C34996B00259C2D /* SourceControlManager+GitClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceControlManager+GitClient.swift"; sourceTree = "<group>"; };
+		B696A7E52CFE20C40048CFE1 /* FeatureIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureIcon.swift; sourceTree = "<group>"; };
 		B697937929FF5668002027EC /* AccountsSettingsAccountLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSettingsAccountLink.swift; sourceTree = "<group>"; };
 		B69BFDC62B0686910050D9A6 /* GitClient+Initiate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Initiate.swift"; sourceTree = "<group>"; };
 		B69D3EDD2C5E85A2005CF43A /* StopTaskToolbarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopTaskToolbarButton.swift; sourceTree = "<group>"; };
@@ -3558,6 +3560,7 @@
 		B6CF632A29E5436C0085880A /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				B696A7E52CFE20C40048CFE1 /* FeatureIcon.swift */,
 				B67DBB932CD5FBE2007F4F18 /* GlobPatternListItem.swift */,
 				B67DBB912CD5EAA4007F4F18 /* GlobPatternList.swift */,
 				B6041F4C29D7A4E9000F3454 /* SettingsPageView.swift */,
@@ -4032,6 +4035,7 @@
 				30B0880D2C0D53080063A882 /* LanguageServer+References.swift in Sources */,
 				77A01E2E2BB4261200F0EA38 /* CEWorkspaceSettings.swift in Sources */,
 				6C4104E9297C970F00F472BA /* AboutDefaultView.swift in Sources */,
+				B696A7E62CFE20C40048CFE1 /* FeatureIcon.swift in Sources */,
 				587B9E6F29301D8F00AC7927 /* GitLabProjectAccess.swift in Sources */,
 				587B9E6929301D8F00AC7927 /* GitLabEvent.swift in Sources */,
 				B63F6A7B2C561BCB003B4342 /* RegexFormatter.swift in Sources */,
diff --git a/CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGeneralView.swift b/CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGeneralView.swift
@@ -15,8 +15,10 @@ struct SourceControlGeneralView: View {
 
     var body: some View {
         SettingsForm {
-            Section("Source Control") {
+            Section {
                 sourceControlIsEnabled
+            }
+            Section("Source Control") {
                 refreshLocalStatusAuto
                 fetchRefreshStatusAuto
                 addRemoveFilesAuto
@@ -37,9 +39,20 @@ struct SourceControlGeneralView: View {
 private extension SourceControlGeneralView {
     private var sourceControlIsEnabled: some View {
         Toggle(
-            "Enable source control",
             isOn: $settings.sourceControlIsEnabled
-        )
+        ) {
+            Label {
+                Text("Source Control")
+                Text("""
+                 Back up your files, collaborate with others, and tag your releases. \
+                 [Learn more...](https://developer.apple.com/documentation/xcode/source-control-management)
+                 """)
+                .font(.callout)
+             } icon: {
+                FeatureIcon(symbol: Image(symbol: "vault"), color: Color(.systemBlue), size: 26)
+            }
+        }
+        .controlSize(.large)
     }
 
     private var refreshLocalStatusAuto: some View {
diff --git a/CodeEdit/Features/Settings/Views/FeatureIcon.swift b/CodeEdit/Features/Settings/Views/FeatureIcon.swift
@@ -0,0 +1,44 @@
+//
+//  FeatureIcon.swift
+//  CodeEdit
+//
+//  Created by Austin Condiff on 12/2/24.
+//
+
+import SwiftUI
+
+struct FeatureIcon: View {
+    private let symbol: Image
+    private let color: Color
+    private let size: CGFloat
+
+    init(
+        symbol: Image?,
+        color: Color?,
+        size: CGFloat?
+    ) {
+        self.symbol = symbol ?? Image(systemName: "exclamationmark.triangle")
+        self.color = color ?? .white
+        self.size = size ?? 20
+    }
+
+    var body: some View {
+        Group {
+            symbol
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+        }
+        .shadow(color: Color(NSColor.black).opacity(0.25), radius: size / 40, y: size / 40)
+        .padding(size / 8)
+        .foregroundColor(.white)
+        .frame(width: size, height: size)
+        .background(
+            RoundedRectangle(
+                cornerRadius: size / 4,
+                style: .continuous
+            )
+            .fill(color.gradient)
+            .shadow(color: Color(NSColor.black).opacity(0.25), radius: size / 40, y: size / 40)
+        )
+    }
+}
diff --git a/CodeEdit/Features/Settings/Views/SettingsPageView.swift b/CodeEdit/Features/Settings/Views/SettingsPageView.swift
@@ -16,41 +16,25 @@ struct SettingsPageView: View {
         self.searchText = searchText
     }
 
+    var symbol: Image? {
+        switch page.icon {
+        case .system(let name):
+            Image(systemName: name)
+        case .symbol(let name):
+            Image(symbol: name)
+        case .asset(let name):
+            Image(name)
+        case .none: nil
+        }
+    }
+
     var body: some View {
         NavigationLink(value: page) {
             Label {
                 page.name.rawValue.highlightOccurrences(self.searchText)
                     .padding(.leading, 2)
             } icon: {
-                Group {
-                    switch page.icon {
-                    case .system(let name):
-                        Image(systemName: name)
-                            .resizable()
-                            .aspectRatio(contentMode: .fit)
-                    case .symbol(let name):
-                        Image(symbol: name)
-                            .resizable()
-                            .aspectRatio(contentMode: .fit)
-                    case .asset(let name):
-                        Image(name)
-                            .resizable()
-                            .aspectRatio(contentMode: .fit)
-                    case .none: EmptyView()
-                    }
-                }
-                .shadow(color: Color(NSColor.black).opacity(0.25), radius: 0.5, y: 0.5)
-                .padding(2.5)
-                .foregroundColor(.white)
-                .frame(width: 20, height: 20)
-                .background(
-                    RoundedRectangle(
-                        cornerRadius: 5,
-                        style: .continuous
-                    )
-                    .fill((page.baseColor ?? .white).gradient)
-                    .shadow(color: Color(NSColor.black).opacity(0.25), radius: 0.5, y: 0.5)
-                )
+                FeatureIcon(symbol: symbol, color: page.baseColor, size: 20)
             }
         }
     }
diff --git a/CodeEdit/Features/Settings/Views/View+NavigationBarBackButtonVisible.swift b/CodeEdit/Features/Settings/Views/View+NavigationBarBackButtonVisible.swift
@@ -21,6 +21,7 @@ struct NavigationBarBackButtonVisible: ViewModifier {
                     self.presentationMode.wrappedValue.dismiss()
                 } label: {
                     Image(systemName: "chevron.left")
+                        .frame(width: 23)
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ struct NavigationBarBackButtonVisible: ViewModifier {`
`21`	`21`	`self.presentationMode.wrappedValue.dismiss()`
`22`	`22`	`} label: {`
`23`	`23`	`Image(systemName: "chevron.left")`
	`24`	`+ .frame(width: 23)`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`	`}`