From 3450e8bf1c723060d7e4fa6a203be4dcaf6c4b04 Mon Sep 17 00:00:00 2001
From: neon443 <69979447+neon443@users.noreply.github.com>
Date: Thu, 1 May 2025 21:23:14 +0100
Subject: [PATCH] cleanup

---
 NearFuture/AddEventView.swift  |  7 -------
 NearFuture/ArchiveView.swift   |  1 -
 NearFuture/ContentView.swift   |  2 --
 NearFuture/EditEventView.swift |  1 -
 NearFuture/EventListView.swift |  2 +-
 NearFuture/Item.swift          | 16 ++--------------
 6 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/NearFuture/AddEventView.swift b/NearFuture/AddEventView.swift
index a0bfbe4..bb7dae8 100644
--- a/NearFuture/AddEventView.swift
+++ b/NearFuture/AddEventView.swift
@@ -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
 			)
diff --git a/NearFuture/ArchiveView.swift b/NearFuture/ArchiveView.swift
index e26aaa4..6a30b3f 100644
--- a/NearFuture/ArchiveView.swift
+++ b/NearFuture/ArchiveView.swift
@@ -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
 			)
diff --git a/NearFuture/ContentView.swift b/NearFuture/ContentView.swift
index d918166..1c1fb93 100644
--- a/NearFuture/ContentView.swift
+++ b/NearFuture/ContentView.swift
@@ -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
 						)
diff --git a/NearFuture/EditEventView.swift b/NearFuture/EditEventView.swift
index 3263c90..07be060 100644
--- a/NearFuture/EditEventView.swift
+++ b/NearFuture/EditEventView.swift
@@ -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
 		)
diff --git a/NearFuture/EventListView.swift b/NearFuture/EventListView.swift
index 3ae31d2..3695f04 100644
--- a/NearFuture/EventListView.swift
+++ b/NearFuture/EventListView.swift
@@ -53,7 +53,7 @@ struct EventListView: View {
 						Text(
 							event.date.formatted(
 								date: .long,
-								time: event.time ? .shortened : .omitted
+								time: .shortened
 							)
 						)
 						.font(.subheadline)
diff --git a/NearFuture/Item.swift b/NearFuture/Item.swift
index 1cc69df..34af1d3 100644
--- a/NearFuture/Item.swift
+++ b/NearFuture/Item.swift
@@ -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()
 		}