Explorar o código

refactor: move Category picker into Project popover, relocate color icon

Sam Jaffe hai 2 semanas
pai
achega
79ae5275e3
Modificáronse 1 ficheiros con 12 adicións e 14 borrados
  1. 12 14
      Todos/View/ProjectPanelView.swift

+ 12 - 14
Todos/View/ProjectPanelView.swift

@@ -22,9 +22,12 @@ struct ProjectPanelView: View {
 
   var body: some View {
     HStack {
-      TextField("", text: $item.name)
+      TextField("Project Name", text: $item.name)
         .font(.title)
         .padding(.leading, 10)
+      if let grp = $allGroups.first(where: { $0.name.wrappedValue == item.category }) {
+        ColorPicker("", selection: grp.color).disabled(true).scaledToFit()
+      }
       Spacer()
       Button(action: addItem) {
         Image(systemName: "plus")
@@ -59,6 +62,12 @@ struct ProjectPanelView: View {
       .buttonStyle(.borderless)
       .popover(isPresented: $showDialogue) {
         List{
+          Picker("Default Category", selection: $item.category) {
+            Text(empty.name).tag("")
+            ForEach(allGroups) { group in
+              Text(group.name)
+            }
+          }
           HStack {
             Label("", systemImage: "arrow.up.arrow.down")
             Toggle("Move Tasks", isOn: $move)
@@ -72,19 +81,8 @@ struct ProjectPanelView: View {
       }
       Text("")
     }
-    HStack(alignment: .top) {
-      TextField("Project Notes", text: $item.notes, axis: .vertical)
-        .padding(.leading, 20)
-      if let grp = $allGroups.first(where: { $0.name.wrappedValue == item.category }) {
-        ColorPicker("", selection: grp.color).disabled(true).scaledToFit()
-      }
-      Picker("", selection: $item.category) {
-        Text(empty.name).tag("")
-        ForEach(allGroups) { group in
-          Text(group.name)
-        }
-      }.help("Default category for new Tasks")
-    }
+    TextField("Project Notes", text: $item.notes, axis: .vertical)
+      .padding(.leading, 20)
     List {
       ForEach(selected($item.tasks), id: \.id) { task in
         TaskView(task: task)