This commit is contained in:
neon443
2025-05-01 21:23:14 +01:00
parent a08642bcb5
commit 3450e8bf1c
6 changed files with 3 additions and 26 deletions

View File

@@ -18,7 +18,6 @@ struct AddEventView: View {
@Binding var eventColor: Color
@Binding var eventNotes: String
@Binding var eventDate: Date
@Binding var eventTime: Bool
@Binding var eventRecurrence: Event.RecurrenceType
@State var adding: Bool
@@ -108,14 +107,11 @@ struct AddEventView: View {
.frame(width: 20)
}
Toggle("Schedule a Time", isOn: $eventTime)
if eventTime {
DatePicker(
"",
selection: $eventDate,
displayedComponents: .hourAndMinute
)
}
// re-ocurrence Picker
Picker("Recurrence", selection: $eventRecurrence) {
@@ -162,7 +158,6 @@ struct AddEventView: View {
color: ColorCodable(eventColor),
notes: eventNotes,
date: eventDate,
time: eventTime,
recurrence: eventRecurrence
)
)
@@ -208,7 +203,6 @@ struct AddEventView: View {
eventColor = randomColor()
eventNotes = viewModel.template.notes
eventDate = viewModel.template.date
eventTime = viewModel.template.time
eventRecurrence = viewModel.template.recurrence
dismiss()
}
@@ -249,7 +243,6 @@ struct MagicClearButton: View {
eventColor: .constant(vm.template.color.color),
eventNotes: .constant(vm.template.notes),
eventDate: .constant(vm.template.date),
eventTime: .constant(vm.template.time),
eventRecurrence: .constant(vm.template.recurrence),
adding: true
)

View File

@@ -47,7 +47,6 @@ struct ArchiveView: View {
eventColor: $viewModel.editableTemplate.color.colorBind,
eventNotes: $viewModel.editableTemplate.notes,
eventDate: $viewModel.editableTemplate.date,
eventTime: $viewModel.editableTemplate.time,
eventRecurrence: $viewModel.editableTemplate.recurrence,
adding: true
)

View File

@@ -28,7 +28,6 @@ struct ContentView: View {
@State private var eventColor: Color = randomColor()
@State private var eventNotes = ""
@State private var eventDate = Date()
@State private var eventTime = false
@State private var eventRecurrence: Event.RecurrenceType = .none
@State var hey: UUID = UUID()
@State private var showingAddEventView = false
@@ -105,7 +104,6 @@ struct ContentView: View {
eventColor: $eventColor,
eventNotes: $eventNotes,
eventDate: $eventDate,
eventTime: $eventTime,
eventRecurrence: $eventRecurrence,
adding: true //adding event
)

View File

@@ -35,7 +35,6 @@ struct EditEventView: View {
eventColor: $event.color.colorBind,
eventNotes: $event.notes,
eventDate: $event.date,
eventTime: $event.time,
eventRecurrence: $event.recurrence,
adding: false //bc we editing existing event
)

View File

@@ -53,7 +53,7 @@ struct EventListView: View {
Text(
event.date.formatted(
date: .long,
time: event.time ? .shortened : .omitted
time: .shortened
)
)
.font(.subheadline)

View File

@@ -28,7 +28,6 @@ struct Event: Identifiable, Codable {
var color: ColorCodable
var notes: String
var date: Date
var time: Bool
var recurrence: RecurrenceType
enum RecurrenceType: String, Codable, CaseIterable {
@@ -157,20 +156,9 @@ class EventViewModel: ObservableObject {
color: ColorCodable(randomColor()),
notes: "",
date: Date(),
time: false,
recurrence: .none
)
@Published var editableTemplate: Event = Event(
name: "",
complete: false,
completeDesc: "",
symbol: "star",
color: ColorCodable(randomColor()),
notes: "",
date: Date(),
time: false,
recurrence: .none
)
@Published var editableTemplate: Event
@Published var example: Event = Event(
name: "event",
complete: false,
@@ -179,7 +167,6 @@ class EventViewModel: ObservableObject {
color: ColorCodable(.orange),
notes: "lksdjfakdflkasjlkjl",
date: Date(),
time: true,
recurrence: .daily
)
@@ -189,6 +176,7 @@ class EventViewModel: ObservableObject {
@Published var syncStatus: String = "Not Synced"
init(load: Bool = true) {
self.editableTemplate = template
if load {
loadEvents()
}