neon443/NearFuture
1
0
Fork 0
mirror of https://github.com/neon443/NearFuture.git synced 2026-03-11 22:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

semi rewrite

Browse Source 
fixed adding events
new icon
add archive view
fixed sync between contentView & archiveview
new help view
new eventlistview
new addeventbutton
fixed widgets
This commit is contained in:
neon443
2025-04-29 12:50:10 +01:00
parent 76a797fe8f
commit 08675b921a
37 changed files with 1165 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

219
NearFuture/EventListView.swift
View File

@@ -19,118 +19,149 @@ struct EventListView: View {
event: $event
)
} label: {
HStack {
RoundedRectangle(cornerRadius: 5)
.frame(width: 5)
.foregroundStyle(
event.color.color.opacity(
event.complete ? 0.5 : 1
)
)
.padding(.leading, -10)
.padding(.vertical, 5)
.animation(.spring, value: event.complete)
VStack(alignment: .leading) {
HStack {
Image(systemName: event.symbol)
.resizable()
.scaledToFit()
.frame(width: 20, height: 20)
.foregroundStyle(
event.color.color.opacity(
event.complete ? 0.5 : 1
)
)
.animation(.spring, value: event.complete)
Text("\(event.name)")
.font(.headline)
.strikethrough(event.complete)
.animation(.spring, value: event.complete)
}
if !event.notes.isEmpty {
Text(event.notes)
.font(.subheadline)
.foregroundColor(.gray)
}
Text(
event.date.formatted(
date: .long,
time: event.time ? .standard : .omitted
)
)
.font(.subheadline)
.foregroundStyle(
event.color.color.opacity(
event.complete ? 0.5 : 1
)
)
.animation(.spring, value: event.complete)
if event.recurrence != .none {
Text("Recurs \(event.recurrence.rawValue)")
.font(.subheadline)
.foregroundStyle(
.primary.opacity(
event.complete ? 0.5 : 1
)
)
.animation(.spring, value: event.complete)
}
}
Spacer()
VStack {
Text("\(daysUntilEvent(event.date, short: false))")
.font(.subheadline)
ZStack {
HStack {
RoundedRectangle(cornerRadius: 5)
.frame(width: 7)
.foregroundStyle(
event.color.color.opacity(
event.complete ? 0.5 : 1
)
)
.animation(.spring, value: event.complete)
}
Button() {
withAnimation(.spring) {
event.complete.toggle()
VStack(alignment: .leading) {
HStack {
Image(systemName: event.symbol)
.resizable()
.scaledToFit()
.frame(width: 20, height: 20)
.shadow(radius: 5)
.foregroundStyle(
.one.opacity(
event.complete ? 0.5 : 1
)
)
Text("\(event.name)")
.font(.headline)
.foregroundStyle(.one)
.strikethrough(event.complete)
}
if !event.notes.isEmpty {
Text(event.notes)
.font(.subheadline)
.foregroundStyle(.one.opacity(0.8))
}
Text(
event.date.formatted(
date: .long,
time: event.time ? .shortened : .omitted
)
)
.font(.subheadline)
.foregroundStyle(
.one.opacity(
event.complete ? 0.5 : 1
)
)
if event.recurrence != .none {
Text("Occurs \(event.recurrence.rawValue)")
.font(.subheadline)
.foregroundStyle(
.one.opacity(event.complete ? 0.5 : 1))
}
}
Spacer()
VStack {
Text("\(daysUntilEvent(event.date, short: false))")
.font(.subheadline)
.foregroundStyle(.one)
}
Button() {
withAnimation {
event.complete.toggle()
}
let eventToModify = viewModel.events.firstIndex() { currEvent in
currEvent.id == event.id
}
if let eventToModify = eventToModify {
viewModel.events[eventToModify] = event
viewModel.saveEvents()
}
} label: {
if event.complete {
ZStack {
Circle()
.foregroundStyle(.green)
Image(systemName: "checkmark")
.resizable()
.foregroundStyle(.white)
.scaledToFit()
.bold()
.frame(width: 15)
}
} else {
Image(systemName: "circle")
.resizable()
.scaledToFit()
.foregroundStyle(event.color.color)
}
}
.buttonStyle(.borderless)
.frame(maxWidth: 25, maxHeight: 25)
.shadow(radius: 5)
.padding(.trailing, 5)
}
.padding(.vertical, 5)
.background(.ultraThinMaterial)
.overlay(
RoundedRectangle(cornerRadius: 10)
.stroke(
.one.opacity(appearance == .dark ? 0.5 : 1),
lineWidth: 1
)
)
.clipShape(
RoundedRectangle(cornerRadius: 10)
)
.fixedSize(horizontal: false, vertical: true)
}
.contextMenu() {
Button(role: .destructive) {
let eventToModify = viewModel.events.firstIndex() { currEvent in
currEvent.id == event.id
}
if let eventToModify = eventToModify {
viewModel.events[eventToModify] = event
viewModel.events.remove(at: eventToModify)
viewModel.saveEvents()
viewModel.loadEvents()
}
} label: {
if event.complete {
ZStack {
Circle()
.foregroundStyle(.green)
Image(systemName: "checkmark")
.resizable()
.foregroundStyle(.white)
.scaledToFit()
.frame(width: 15)
}
} else {
Image(systemName: "circle")
.resizable()
.scaledToFit()
.foregroundStyle(event.color.color)
}
Label("Delete", systemImage: "trash")
}
.buttonStyle(.borderless)
.frame(maxWidth: 25, maxHeight: 25)
.animation(.spring, value: event.complete)
}
}
}
}
#Preview("EventListView") {
EventListView(
viewModel: EventViewModel(),
event:
EventViewModel().example
)
let vm = dummyEventViewModel()
ZStack {
Color.black
VStack {
ForEach(0..<50) { _ in
Rectangle()
.foregroundStyle(randomColor().opacity(0.5))
.padding(-10)
}
.ignoresSafeArea(.all)
.blur(radius: 5)
}
VStack {
ForEach(vm.events) { event in
EventListView(
viewModel: vm,
event: event
)
}
}
.padding(.horizontal, 10)
}
}