Merge pull request #199 from aapis/feature/recent-jobs-widget-search-all

Widget enhancements and inspector panel addition
aapis · Dec 27, 2023 · c67592d · c67592d
2 parents b388b27 + 991c9f3
commit c67592d
Show file tree

Hide file tree

Showing 9 changed files with 130 additions and 108 deletions.
diff --git a/DLPrototype/Utils/Navigation.swift b/DLPrototype/Utils/Navigation.swift
@@ -86,6 +86,7 @@ public class Navigation: Identifiable, ObservableObject {
     @Published public var view: AnyView? = AnyView(Dashboard())
     @Published public var parent: Page? = .dashboard
     @Published public var sidebar: AnyView? = AnyView(DashboardSidebar())
+    @Published public var inspector: AnyView? = nil
     @Published public var title: String? = ""
     @Published public var pageId: UUID? = UUID()
     @Published public var session: Session = Session()
@@ -123,12 +124,18 @@ public class Navigation: Identifiable, ObservableObject {
         pageId = nil
         pageId = UUID()
     }
+
+    public func setInspector(_ newInspector: AnyView? = nil) -> Void {
+        inspector = nil
+        inspector = newInspector
+    }
 
     public func reset() -> Void {
         parent = .dashboard
         view = nil
         sidebar = nil
         setId()
+        inspector = nil
         session = Session()
     }
 }

diff --git a/DLPrototype/Views/Find/FindDashboard.swift b/DLPrototype/Views/Find/FindDashboard.swift
@@ -6,16 +6,11 @@
 //  Copyright © 2023 YegCollective. All rights reserved.
 //
 
-import Foundation
 import SwiftUI
 
