From c141f49f13a601518f0f53e9d575e29b7f6e2f27 Mon Sep 17 00:00:00 2001 From: Ryan Priebe Date: Sun, 30 Jun 2024 20:52:05 -0600 Subject: [PATCH 1/3] minor UI tweaks --- KlockWork-iOS/KlockWork-iOS/Entities/Companies.swift | 5 ++--- .../KlockWork-iOS/Entities/Detail/CompanyDetail.swift | 2 +- KlockWork-iOS/KlockWork-iOS/SharedViews/RowAddButton.swift | 6 +++--- KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift | 3 ++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/KlockWork-iOS/KlockWork-iOS/Entities/Companies.swift b/KlockWork-iOS/KlockWork-iOS/Entities/Companies.swift index 632011d..bb09e07 100644 --- a/KlockWork-iOS/KlockWork-iOS/Entities/Companies.swift +++ b/KlockWork-iOS/KlockWork-iOS/Entities/Companies.swift @@ -11,10 +11,9 @@ import SwiftUI struct Companies: View { typealias EntityType = PageConfiguration.EntityType + @EnvironmentObject private var state: AppState private let entityType: EntityType = .companies @State public var items: [Company] = [] - - @Environment(\.managedObjectContext) var moc var body: some View { NavigationStack { @@ -47,7 +46,7 @@ struct Companies: View { } .onAppear(perform: { - items = CoreDataCompanies(moc: moc).alive() + items = CoreDataCompanies(moc: self.state.moc).alive() }) .scrollContentBackground(.hidden) .background(Theme.cGreen) diff --git a/KlockWork-iOS/KlockWork-iOS/Entities/Detail/CompanyDetail.swift b/KlockWork-iOS/KlockWork-iOS/Entities/Detail/CompanyDetail.swift index c47602c..2ec023b 100644 --- a/KlockWork-iOS/KlockWork-iOS/Entities/Detail/CompanyDetail.swift +++ b/KlockWork-iOS/KlockWork-iOS/Entities/Detail/CompanyDetail.swift @@ -18,7 +18,7 @@ struct CompanyDetail: View { @State private var createdDate: Date = Date() @State private var lastUpdate: Date = Date() @State private var name: String = "" - @State private var pid: Int64 = 0 + @State private var pid: Int64 = Int64.random(in: 99999...99999999) @State private var abbreviation: String = "" @State private var hidden: Bool = false @State private var colour: Color = .clear diff --git a/KlockWork-iOS/KlockWork-iOS/SharedViews/RowAddButton.swift b/KlockWork-iOS/KlockWork-iOS/SharedViews/RowAddButton.swift index f51c1f8..1da4c89 100644 --- a/KlockWork-iOS/KlockWork-iOS/SharedViews/RowAddButton.swift +++ b/KlockWork-iOS/KlockWork-iOS/SharedViews/RowAddButton.swift @@ -21,12 +21,12 @@ struct RowAddButton: View { ZStack(alignment: .center) { RadialGradient(colors: [Theme.base, .clear], center: .center, startRadius: 0, endRadius: 40) .blendMode(.softLight) - .opacity(0.6) + .opacity(0.8) Text(self.title) .font(.caption) .padding(6) .padding([.leading, .trailing], 8) - .background(self.isPresented ? .orange : .white.opacity(0.4)) + .background(self.isPresented ? .orange : .white) .foregroundStyle(Theme.base) .clipShape(.capsule(style: .continuous)) } @@ -46,7 +46,7 @@ struct RowAddNavLink: View { ZStack(alignment: .center) { RadialGradient(colors: [Theme.base, .clear], center: .center, startRadius: 0, endRadius: 40) .blendMode(.softLight) - .opacity(0.6) + .opacity(0.8) Text(self.title) .font(.caption) .padding(6) diff --git a/KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift b/KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift index 4419e25..5f128f4 100644 --- a/KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift +++ b/KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift @@ -275,6 +275,7 @@ extension Tabs.Content { } struct HierarchyExplorer: View { + @EnvironmentObject private var state: AppState public var inSheet: Bool public var page: PageConfiguration.AppPage = .today @FetchRequest private var items: FetchedResults @@ -283,7 +284,7 @@ extension Tabs.Content { ScrollView { VStack(alignment: .leading, spacing: 0) { if self.items.count > 0 { - ForEach(self.items.filter({$0.alive == true})) { item in + ForEach(items) { item in TopLevel(entity: item) } } else { From c8a70149b61d4dd64bbd155766acd5f5a62c6d91 Mon Sep 17 00:00:00 2001 From: Ryan Priebe Date: Sun, 30 Jun 2024 20:55:38 -0600 Subject: [PATCH 2/3] hide this button for now --- KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift b/KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift index 5f128f4..84d2d9b 100644 --- a/KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift +++ b/KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift @@ -1104,12 +1104,13 @@ extension Tabs.Content { .opacity(0.7) .padding(.leading, 8) Spacer() - RowAddNavLink( - title: "+ Person", - target: AnyView( - PersonDetail(company: self.entity) - ) - ) + // @TODO: uncomment after we list out people under projects +// RowAddNavLink( +// title: "+ Person", +// target: AnyView( +// PersonDetail(company: self.entity) +// ) +// ) RowAddNavLink( title: "+ Project", target: AnyView( From 3665ad9dd16067b026e10664d08dcc667b4f8469 Mon Sep 17 00:00:00 2001 From: Ryan Priebe Date: Sun, 30 Jun 2024 20:56:34 -0600 Subject: [PATCH 3/3] bump --- KlockWork-iOS/KlockWork-iOS.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/KlockWork-iOS/KlockWork-iOS.xcodeproj/project.pbxproj b/KlockWork-iOS/KlockWork-iOS.xcodeproj/project.pbxproj index 34ccb61..44072be 100644 --- a/KlockWork-iOS/KlockWork-iOS.xcodeproj/project.pbxproj +++ b/KlockWork-iOS/KlockWork-iOS.xcodeproj/project.pbxproj @@ -805,7 +805,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "KlockWork-iOS/KlockWork_iOS.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 13; + CURRENT_PROJECT_VERSION = 14; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"KlockWork-iOS/Preview Content\""; DEVELOPMENT_TEAM = 6DT7L2N5X6; @@ -847,7 +847,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "KlockWork-iOS/KlockWork_iOS.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 13; + CURRENT_PROJECT_VERSION = 14; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"KlockWork-iOS/Preview Content\""; DEVELOPMENT_TEAM = 6DT7L2N5X6;