Update layout for settings views

Author: zenangst

App/Sources/UI/Views/Onboarding/PermissionsView.swift

@@ -65,6 +65,7 @@ struct PermissionsView: View {
           done.toggle()
           onAction(.requestPermissions)
         })
+        .buttonStyle(.positive)
         .environment(\.buttonBackgroundColor, .systemGreen)
         .environment(\.buttonHoverEffect, false)
         .environment(\.buttonFocusEffect, false)

App/Sources/UI/Views/Settings/Applications/ApplicationSettingsView.swift

@@ -17,6 +17,7 @@ struct ApplicationSettingsView: View {
           .style(.derived)
         Spacer()
       }
+      .padding(.top, 8)
 
       Group {
         if additionalApplicationPaths.isEmpty {
@@ -38,7 +39,7 @@ struct ApplicationSettingsView: View {
                 }
                 Divider()
               }
-//              .style(.item)
+              .style(.item)
             }
             .frame(maxHeight: .infinity)
           }

App/Sources/UI/Views/Settings/Notifications/NotificationsSettingsView.swift

@@ -10,12 +10,12 @@ struct NotificationsSettingsView: View {
   @AppStorage("Notifications.Placement") var notificationPlacement: NotificationPlacement = .bottomTrailing
 
   var body: some View {
-    VStack(alignment: .center) {
-      VStack {
+    VStack(alignment: .center, spacing: 8) {
+      VStack(spacing: 8) {
         RoundedRectangle(cornerRadius: 4)
           .fill(gradient)
           .aspectRatio(1.54/1, contentMode: .fit)
-          .frame(height: 170)
+          .frame(height: 180)
           .overlay(content: {
             Text("Notification Placement")
               .font(.caption2)
@@ -26,78 +26,84 @@ struct NotificationsSettingsView: View {
             }, set: { _ in
               notificationPlacement = .topLeading
             }), label: {})
+            .padding(8)
           }
           .overlay(alignment: .top) {
             Toggle(isOn: Binding(get: {
               notificationPlacement == .top
             }, set: { _ in
               notificationPlacement = .top
             }), label: {})
+            .padding(8)
           }
           .overlay(alignment: .topTrailing) {
             Toggle(isOn: Binding(get: {
               notificationPlacement == .topTrailing
             }, set: { _ in
               notificationPlacement = .topTrailing
             }), label: {})
+            .padding(8)
           }
-
           .overlay(alignment: .leading) {
             Toggle(isOn: Binding(get: {
               notificationPlacement == .leading
             }, set: { _ in
               notificationPlacement = .leading
             }), label: {})
+            .padding(8)
           }
-
           .overlay(alignment: .trailing) {
             Toggle(isOn: Binding(get: {
               notificationPlacement == .trailing
             }, set: { _ in
               notificationPlacement = .trailing
             }), label: {})
+            .padding(8)
           }
-
           .overlay(alignment: .bottomLeading) {
             Toggle(isOn: Binding(get: {
               notificationPlacement == .bottomLeading
             }, set: { _ in
               notificationPlacement = .bottomLeading
             }), label: {})
+            .padding(8)
           }
-
           .overlay(alignment: .bottom) {
             Toggle(isOn: Binding(get: {
               notificationPlacement == .bottom
             }, set: { _ in
               notificationPlacement = .bottom
             }), label: {})
+            .padding(8)
           }
-
           .overlay(alignment: .bottomTrailing) {
             Toggle(isOn: Binding(get: {
               notificationPlacement == .bottomTrailing
             }, set: { _ in
               notificationPlacement = .bottomTrailing
             }), label: {})
-              .padding(8)
+            .padding(8)
           }
       }
+      .padding(.vertical, 8)
       .frame(maxWidth: .infinity)
-      .padding()
-      .roundedStyle(padding: 0)
+      .roundedStyle(padding: 4)
+      .style(.derived)
 
       Grid(alignment: .leading) {
         GridRow {
           Toggle("Keyboard Commands", isOn: $keyboardCommands)
           Toggle("Running Workflows", isOn: $runningWorkflows)
           Toggle("Show Bundles", isOn: $bundles)
         }
+        .frame(maxWidth: .infinity)
       }
+      .switchStyle()
       .font(.caption2)
-      .padding([.horizontal])
+      .roundedSubStyle()
+      .style(.derived)
     }
-    .frame(minWidth: 480, minHeight: 280, alignment: .top)
+    .style(.derived)
     .enableInjection()
   }
 

App/Sources/UI/Views/Settings/Permissions/PermissionsSettingsView.swift

@@ -37,7 +37,6 @@ struct PermissionsSettingsView: View {
         }
       }
     })
-    .frame(minWidth: 480, maxWidth: 480)
   }
 }
 

App/Sources/UI/Views/Settings/SettingsView.swift

@@ -10,8 +10,10 @@ struct SettingsView: View {
       NotificationsSettingsView()
         .tabItem { Label("Notifications", systemImage: "app.badge") }
       PermissionsSettingsView()
+        .padding(8)
         .tabItem { Label("Permissions", systemImage: "hand.raised.circle.fill") }
     }
+    .frame(minWidth: 450, minHeight: 280, alignment: .center)
     .enableInjection()
   }
 }

App/Sources/UI/Windows/PermissionsSettings.swift

@@ -6,9 +6,12 @@ final class PermissionsSettings: NSObject, NSWindowDelegate {
   private var window: NSWindow?
 
   func show() {
-    let styleMask: NSWindow.StyleMask = [.closable, .miniaturizable, .resizable, .titled]
-    let window = ZenSwiftUIWindow(styleMask: styleMask,
-                                  content: PermissionsSettingsView().style(.derived))
+    let styleMask: NSWindow.StyleMask = [.closable, .miniaturizable, .resizable, .titled, .fullSizeContentView]
+    let window = ZenSwiftUIWindow(styleMask: styleMask) {
+      PermissionsSettingsView()
+        .style(.derived)
+        .frame(minWidth: 400)
+    }
     window.animationBehavior = .utilityWindow
     window.titleVisibility = .hidden
     window.titlebarAppearsTransparent = true