mirror of
https://github.com/neon443/NearFuture.git
synced 2026-03-11 14:56:15 +00:00
cleanup
This commit is contained in:
@@ -18,7 +18,6 @@ struct AddEventView: View {
|
|||||||
@Binding var eventColor: Color
|
@Binding var eventColor: Color
|
||||||
@Binding var eventNotes: String
|
@Binding var eventNotes: String
|
||||||
@Binding var eventDate: Date
|
@Binding var eventDate: Date
|
||||||
@Binding var eventTime: Bool
|
|
||||||
@Binding var eventRecurrence: Event.RecurrenceType
|
@Binding var eventRecurrence: Event.RecurrenceType
|
||||||
|
|
||||||
@State var adding: Bool
|
@State var adding: Bool
|
||||||
@@ -108,14 +107,11 @@ struct AddEventView: View {
|
|||||||
.frame(width: 20)
|
.frame(width: 20)
|
||||||
}
|
}
|
||||||
|
|
||||||
Toggle("Schedule a Time", isOn: $eventTime)
|
|
||||||
if eventTime {
|
|
||||||
DatePicker(
|
DatePicker(
|
||||||
"",
|
"",
|
||||||
selection: $eventDate,
|
selection: $eventDate,
|
||||||
displayedComponents: .hourAndMinute
|
displayedComponents: .hourAndMinute
|
||||||
)
|
)
|
||||||
}
|
|
||||||
|
|
||||||
// re-ocurrence Picker
|
// re-ocurrence Picker
|
||||||
Picker("Recurrence", selection: $eventRecurrence) {
|
Picker("Recurrence", selection: $eventRecurrence) {
|
||||||
@@ -162,7 +158,6 @@ struct AddEventView: View {
|
|||||||
color: ColorCodable(eventColor),
|
color: ColorCodable(eventColor),
|
||||||
notes: eventNotes,
|
notes: eventNotes,
|
||||||
date: eventDate,
|
date: eventDate,
|
||||||
time: eventTime,
|
|
||||||
recurrence: eventRecurrence
|
recurrence: eventRecurrence
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -208,7 +203,6 @@ struct AddEventView: View {
|
|||||||
eventColor = randomColor()
|
eventColor = randomColor()
|
||||||
eventNotes = viewModel.template.notes
|
eventNotes = viewModel.template.notes
|
||||||
eventDate = viewModel.template.date
|
eventDate = viewModel.template.date
|
||||||
eventTime = viewModel.template.time
|
|
||||||
eventRecurrence = viewModel.template.recurrence
|
eventRecurrence = viewModel.template.recurrence
|
||||||
dismiss()
|
dismiss()
|
||||||
}
|
}
|
||||||
@@ -249,7 +243,6 @@ struct MagicClearButton: View {
|
|||||||
eventColor: .constant(vm.template.color.color),
|
eventColor: .constant(vm.template.color.color),
|
||||||
eventNotes: .constant(vm.template.notes),
|
eventNotes: .constant(vm.template.notes),
|
||||||
eventDate: .constant(vm.template.date),
|
eventDate: .constant(vm.template.date),
|
||||||
eventTime: .constant(vm.template.time),
|
|
||||||
eventRecurrence: .constant(vm.template.recurrence),
|
eventRecurrence: .constant(vm.template.recurrence),
|
||||||
adding: true
|
adding: true
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ struct ArchiveView: View {
|
|||||||
eventColor: $viewModel.editableTemplate.color.colorBind,
|
eventColor: $viewModel.editableTemplate.color.colorBind,
|
||||||
eventNotes: $viewModel.editableTemplate.notes,
|
eventNotes: $viewModel.editableTemplate.notes,
|
||||||
eventDate: $viewModel.editableTemplate.date,
|
eventDate: $viewModel.editableTemplate.date,
|
||||||
eventTime: $viewModel.editableTemplate.time,
|
|
||||||
eventRecurrence: $viewModel.editableTemplate.recurrence,
|
eventRecurrence: $viewModel.editableTemplate.recurrence,
|
||||||
adding: true
|
adding: true
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ struct ContentView: View {
|
|||||||
@State private var eventColor: Color = randomColor()
|
@State private var eventColor: Color = randomColor()
|
||||||
@State private var eventNotes = ""
|
@State private var eventNotes = ""
|
||||||
@State private var eventDate = Date()
|
@State private var eventDate = Date()
|
||||||
@State private var eventTime = false
|
|
||||||
@State private var eventRecurrence: Event.RecurrenceType = .none
|
@State private var eventRecurrence: Event.RecurrenceType = .none
|
||||||
@State var hey: UUID = UUID()
|
@State var hey: UUID = UUID()
|
||||||
@State private var showingAddEventView = false
|
@State private var showingAddEventView = false
|
||||||
@@ -105,7 +104,6 @@ struct ContentView: View {
|
|||||||
eventColor: $eventColor,
|
eventColor: $eventColor,
|
||||||
eventNotes: $eventNotes,
|
eventNotes: $eventNotes,
|
||||||
eventDate: $eventDate,
|
eventDate: $eventDate,
|
||||||
eventTime: $eventTime,
|
|
||||||
eventRecurrence: $eventRecurrence,
|
eventRecurrence: $eventRecurrence,
|
||||||
adding: true //adding event
|
adding: true //adding event
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ struct EditEventView: View {
|
|||||||
eventColor: $event.color.colorBind,
|
eventColor: $event.color.colorBind,
|
||||||
eventNotes: $event.notes,
|
eventNotes: $event.notes,
|
||||||
eventDate: $event.date,
|
eventDate: $event.date,
|
||||||
eventTime: $event.time,
|
|
||||||
eventRecurrence: $event.recurrence,
|
eventRecurrence: $event.recurrence,
|
||||||
adding: false //bc we editing existing event
|
adding: false //bc we editing existing event
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ struct EventListView: View {
|
|||||||
Text(
|
Text(
|
||||||
event.date.formatted(
|
event.date.formatted(
|
||||||
date: .long,
|
date: .long,
|
||||||
time: event.time ? .shortened : .omitted
|
time: .shortened
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.font(.subheadline)
|
.font(.subheadline)
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ struct Event: Identifiable, Codable {
|
|||||||
var color: ColorCodable
|
var color: ColorCodable
|
||||||
var notes: String
|
var notes: String
|
||||||
var date: Date
|
var date: Date
|
||||||
var time: Bool
|
|
||||||
var recurrence: RecurrenceType
|
var recurrence: RecurrenceType
|
||||||
|
|
||||||
enum RecurrenceType: String, Codable, CaseIterable {
|
enum RecurrenceType: String, Codable, CaseIterable {
|
||||||
@@ -157,20 +156,9 @@ class EventViewModel: ObservableObject {
|
|||||||
color: ColorCodable(randomColor()),
|
color: ColorCodable(randomColor()),
|
||||||
notes: "",
|
notes: "",
|
||||||
date: Date(),
|
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
|
recurrence: .none
|
||||||
)
|
)
|
||||||
|
@Published var editableTemplate: Event
|
||||||
@Published var example: Event = Event(
|
@Published var example: Event = Event(
|
||||||
name: "event",
|
name: "event",
|
||||||
complete: false,
|
complete: false,
|
||||||
@@ -179,7 +167,6 @@ class EventViewModel: ObservableObject {
|
|||||||
color: ColorCodable(.orange),
|
color: ColorCodable(.orange),
|
||||||
notes: "lksdjfakdflkasjlkjl",
|
notes: "lksdjfakdflkasjlkjl",
|
||||||
date: Date(),
|
date: Date(),
|
||||||
time: true,
|
|
||||||
recurrence: .daily
|
recurrence: .daily
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -189,6 +176,7 @@ class EventViewModel: ObservableObject {
|
|||||||
@Published var syncStatus: String = "Not Synced"
|
@Published var syncStatus: String = "Not Synced"
|
||||||
|
|
||||||
init(load: Bool = true) {
|
init(load: Bool = true) {
|
||||||
|
self.editableTemplate = template
|
||||||
if load {
|
if load {
|
||||||
loadEvents()
|
loadEvents()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user