-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #299 from aapis/feature/1.12/soften-ui
Soften edges in UI
- Loading branch information
Showing
7 changed files
with
128 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| // | ||
| // Planning.NoDueDate.swift | ||
| // KlockWork | ||
| // | ||
| // Created by Ryan Priebe on 2024-10-14. | ||
| // Copyright © 2024 YegCollective. All rights reserved. | ||
| // | ||
|
|
||
| import SwiftUI | ||
| import KWCore | ||
|
|
||
| extension Planning { | ||
| struct NoDueDate: View { | ||
| @EnvironmentObject public var nav: Navigation | ||
| @State private var tasks: [LogTask] = [] | ||
| @State private var overdue: [UpcomingRow] = [] | ||
| @State private var id: UUID = UUID() | ||
| private let page: PageConfiguration.AppPage = .planning | ||
|
|
||
| var body: some View { | ||
| VStack(alignment: .leading, spacing: 1) { | ||
| if !self.overdue.isEmpty { | ||
| ForEach(self.overdue, id: \.id) { row in | ||
| Section { | ||
| ForEach(row.tasks) { task in | ||
| TaskItem(task: task, callback: self.actionTaskActionTap) | ||
| } | ||
| } header: { | ||
| Timestamp(text: "\(row.tasks.count) on \(row.date)", fullWidth: true, alignment: .leading, clear: true) | ||
| .background(Theme.base.opacity(0.6)) | ||
| } | ||
| } | ||
| } else { | ||
| VStack(alignment: .center) { | ||
| HStack(alignment: .center) { | ||
| Text("All tasks have due dates, well done.") | ||
| .foregroundColor(.gray) | ||
| Spacer() | ||
| } | ||
| } | ||
|
|
||
| .padding() | ||
| .background(Theme.rowColour) | ||
| } | ||
|
|
||
| Spacer() | ||
| } | ||
| .id(self.id) | ||
| .onAppear(perform: self.actionOnAppear) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension Planning.NoDueDate { | ||
| /// Fires when the Forecast callback is fired | ||
| /// - Returns: Void | ||
| private func actionForecastCallback() -> Void { | ||
| self.actionTaskActionTap() | ||
| } | ||
|
|
||
| /// Fires when a task is interacted with | ||
| /// - Returns: Void | ||
| private func actionTaskActionTap() -> Void { | ||
| self.tasks = [] | ||
| self.actionOnAppear() | ||
| } | ||
|
|
||
| /// Onload handler | ||
| /// - Returns: Void | ||
| private func actionOnAppear() -> Void { | ||
| self.id = UUID() | ||
| self.tasks = CoreDataTasks(moc: self.nav.moc).noDueDate() | ||
| self.overdue = [] | ||
| let grouped = Dictionary(grouping: self.tasks, by: {$0.due!.formatted(date: .abbreviated, time: .omitted)}) | ||
| let sorted = Array(grouped) | ||
| .sorted(by: { | ||
| let df = DateFormatter() | ||
| df.dateStyle = .medium | ||
| df.timeStyle = .none | ||
| if let d1 = df.date(from: $0.key) { | ||
| if let d2 = df.date(from: $1.key) { | ||
| return d1 < d2 | ||
| } | ||
| } | ||
| return false | ||
| }) | ||
|
|
||
| for group in sorted { | ||
| self.overdue.append( | ||
| UpcomingRow( | ||
| date: group.key, | ||
| tasks: group.value.sorted(by: {$0.due! < $1.due!}) | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters