Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: a few small UI/UX issues #277

Merged
merged 4 commits into from
Oct 7, 2024
Merged

Bugfix: a few small UI/UX issues #277

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d06989
fixes bug preventing escape key from closing inspector
aapis Oct 7, 2024
c9d7e8a
a little bit of refactoring, removed unused code
aapis Oct 7, 2024
ccb39c1
inspector background colour changed to fit current page style better
aapis Oct 7, 2024
1ab2c68
a bit more refactoring
aapis Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
206 changes: 38 additions & 168 deletions KlockWork/Views/Home/Home.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ struct Home: View {
}
}
}
.onAppear(perform: self.onAppear)
}

@ViewBuilder var Sidebar: some View {
Expand Down Expand Up @@ -210,7 +211,7 @@ struct Home: View {
.opacity(0.25)
.frame(width: 20)

Theme.subHeaderColour
self.nav.parent?.appPage.primaryColour.opacity(0.2) ?? Theme.subHeaderColour

nav.inspector

Expand All @@ -223,38 +224,38 @@ struct Home: View {
}
} else {
VStack {
// if nav.history.recent.count > 0 {
// HStack {
// Button {
// if let previous = nav.history.previous() {
// nav.to(previous.page)
// }
// } label: {
// HStack(spacing: 5) {
// Image(systemName: "arrow.left")
// Text("Back")
// }
// }
// .buttonStyle(.plain)
// .background(Theme.subHeaderColour)
//
// Spacer()
// Button {
// if let next = nav.history.next() {
// nav.to(next.page)
// }
// } label: {
// HStack(spacing: 5) {
// Text("Next")
// Image(systemName: "arrow.right")
// }
// }
// .buttonStyle(.plain)
// .background(Theme.subHeaderColour)
// }
// .background(Theme.base)
// .frame(height: 70)
// }
// if nav.history.recent.count > 0 {
// HStack {
// Button {
// if let previous = nav.history.previous() {
// nav.to(previous.page)
// }
// } label: {
// HStack(spacing: 5) {
// Image(systemName: "arrow.left")
// Text("Back")
// }
// }
// .buttonStyle(.plain)
// .background(Theme.subHeaderColour)
//
// Spacer()
// Button {
// if let next = nav.history.next() {
// nav.to(next.page)
// }
// } label: {
// HStack(spacing: 5) {
// Text("Next")
// Image(systemName: "arrow.right")
// }
// }
// .buttonStyle(.plain)
// .background(Theme.subHeaderColour)
// }
// .background(Theme.base)
// .frame(height: 70)
// }

ZStack {
nav.view
Expand All @@ -265,140 +266,9 @@ struct Home: View {
}
}
}
}

var body2: some View {
VStack(alignment: .leading) {
HStack(alignment: .top, spacing: 0) {
VStack(alignment: .leading) {
ZStack(alignment: .topTrailing) {
Theme.toolbarColour
LinearGradient(gradient: Gradient(colors: [Color.black, Theme.toolbarColour]), startPoint: .topTrailing, endPoint: .topLeading)
.opacity(0.25)

VStack(alignment: .trailing, spacing: 5) {
FancyDivider()
ForEach(buttons[.views]!) { button in button.environmentObject(nav) }

FancyDivider()
ForEach(buttons[.entities]!) { button in button.environmentObject(nav) }
}
}
}
.frame(width: 100)

HStack(alignment: .top, spacing: 0) {
if nav.sidebar != nil {
VStack(alignment: .leading, spacing: 0) {
GlobalSidebarWidgets()

if !isSearchStackShowing && !isUpcomingTaskStackShowing {
if isDatePickerPresented {
ZStack {
nav.sidebar
Color.black.opacity(0.7)
}
} else {
nav.sidebar
}
}
}
.frame(width: 320)
.background(nav.parent != nil ? nav.parent!.colour : Theme.tabActiveColour)
} else {
HorizontalSeparator // TODO: maybe remove?
}

if nav.inspector != nil {
ZStack(alignment: .topLeading) {
nav.view
.navigationTitle(nav.pageTitle())
.disabled(isDatePickerPresented)
Color.black.opacity(0.7)

ZStack(alignment: .topLeading) {
LinearGradient(gradient: Gradient(colors: [Color.clear, Color.black]), startPoint: .topTrailing, endPoint: .topLeading)
.opacity(0.25)
.frame(width: 20)

Theme.subHeaderColour

nav.inspector

if isDatePickerPresented {
Color.black.opacity(0.7)
}
}
.background(Theme.base)
.frame(width: 340)
}
} else {
VStack {
// if nav.history.recent.count > 0 {
// HStack {
// Button {
// if let previous = nav.history.previous() {
// nav.to(previous.page)
// }
// } label: {
// HStack(spacing: 5) {
// Image(systemName: "arrow.left")
// Text("Back")
// }
// }
// .buttonStyle(.plain)
// .background(Theme.subHeaderColour)
//
// Spacer()
// Button {
// if let next = nav.history.next() {
// nav.to(next.page)
// }
// } label: {
// HStack(spacing: 5) {
// Text("Next")
// Image(systemName: "arrow.right")
// }
// }
// .buttonStyle(.plain)
// .background(Theme.subHeaderColour)
// }
// .background(Theme.base)
// .frame(height: 70)
// }

ZStack {
nav.view
.navigationTitle(nav.pageTitle())
.disabled(isDatePickerPresented)
(isDatePickerPresented ? Color.black.opacity(0.7) : .clear)
}
}
}

if showSessionInspector {
SessionInspector()
}
}
}
}
.background(Theme.base)
.onAppear(perform: onAppear)
.onChange(of: nav.parent!) { buttonToHighlight in
selectedSidebarButton = buttonToHighlight
}
.onChange(of: nav.session.eventStatus) { status in

}
}

var HorizontalSeparator: some View {
// TODO: make draggable
ZStack {
Theme.headerColour
}
.frame(width: 3)
}

extension Home {
private func onAppear() -> Void {
nav.parent = selectedSidebarButton
checkForEvents()
Expand Down Expand Up @@ -429,8 +299,8 @@ struct Home: View {
nav.session.eventStatus = updateIndicator()
}
}
/// Updates the dashboard icon upcoming event indicator

/// Updates the dashboard icon upcoming event indicator
/// - Returns: EventIndicatorStatus
private func updateIndicator() -> EventIndicatorStatus {
let ce = CoreDataCalendarEvent(moc: moc)
Expand Down