Skip to content

Commit 1a2ac2d

Browse files
aapisaapis
authored
Merge pull request #58 from aapis/feature/ux-pass-05
UX pass
2 parents c45f5ea + f576e05 commit 1a2ac2d

31 files changed

+3663
-1958
lines changed

‎KlockWork-iOS/KlockWork-iOS.xcodeproj/project.pbxproj

+38-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
53274B3C2C13C7E6008387BF /* AssessmentFactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53274B3B2C13C7E6008387BF /* AssessmentFactor.swift */; };
2828
536B32B22C1A03BB00E01517 /* AppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 536B32B12C1A038E00E01517 /* AppState.swift */; };
2929
536E4F692C0D77A600FDC1F4 /* ActionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 536E4F682C0D77A600FDC1F4 /* ActionType.swift */; };
30+
53713E362C94CFA9006C244D /* DateStrip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53713E352C94CFA6006C244D /* DateStrip.swift */; };
31+
53713E382C94D805006C244D /* AddButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53713E372C94D7FB006C244D /* AddButton.swift */; };
32+
53713E3A2C94D816006C244D /* ViewModeSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53713E392C94D813006C244D /* ViewModeSelector.swift */; };
3033
53733D512C851CF500212DD6 /* Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53733D502C851CF200212DD6 /* Logo.swift */; };
3134
537582C72BFFB37900CB528C /* Data.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 537582C52BFFB37900CB528C /* Data.xcdatamodeld */; };
3235
537582CC2BFFD70D00CB528C /* RecordDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 537582CB2BFFD70D00CB528C /* RecordDetail.swift */; };
@@ -60,8 +63,14 @@
6063
53B1A9752C863B3A00096071 /* Timestamp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B1A9742C863B3800096071 /* Timestamp.swift */; };
6164
53B2C3692C1F7D65003507CE /* DefaultObjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B2C3682C1F7D59003507CE /* DefaultObjects.swift */; };
6265
53B2C36B2C22708D003507CE /* PageMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B2C36A2C22708A003507CE /* PageMode.swift */; };
66+
53B58C7C2C93EC6A004F5DB7 /* TaskForecast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B58C7B2C93EC65004F5DB7 /* TaskForecast.swift */; };
67+
53B58C7E2C93EDF0004F5DB7 /* CreateEntitiesButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B58C7D2C93EDEC004F5DB7 /* CreateEntitiesButton.swift */; };
6368
53B72B5C2C77DDE900324E15 /* DefinitionDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B72B5B2C77DDE600324E15 /* DefinitionDetail.swift */; };
6469
53C059B82C33BCAE0066111C /* RecordFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53C059B72C33BCAA0066111C /* RecordFilter.swift */; };
70+
53C518402C9CF56B00E2BB2E /* Tabs.Content.List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53C5183F2C9CF55900E2BB2E /* Tabs.Content.List.swift */; };
71+
53C518422C9CF5AB00E2BB2E /* Tabs.Content.Individual.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53C518412C9CF5A600E2BB2E /* Tabs.Content.Individual.swift */; };
72+
53C518442C9CF5CB00E2BB2E /* Tabs.Content.Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53C518432C9CF5C700E2BB2E /* Tabs.Content.Common.swift */; };
73+
53C518462C9E274B00E2BB2E /* Company.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53C518452C9E274900E2BB2E /* Company.swift */; };
6574
53D4CB572BFE930100AFEDEA /* KlockWork_iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53D4CB562BFE930100AFEDEA /* KlockWork_iOSApp.swift */; };
6675
53D4CB642BFE930300AFEDEA /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 53D4CB632BFE930300AFEDEA /* Preview Assets.xcassets */; };
6776
53D4CB7B2BFE93B000AFEDEA /* Main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53D4CB6A2BFE93B000AFEDEA /* Main.swift */; };
@@ -144,6 +153,9 @@
144153
53274B3B2C13C7E6008387BF /* AssessmentFactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssessmentFactor.swift; sourceTree = "<group>"; };
145154
536B32B12C1A038E00E01517 /* AppState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppState.swift; sourceTree = "<group>"; };
146155
536E4F682C0D77A600FDC1F4 /* ActionType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionType.swift; sourceTree = "<group>"; };
156+
53713E352C94CFA6006C244D /* DateStrip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateStrip.swift; sourceTree = "<group>"; };
157+
53713E372C94D7FB006C244D /* AddButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddButton.swift; sourceTree = "<group>"; };
158+
53713E392C94D813006C244D /* ViewModeSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModeSelector.swift; sourceTree = "<group>"; };
147159
53733D502C851CF200212DD6 /* Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logo.swift; sourceTree = "<group>"; };
148160
537582C62BFFB37900CB528C /* Note.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Note.xcdatamodel; sourceTree = "<group>"; };
149161
537582CB2BFFD70D00CB528C /* RecordDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordDetail.swift; sourceTree = "<group>"; };
@@ -179,8 +191,14 @@
179191
53B1A9742C863B3800096071 /* Timestamp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Timestamp.swift; sourceTree = "<group>"; };
180192
53B2C3682C1F7D59003507CE /* DefaultObjects.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultObjects.swift; sourceTree = "<group>"; };
181193
53B2C36A2C22708A003507CE /* PageMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageMode.swift; sourceTree = "<group>"; };
194+
53B58C7B2C93EC65004F5DB7 /* TaskForecast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskForecast.swift; sourceTree = "<group>"; };
195+
53B58C7D2C93EDEC004F5DB7 /* CreateEntitiesButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateEntitiesButton.swift; sourceTree = "<group>"; };
182196
53B72B5B2C77DDE600324E15 /* DefinitionDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefinitionDetail.swift; sourceTree = "<group>"; };
183197
53C059B72C33BCAA0066111C /* RecordFilter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordFilter.swift; sourceTree = "<group>"; };
198+
53C5183F2C9CF55900E2BB2E /* Tabs.Content.List.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tabs.Content.List.swift; sourceTree = "<group>"; };
199+
53C518412C9CF5A600E2BB2E /* Tabs.Content.Individual.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tabs.Content.Individual.swift; sourceTree = "<group>"; };
200+
53C518432C9CF5C700E2BB2E /* Tabs.Content.Common.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tabs.Content.Common.swift; sourceTree = "<group>"; };
201+
53C518452C9E274900E2BB2E /* Company.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Company.swift; sourceTree = "<group>"; };
184202
53D4CB532BFE930100AFEDEA /* KlockWork-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "KlockWork-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
185203
53D4CB562BFE930100AFEDEA /* KlockWork_iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KlockWork_iOSApp.swift; sourceTree = "<group>"; };
186204
53D4CB612BFE930300AFEDEA /* KlockWork_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = KlockWork_iOS.entitlements; sourceTree = "<group>"; };
@@ -278,6 +296,11 @@
278296
5311F3FE2C17A03500FB3071 /* Widget */ = {
279297
isa = PBXGroup;
280298
children = (
299+
53713E392C94D813006C244D /* ViewModeSelector.swift */,
300+
53713E372C94D7FB006C244D /* AddButton.swift */,
301+
53713E352C94CFA6006C244D /* DateStrip.swift */,
302+
53B58C7D2C93EDEC004F5DB7 /* CreateEntitiesButton.swift */,
303+
53B58C7B2C93EC65004F5DB7 /* TaskForecast.swift */,
281304
53E6974D2C23ABAD005A7375 /* ProjectSelector.swift */,
282305
53E6974B2C23ABA2005A7375 /* CompanySelector.swift */,
283306
5311F3F32C1558A500FB3071 /* JobSelector.swift */,
@@ -301,6 +324,7 @@
301324
53274B3A2C13C7DB008387BF /* Extensions */ = {
302325
isa = PBXGroup;
303326
children = (
327+
53C518452C9E274900E2BB2E /* Company.swift */,
304328
53274B3B2C13C7E6008387BF /* AssessmentFactor.swift */,
305329
);
306330
path = Extensions;
@@ -309,6 +333,7 @@
309333
537582D32C00338E00CB528C /* SharedViews */ = {
310334
isa = PBXGroup;
311335
children = (
336+
53C518432C9CF5C700E2BB2E /* Tabs.Content.Common.swift */,
312337
53B1A9742C863B3800096071 /* Timestamp.swift */,
313338
53733D502C851CF200212DD6 /* Logo.swift */,
314339
538A10322C31C7CC0028B785 /* RowAddButton.swift */,
@@ -317,6 +342,8 @@
317342
5311F3FE2C17A03500FB3071 /* Widget */,
318343
5311F3F72C1794E400FB3071 /* PageActionBar */,
319344
537582D42C0033B800CB528C /* Tabs.swift */,
345+
53C5183F2C9CF55900E2BB2E /* Tabs.Content.List.swift */,
346+
53C518412C9CF5A600E2BB2E /* Tabs.Content.Individual.swift */,
320347
537582D62C004A9600CB528C /* StatusMessage.swift */,
321348
5387AE882C0143D100EEC581 /* SearchBar.swift */,
322349
539134EF2C02C44000B48494 /* Swipe.swift */,
@@ -631,6 +658,8 @@
631658
53274B352C1214E0008387BF /* LegendLabel.swift in Sources */,
632659
537582CE2BFFEB7500CB528C /* EdgeBorder.swift in Sources */,
633660
537582C72BFFB37900CB528C /* Data.xcdatamodeld in Sources */,
661+
53713E382C94D805006C244D /* AddButton.swift in Sources */,
662+
53C518402C9CF56B00E2BB2E /* Tabs.Content.List.swift in Sources */,
634663
5380795F2C1CF6B100B97D55 /* PageActionBar.Create.swift in Sources */,
635664
538A10332C31C7D70028B785 /* RowAddButton.swift in Sources */,
636665
539134EA2C0269B600B48494 /* PageConfiguration.swift in Sources */,
@@ -643,6 +672,7 @@
643672
53E50C132C0E60ED00A85FDC /* Day.swift in Sources */,
644673
53F9262D2BFEA00E00948076 /* Plan.swift in Sources */,
645674
53F9262E2BFEA00E00948076 /* Color.swift in Sources */,
675+
53713E362C94CFA9006C244D /* DateStrip.swift in Sources */,
646676
53B1A9752C863B3A00096071 /* Timestamp.swift in Sources */,
647677
53F9262F2BFEA00E00948076 /* DispatchQueue.swift in Sources */,
648678
53F926302BFEA00E00948076 /* View.swift in Sources */,
@@ -653,13 +683,16 @@
653683
53F926322BFEA00E00948076 /* String.swift in Sources */,
654684
53F926062BFE9BF300948076 /* CoreDataCalendarEvent.swift in Sources */,
655685
53F926072BFE9BF300948076 /* CoreDataCompanies.swift in Sources */,
686+
53C518422C9CF5AB00E2BB2E /* Tabs.Content.Individual.swift in Sources */,
656687
538A53522C6FF1C400711639 /* TermDetail.swift in Sources */,
657688
539134EC2C02883000B48494 /* PersonDetail.swift in Sources */,
658689
53F926082BFE9BF300948076 /* CoreDataJob.swift in Sources */,
690+
53C518462C9E274B00E2BB2E /* Company.swift in Sources */,
659691
532441662C04428700659F14 /* Titlebar.swift in Sources */,
660692
53B2C36B2C22708D003507CE /* PageMode.swift in Sources */,
661693
53F926092BFE9BF300948076 /* CoreDataNotes.swift in Sources */,
662694
5311F3F62C15592A00FB3071 /* PageActionBar.swift in Sources */,
695+
53713E3A2C94D816006C244D /* ViewModeSelector.swift in Sources */,
663696
53E50C092C0E5F5800A85FDC /* Assessables.swift in Sources */,
664697
53274B372C12179D008387BF /* ButtonType.swift in Sources */,
665698
53F9260A2BFE9BF300948076 /* CoreDataNoteVersions.swift in Sources */,
@@ -684,13 +717,15 @@
684717
53733D512C851CF500212DD6 /* Logo.swift in Sources */,
685718
539134F02C02C44000B48494 /* Swipe.swift in Sources */,
686719
53D4CBCA2BFE955000AFEDEA /* SaveSource.swift in Sources */,
720+
53B58C7C2C93EC6A004F5DB7 /* TaskForecast.swift in Sources */,
687721
53D4CBC52BFE94C900AFEDEA /* DateHelper.swift in Sources */,
688722
539134FE2C03AA4F00B48494 /* QueryFieldSelectJob.swift in Sources */,
689723
53D4CBC62BFE94C900AFEDEA /* CustomPickerItem.swift in Sources */,
690724
5387AE892C0143D100EEC581 /* SearchBar.swift in Sources */,
691725
539135052C040D7500B48494 /* MiniTitleBar.swift in Sources */,
692726
53D4CBAC2BFE947900AFEDEA /* Theme.swift in Sources */,
693727
53E33F852C1B8D43001191ED /* LargeDateIndicator.swift in Sources */,
728+
53B58C7E2C93EDF0004F5DB7 /* CreateEntitiesButton.swift in Sources */,
694729
539134FC2C03A8EC00B48494 /* QueryField.swift in Sources */,
695730
53D4CB7E2BFE93B000AFEDEA /* Planning.swift in Sources */,
696731
5311F3F42C1558A500FB3071 /* JobSelector.swift in Sources */,
@@ -715,6 +750,7 @@
715750
53D4CB852BFE93B000AFEDEA /* Companies.swift in Sources */,
716751
53D4CB842BFE93B000AFEDEA /* TaskDetail.swift in Sources */,
717752
53E50C172C0E619C00A85FDC /* OverviewWidget.swift in Sources */,
753+
53C518442C9CF5CB00E2BB2E /* Tabs.Content.Common.swift in Sources */,
718754
53D4CB862BFE93B000AFEDEA /* Jobs.swift in Sources */,
719755
53D4CB7D2BFE93B000AFEDEA /* Explore.swift in Sources */,
720756
53E50C192C0E61DB00A85FDC /* Legend.swift in Sources */,
@@ -861,7 +897,7 @@
861897
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
862898
CODE_SIGN_ENTITLEMENTS = "KlockWork-iOS/KlockWork_iOS.entitlements";
863899
CODE_SIGN_STYLE = Automatic;
864-
CURRENT_PROJECT_VERSION = 21;
900+
CURRENT_PROJECT_VERSION = 22;
865901
DEAD_CODE_STRIPPING = YES;
866902
DEVELOPMENT_ASSET_PATHS = "\"KlockWork-iOS/Preview Content\"";
867903
DEVELOPMENT_TEAM = 6DT7L2N5X6;
@@ -904,7 +940,7 @@
904940
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
905941
CODE_SIGN_ENTITLEMENTS = "KlockWork-iOS/KlockWork_iOS.entitlements";
906942
CODE_SIGN_STYLE = Automatic;
907-
CURRENT_PROJECT_VERSION = 21;
943+
CURRENT_PROJECT_VERSION = 22;
908944
DEAD_CODE_STRIPPING = YES;
909945
DEVELOPMENT_ASSET_PATHS = "\"KlockWork-iOS/Preview Content\"";
910946
DEVELOPMENT_TEAM = 6DT7L2N5X6;

‎KlockWork-iOS/KlockWork-iOS/Entities/Detail/CompanyDetail.swift

+2
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ extension CompanyDetail {
128128
if let nm = company.name {name = nm}
129129
if let ab = company.abbreviation {abbreviation = ab}
130130
if let co = company.colour {colour = Color.fromStored(co)}
131+
} else {
132+
self.createdDate = self.state.date
131133
}
132134
}
133135

‎KlockWork-iOS/KlockWork-iOS/Entities/Detail/JobDetail.swift

+35-33
Original file line numberDiff line numberDiff line change
@@ -119,43 +119,43 @@ struct JobDetail: View {
119119
.foregroundStyle(.white)
120120
}
121121
}
122-
}
123-
.onAppear(perform: self.actionOnAppear)
124-
.navigationTitle("Job")
125-
.background(page.primaryColour)
126-
.scrollContentBackground(.hidden)
127-
.navigationBarTitleDisplayMode(.inline)
128-
.toolbarBackground(Theme.textBackground.opacity(0.7), for: .navigationBar)
129-
.toolbarBackground(.visible, for: .navigationBar)
130-
.scrollDismissesKeyboard(.immediately)
131-
.toolbar {
132-
ToolbarItem(placement: .topBarTrailing) {
133-
// Creates new entity on tap, then sends user back to Today
134-
Button {
135-
self.actionOnSave()
136-
} label: {
137-
Text("Save")
122+
.onAppear(perform: self.actionOnAppear)
123+
.navigationTitle("Job")
124+
.background(page.primaryColour)
125+
.scrollContentBackground(.hidden)
126+
.navigationBarTitleDisplayMode(.inline)
127+
.toolbarBackground(Theme.textBackground.opacity(0.7), for: .navigationBar)
128+
.toolbarBackground(.visible, for: .navigationBar)
129+
.scrollDismissesKeyboard(.immediately)
130+
.toolbar {
131+
ToolbarItem(placement: .topBarTrailing) {
132+
// Creates new entity on tap, then sends user back to Today
133+
Button {
134+
self.actionOnSave()
135+
} label: {
136+
Text("Save")
137+
}
138+
.foregroundStyle(self.state.theme.tint)
138139
}
139-
.foregroundStyle(self.state.theme.tint)
140140
}
141-
}
142-
.sheet(isPresented: $isCompanySelectorPresented) {
143-
Widget.CompanySelector.Single(
144-
showing: $isCompanySelectorPresented,
145-
entity: $company
146-
)
147-
.presentationBackground(self.page.primaryColour)
148-
}
149-
.sheet(isPresented: $isProjectSelectorPresented) {
150-
if let corpo = self.company {
151-
Widget.ProjectSelector.Single(
152-
showing: $isProjectSelectorPresented,
153-
entity: $project,
154-
company: corpo
141+
.sheet(isPresented: $isCompanySelectorPresented) {
142+
Widget.CompanySelector.Single(
143+
showing: $isCompanySelectorPresented,
144+
entity: $company
155145
)
156146
.presentationBackground(self.page.primaryColour)
157-
} else {
158-
ErrorView.MissingCompany(isPresented: $isProjectSelectorPresented)
147+
}
148+
.sheet(isPresented: $isProjectSelectorPresented) {
149+
if let corpo = self.company {
150+
Widget.ProjectSelector.Single(
151+
showing: $isProjectSelectorPresented,
152+
entity: $project,
153+
company: corpo
154+
)
155+
.presentationBackground(self.page.primaryColour)
156+
} else {
157+
ErrorView.MissingCompany(isPresented: $isProjectSelectorPresented)
158+
}
159159
}
160160
}
161161
}
@@ -189,6 +189,8 @@ extension JobDetail {
189189
if let link = self.job!.uri {
190190
self.url = link.absoluteString
191191
}
192+
} else {
193+
self.created = self.state.date
192194
}
193195
}
194196

‎KlockWork-iOS/KlockWork-iOS/Entities/Detail/NoteDetail.swift

+1
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ extension NoteDetail {
314314
}
315315
} else {
316316
self.job = self.state.job
317+
self.postedDate = self.state.date
317318
}
318319
}
319320

‎KlockWork-iOS/KlockWork-iOS/Entities/Detail/PersonDetail.swift

+2
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ extension PersonDetail {
107107
if let nm = person.name {name = nm}
108108
if let ti = person.title {title = ti}
109109
if let co = person.company {company = co}
110+
} else {
111+
self.created = self.state.date
110112
}
111113
}
112114

‎KlockWork-iOS/KlockWork-iOS/Entities/Detail/ProjectDetail.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ struct ProjectDetail: View {
5454
isJobSelectorPresented: $isJobSelectorPresented
5555
)
5656
}
57-
.listRowBackground(Theme.textBackground)
5857

