Moved tabs below source control toggle

Author: austincondiff

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGeneralView.swift

@@ -14,10 +14,7 @@ struct SourceControlGeneralView: View {
     let gitConfig = GitConfigClient(shellClient: currentWorld.shellClient)
 
     var body: some View {
-        SettingsForm {
-            Section {
-                sourceControlIsEnabled
-            }
+        Group {
             Section("Source Control") {
                 refreshLocalStatusAuto
                 fetchRefreshStatusAuto
@@ -37,70 +34,47 @@ struct SourceControlGeneralView: View {
 }
 
 private extension SourceControlGeneralView {
-    private var sourceControlIsEnabled: some View {
-        Toggle(
-            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 {
         Toggle(
             "Refresh local status automatically",
             isOn: $settings.refreshStatusLocally
         )
-        .disabled(!settings.sourceControlIsEnabled)
     }
 
     private var fetchRefreshStatusAuto: some View {
         Toggle(
             "Fetch and refresh server status automatically",
             isOn: $settings.fetchRefreshServerStatus
         )
-        .disabled(!settings.sourceControlIsEnabled)
     }
 
     private var addRemoveFilesAuto: some View {
         Toggle(
             "Add and remove files automatically",
             isOn: $settings.addRemoveAutomatically
         )
-        .disabled(!settings.sourceControlIsEnabled)
     }
 
     private var selectFilesToCommitAuto: some View {
         Toggle(
             "Select files to commit automatically",
             isOn: $settings.selectFilesToCommit
         )
-        .disabled(!settings.sourceControlIsEnabled)
     }
 
     private var showSourceControlChanges: some View {
         Toggle(
             "Show source control changes",
             isOn: $settings.showSourceControlChanges
         )
-        .disabled(!settings.sourceControlIsEnabled)
     }
 
     private var includeUpstreamChanges: some View {
         Toggle(
             "Include upstream changes",
             isOn: $settings.includeUpstreamChanges
         )
-        .disabled(!settings.sourceControlIsEnabled || !settings.showSourceControlChanges)
+        .disabled(!settings.showSourceControlChanges)
     }
 
     private var comparisonView: some View {

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGitView.swift

@@ -21,7 +21,7 @@ struct SourceControlGitView: View {
     @State private var resolvedGitIgnorePath: String = "~/.gitignore_global"
 
     var body: some View {
-        SettingsForm {
+        Group {
             Section {
                 gitAuthorName
                 gitEmail

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlSettingsView.swift

@@ -8,29 +8,55 @@
 import SwiftUI
 
 struct SourceControlSettingsView: View {
+    @AppSettings(\.sourceControl.general)
+    var settings
+
     @State var selectedTab: String = "general"
 
     var body: some View {
-        Group {
-            switch selectedTab {
-            case "general":
-                SourceControlGeneralView()
-            case "git":
-                SourceControlGitView()
-            default:
-                SourceControlGeneralView()
+        SettingsForm {
+            Section {
+                sourceControlIsEnabled
+            } footer: {
+                if settings.sourceControlIsEnabled {
+                    Picker("", selection: $selectedTab) {
+                        Text("General").tag("general")
+                        Text("Git").tag("git")
+                    }
+                    .pickerStyle(.segmented)
+                    .labelsHidden()
+                    .padding(.top, 10)
+                }
             }
-        }
-        .safeAreaInset(edge: .top, spacing: 0) {
-            Picker("", selection: $selectedTab) {
-                Text("General").tag("general")
-                Text("Git").tag("git")
+            if settings.sourceControlIsEnabled {
+                switch selectedTab {
+                case "general":
+                    SourceControlGeneralView()
+                case "git":
+                    SourceControlGitView()
+                default:
+                    SourceControlGeneralView()
+                }
             }
-            .pickerStyle(.segmented)
-            .labelsHidden()
-            .padding(.horizontal, 20)
-            .padding(.bottom, 20)
+        }
+    }
 
+    private var sourceControlIsEnabled: some View {
+        Toggle(
+            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)
     }
+
 }