-struct RecentSearch: Identifiable {
-    let id: UUID = UUID()
-    var term: String
-}
-
 struct FindDashboard: View {
     @Binding public var searching: Bool
+    public var location: WidgetLocation = .content
 
     @State private var searchText: String = ""
     @State private var activeSearchText: String = ""
@@ -42,7 +37,7 @@ struct FindDashboard: View {
                 SearchBar(
                     text: $activeSearchText,
                     disabled: false,
-                    placeholder: "Search \(counts.0) records, \(counts.1) jobs, \(counts.2) tasks and \(counts.3) projects",
+                    placeholder: location == .content ? "Search \(counts.0) records, \(counts.1) jobs, \(counts.2) tasks and \(counts.3) projects" : "Search for anything",
                     onSubmit: onSubmit,
                     onReset: onReset
                 )
@@ -60,11 +55,36 @@ struct FindDashboard: View {
                         onReset()
                     }
                 }
+                .onChange(of: nav.session.search.inspectingEntity) { entity in
+                    if location == .sidebar {
+                        if entity != nil {
+                            nav.setInspector(AnyView(Inspector()))
+                        }
+                    }
+                }
             }
 
             if !searching && activeSearchText.count >= 2 {
                 GridRow {
-                    HStack(alignment: .top, spacing: 1) {
+                    if location == .content {
+                        HStack(alignment: .top, spacing: 1) {
+                            Suggestions(
+                                searchText: $activeSearchText,
+                                publishedOnly: $allowAlive,
+                                showRecords: $showRecords,
+                                showNotes: $showJobs,
+                                showTasks: $showNotes,
+                                showProjects: $showProjects,
+                                showJobs: $showJobs,
+                                showCompanies: $showCompanies,
+                                showPeople: $showPeople
+                            )
+
+                            if nav.session.search.inspectingEntity != nil {
+                                Inspector()
+                            }
+                        }
+                    } else if location == .sidebar {
                         Suggestions(
                             searchText: $activeSearchText,
                             publishedOnly: $allowAlive,
@@ -76,33 +96,31 @@ struct FindDashboard: View {
                             showCompanies: $showCompanies,
                             showPeople: $showPeople
                         )
-
-                        if nav.session.search.inspectingEntity != nil {
-                            Inspector()
-                        }
                     }
                 }
             }
 
-            GridRow {
-                ZStack(alignment: .leading) {
-                    Theme.subHeaderColour
-
-                    HStack {
-                        Toggle("Records", isOn: $showRecords)
-                        Toggle("Notes", isOn: $showNotes)
-                        Toggle("Tasks", isOn: $showTasks)
-                        Toggle("Projects", isOn: $showProjects)
-                        Toggle("Jobs", isOn: $showJobs)
-                        Toggle("Companies", isOn: $showCompanies)
-                        Toggle("People", isOn: $showPeople)
-                        Spacer()
-                        Toggle("Published Only", isOn: $allowAlive)
+            if location == .content {
+                GridRow {
+                    ZStack(alignment: .leading) {
+                        Theme.subHeaderColour
+
+                        HStack {
+                            Toggle("Records", isOn: $showRecords)
+                            Toggle("Notes", isOn: $showNotes)
+                            Toggle("Tasks", isOn: $showTasks)
+                            Toggle("Projects", isOn: $showProjects)
+                            Toggle("Jobs", isOn: $showJobs)
+                            Toggle("Companies", isOn: $showCompanies)
+                            Toggle("People", isOn: $showPeople)
+                            Spacer()
+                            Toggle("Published Only", isOn: $allowAlive)
+                        }
+                        .padding([.leading, .trailing], 10)
                     }
-                    .padding([.leading, .trailing], 10)
                 }
+                .frame(height: 40)
             }
-            .frame(height: 40)
 
             if searching {
                 if loading {
@@ -148,16 +166,20 @@ extension FindDashboard {
     private func onReset() -> Void {
         searching = false
         nav.session.search.reset()
+        nav.session.search.inspectingEntity = nil
+        nav.setInspector()
         loading = false
     }
 
     private func actionOnAppear() -> Void {
-        counts = (
-            CoreDataRecords(moc: moc).countAll(),
-            CoreDataJob(moc: moc).countAll(),
-            CoreDataTasks(moc: moc).countAll(),
-            CoreDataProjects(moc: moc).countAll()
-        )
+        if location == .content {
+            counts = (
+                CoreDataRecords(moc: moc).countAll(),
+                CoreDataJob(moc: moc).countAll(),
+                CoreDataTasks(moc: moc).countAll(),
+                CoreDataProjects(moc: moc).countAll()
+            )
+        }
     }
 
     private func createTabs() -> Void {
@@ -288,7 +310,7 @@ extension FindDashboard {
                     Spacer()
                     FancyButtonv2(
                         text: "Close",
-                        action: {nav.session.search.inspectingEntity = nil},
+                        action: actionChangeEntity,
                         icon: "xmark",
                         showLabel: false,
                         size: .tiny,
@@ -1497,70 +1519,42 @@ extension FindDashboard {
 
 extension FindDashboard.Suggestions.SuggestedJobs {
     private func choose(_ item: Job) -> Void {
-        if nav.session.search.inspectingEntity != nil {
-            nav.session.search.inspectingEntity = nil
-        }
-
         nav.session.search.inspectingEntity = item
     }
 }
 
 extension FindDashboard.Suggestions.SuggestedProjects {
     private func choose(_ item: Project) -> Void {
-        if nav.session.search.inspectingEntity != nil {
-            nav.session.search.inspectingEntity = nil
-        }
-
         nav.session.search.inspectingEntity = item
     }
 }
 
 extension FindDashboard.Suggestions.SuggestedNotes {
     private func choose(_ item: Note) -> Void {
-        if nav.session.search.inspectingEntity != nil {
-            nav.session.search.inspectingEntity = nil
-        }
-
         nav.session.search.inspectingEntity = item
     }
 }
 
 extension FindDashboard.Suggestions.SuggestedTasks {
     private func choose(_ item: LogTask) -> Void {
-        if nav.session.search.inspectingEntity != nil {
-            nav.session.search.inspectingEntity = nil
-        }
-
         nav.session.search.inspectingEntity = item
     }
 }
 
 extension FindDashboard.Suggestions.SuggestedCompanies {
     private func choose(_ item: Company) -> Void {
-        if nav.session.search.inspectingEntity != nil {
-            nav.session.search.inspectingEntity = nil
-        }
-
         nav.session.search.inspectingEntity = item
     }
 }
 
 extension FindDashboard.Suggestions.SuggestedPeople {
     private func choose(_ item: Person) -> Void {
-        if nav.session.search.inspectingEntity != nil {
-            nav.session.search.inspectingEntity = nil
-        }
-
         nav.session.search.inspectingEntity = item
     }
 }
 
 extension FindDashboard.Suggestions.SuggestedRecords {
     private func choose(_ item: LogRecord) -> Void {
-        if nav.session.search.inspectingEntity != nil {
-            nav.session.search.inspectingEntity = nil
-        }
-
         nav.session.search.inspectingEntity = item
     }
 }
@@ -1582,6 +1576,10 @@ extension FindDashboard.Inspector {
             }
         }
     }
+
+    private func actionChangeEntity() -> Void {
+        nav.session.search.inspectingEntity = nil
+    }
 }
 
 extension FindDashboard.RecordsMatchingString {

diff --git a/DLPrototype/Views/Home/Home.swift b/DLPrototype/Views/Home/Home.swift
@@ -126,6 +126,19 @@ struct Home: View {
                     } else {
                         HorizontalSeparator // TODO: maybe remove?
                     }
+
+                    if nav.inspector != nil {
+                        ZStack(alignment: .topLeading) {
+                            LinearGradient(gradient: Gradient(colors: [Color.clear, Color.black]), startPoint: .topTrailing, endPoint: .topLeading)
+                                .opacity(0.25)
+                                .frame(width: 20)
+
+                            nav.inspector
+                                .environmentObject(nav)
+                        }
+                        .background(Theme.subHeaderColour)
+                        .frame(width: 340)
+                    }
 
                     if isDatePickerPresented{
                         ZStack {
@@ -179,6 +192,8 @@ struct Home: View {
         NSEvent.addLocalMonitorForEvents(matching: .keyDown) {
             if self.isEscapeKey(with: $0) {
                 isDatePickerPresented = false
+                nav.session.search.inspectingEntity = nil
+                nav.setInspector()
                 return nil
             } else {
                 return $0

diff --git a/DLPrototype/Views/Shared/AppSidebar/SidebarItem.swift b/DLPrototype/Views/Shared/AppSidebar/SidebarItem.swift
@@ -103,15 +103,15 @@ struct SidebarItem: View, Identifiable {
 
     @ViewBuilder private var ItemIcon: some View {
         if let ic = icon {
-            ZStack(alignment: .center) {
-                if ![.important, .action].contains(role) {
-                    role.colour.opacity(highlighted ? 0.15 : 0.08)
-                } else {
-                    role.colour
-                }
-
-                VStack {
-                    Button(action: doAction) {
+            Button(action: doAction) {
+                ZStack(alignment: .center) {
+                    if ![.important, .action].contains(role) {
+                        role.colour.opacity(highlighted ? 0.15 : 0.08)
+                    } else {
+                        role.colour
+                    }
+                    
+                    VStack {
                         if let alt = altIcon {
                             if highlighted {
                                 Image(systemName: alt)
@@ -128,13 +128,11 @@ struct SidebarItem: View, Identifiable {
                                 .frame(maxWidth: 30, maxHeight: 30)
                         }
                     }
-                    .buttonStyle(.plain)
-                    .useDefaultHover({ inside in highlighted = inside})
-                    .padding(.top, 5)
-                    Spacer()
                 }
+                .frame(width: type.iconFrameSize)
             }
-            .frame(width: type.iconFrameSize)
+            .buttonStyle(.plain)
+            .useDefaultHover({ inside in highlighted = inside})
         }
     }
 

diff --git a/DLPrototype/Views/Shared/AppSidebar/Widgets/TodayInHistoryWidget.swift b/DLPrototype/Views/Shared/AppSidebar/Widgets/TodayInHistoryWidget.swift
@@ -78,10 +78,6 @@ extension TodayInHistoryWidget {
         minimized.toggle()
     }
 
-    private func actionSettings() -> Void {
-//        isSettingsPresented.toggle()
-    }
-
     private func findHistoricalDataForToday() async -> Void {
         let calendar = Calendar.autoupdatingCurrent
         let current = calendar.dateComponents([.year, .month, .day], from: currentDate)

diff --git a/DLPrototype/Views/Shared/Fancy/FancyButton.swift b/DLPrototype/Views/Shared/Fancy/FancyButton.swift
@@ -105,6 +105,7 @@ public struct FancyButtonv2: View {
                 button
             }
             .buttonStyle(.plain)
+            .useDefaultHover({ inside in highlighted = inside})
         } else {
             Button(action: {
                 if let ac = action {
@@ -118,6 +119,7 @@ public struct FancyButtonv2: View {
                 button
             }
             .buttonStyle(.plain)
+            .useDefaultHover({ inside in highlighted = inside})
         }
     }
 
@@ -164,7 +166,6 @@ public struct FancyButtonv2: View {
         .font(size.font)
         .help(text)
         .underline((size == .link || size == .titleLink) && highlighted)
-        .useDefaultHover({ inside in highlighted = inside})
     }
 
     private var Background: some View {

diff --git a/DLPrototype/Views/Shared/Fancy/FancyGenericToolbar.swift b/DLPrototype/Views/Shared/Fancy/FancyGenericToolbar.swift
@@ -127,7 +127,7 @@ struct FancyGenericToolbar: View {
                         .buttonStyle(.borderless)
                         .foregroundColor(Color.white)
                         .help(button.helpText)
-                        .frame(width: 60)
+                        .frame(width: location == .sidebar ? 40 : 60)
                         .useDefaultHover({_ in})
                     }
                 }