5958
Section("Settings") {
6059
Toggle("Published", isOn: $alive)
@@ -139,6 +138,8 @@ extension ProjectDetail {
139138
self.alive = project.alive
140139
self.pid = project.pid
141140
self.jobs = project.jobs?.allObjects as! [Job]
141+
} else {
142+
self.createdDate = self.state.date
142143
}
143144
}
144145

‎KlockWork-iOS/KlockWork-iOS/Entities/Detail/RecordDetail.swift

+6-13
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ struct RecordDetail: View {
1414
@State private var timestamp = Date()
1515
@State private var message: String = ""
1616
@State public var job: Job?
17-
@State private var alive: Bool = false
17+
@State private var alive: Bool = true
1818
@State private var isJobSelectorPresented: Bool = false
1919
@State private var isSaveAlertPresented: Bool = false
2020
@State private var isDeleteAlertPresented: Bool = false
@@ -28,19 +28,12 @@ struct RecordDetail: View {
2828
isJobSelectorPresented: $isJobSelectorPresented
2929
)
3030

31-
Section("Message") {
32-
TextField("Record content", text: $message, axis: .vertical)
33-
}
34-
.listRowBackground(Theme.textBackground)
35-
31+
TextField("Record content", text: $message, axis: .vertical)
32+
.lineLimit(5...10)
33+
.listRowBackground(Theme.textBackground)
34+
3635
Section("Settings") {
3736
Toggle("Published", isOn: $alive)
38-
DatePicker(
39-
"Created",
40-
selection: $timestamp,
41-
displayedComponents: [.date, .hourAndMinute]
42-
)
43-
// @TODO: implement JobPicker as a sheet
4437
}
4538
.listRowBackground(Theme.textBackground)
4639

@@ -121,7 +114,7 @@ extension RecordDetail {
121114
dismiss()
122115
}
123116

124-
/// Soft delete a Task
117+
/// Hard delete a Task
125118
/// - Returns: Void
126119
private func actionOnDelete() -> Void {
127120
if self.record != nil {

0 commit comments

Comments
 (0)