reset date button, simplified addEvent(), refactored EventListView, reindenting

This commit is contained in:
neon443
2025-04-18 16:14:38 +05:30
parent 88bb9dfaab
commit 0e1ad52f89
9 changed files with 285 additions and 351 deletions

View File

@@ -25,6 +25,7 @@
A979F6142D270AF90094C0B3 /* NearFutureWidgetsExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = A979F6022D270AF00094C0B3 /* NearFutureWidgetsExtension.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; A979F6142D270AF90094C0B3 /* NearFutureWidgetsExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = A979F6022D270AF00094C0B3 /* NearFutureWidgetsExtension.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
A979F6182D2714310094C0B3 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C28B2D24011400E4F9B1 /* Item.swift */; }; A979F6182D2714310094C0B3 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C28B2D24011400E4F9B1 /* Item.swift */; };
A985104E2DB256430013D5FF /* iCloudSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A985104D2DB256430013D5FF /* iCloudSettingsView.swift */; }; A985104E2DB256430013D5FF /* iCloudSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A985104D2DB256430013D5FF /* iCloudSettingsView.swift */; };
A98510502DB263F00013D5FF /* EventListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A985104F2DB263F00013D5FF /* EventListView.swift */; };
A9FC7EEA2D2823920020D75B /* NearFutureWidgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */; }; A9FC7EEA2D2823920020D75B /* NearFutureWidgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@@ -87,6 +88,7 @@
A980FC302D920097006A778F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; A980FC302D920097006A778F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A980FC372D93FB2B006A778F /* NearFutureTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NearFutureTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A980FC372D93FB2B006A778F /* NearFutureTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NearFutureTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
A985104D2DB256430013D5FF /* iCloudSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iCloudSettingsView.swift; sourceTree = "<group>"; }; A985104D2DB256430013D5FF /* iCloudSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iCloudSettingsView.swift; sourceTree = "<group>"; };
A985104F2DB263F00013D5FF /* EventListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventListView.swift; sourceTree = "<group>"; };
A9C05E412D2805D7007DC497 /* NearFutureWidgetsExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NearFutureWidgetsExtension.entitlements; sourceTree = "<group>"; }; A9C05E412D2805D7007DC497 /* NearFutureWidgetsExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NearFutureWidgetsExtension.entitlements; sourceTree = "<group>"; };
A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgets.swift; sourceTree = "<group>"; }; A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgets.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
@@ -150,6 +152,7 @@
A979F57E2D26B1300094C0B3 /* EditEventView.swift */, A979F57E2D26B1300094C0B3 /* EditEventView.swift */,
A920C2B72D2401A300E4F9B1 /* AddEventView.swift */, A920C2B72D2401A300E4F9B1 /* AddEventView.swift */,
A920C2C02D2403CA00E4F9B1 /* ContentView.swift */, A920C2C02D2403CA00E4F9B1 /* ContentView.swift */,
A985104F2DB263F00013D5FF /* EventListView.swift */,
A93BC0932D2B18A3002E8BBD /* StatsView.swift */, A93BC0932D2B18A3002E8BBD /* StatsView.swift */,
A920C2B42D2401A100E4F9B1 /* SettingsView.swift */, A920C2B42D2401A100E4F9B1 /* SettingsView.swift */,
A985104D2DB256430013D5FF /* iCloudSettingsView.swift */, A985104D2DB256430013D5FF /* iCloudSettingsView.swift */,
@@ -350,6 +353,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
A920C2BB2D2401A400E4F9B1 /* AddEventView.swift in Sources */, A920C2BB2D2401A400E4F9B1 /* AddEventView.swift in Sources */,
A98510502DB263F00013D5FF /* EventListView.swift in Sources */,
A920C2C12D2403CA00E4F9B1 /* ContentView.swift in Sources */, A920C2C12D2403CA00E4F9B1 /* ContentView.swift in Sources */,
A920C2B82D2401A300E4F9B1 /* SettingsView.swift in Sources */, A920C2B82D2401A300E4F9B1 /* SettingsView.swift in Sources */,
A920C28C2D24011400E4F9B1 /* Item.swift in Sources */, A920C28C2D24011400E4F9B1 /* Item.swift in Sources */,

View File

@@ -16,7 +16,7 @@ struct AddEventView: View {
@Binding var eventCompleteDesc: String @Binding var eventCompleteDesc: String
@Binding var eventSymbol: String @Binding var eventSymbol: String
@Binding var eventColor: Color @Binding var eventColor: Color
@Binding var eventDescription: String @Binding var eventNotes: String
@Binding var eventDate: Date @Binding var eventDate: Date
@Binding var eventTime: Bool @Binding var eventTime: Bool
@Binding var eventRecurrence: Event.RecurrenceType @Binding var eventRecurrence: Event.RecurrenceType
@@ -79,22 +79,33 @@ struct AddEventView: View {
// dscription // dscription
ZStack { ZStack {
TextField("Event Description", text: $eventDescription) TextField("Event Description", text: $eventNotes)
.textFieldStyle(RoundedBorderTextFieldStyle()) .textFieldStyle(RoundedBorderTextFieldStyle())
.padding(.trailing, eventDescription.isEmpty ? 0 : 30) .padding(.trailing, eventNotes.isEmpty ? 0 : 30)
.animation(.spring, value: eventDescription) .animation(.spring, value: eventNotes)
.focused($focusedField, equals: Field.Description) .focused($focusedField, equals: Field.Description)
.submitLabel(.done) .submitLabel(.done)
.onSubmit { .onSubmit {
focusedField = nil focusedField = nil
} }
MagicClearButton(text: $eventDescription) MagicClearButton(text: $eventNotes)
} }
// date picker // date picker
DatePicker("", selection: $eventDate, displayedComponents: .date) HStack {
.datePickerStyle(WheelDatePickerStyle()) DatePicker("", selection: $eventDate, displayedComponents: .date)
.datePickerStyle(WheelDatePickerStyle())
Button() {
eventDate = Date()
} label: {
Image(systemName: "arrow.uturn.left")
.resizable()
.scaledToFit()
}
.buttonStyle(BorderlessButtonStyle())
.frame(width: 20)
}
Toggle("Schedule a Time", isOn: $eventTime) Toggle("Schedule a Time", isOn: $eventTime)
if eventTime { if eventTime {
@@ -124,15 +135,17 @@ struct AddEventView: View {
if adding { if adding {
Button { Button {
viewModel.addEvent( viewModel.addEvent(
name: eventName, newEvent: Event(
complete: eventComplete, name: eventName,
completedDesc: eventCompleteDesc, complete: eventComplete,
symbol: eventSymbol, completeDesc: eventCompleteDesc,
color: ColorCodable(eventColor), symbol: eventSymbol,
description: eventDescription, color: ColorCodable(eventColor),
date: eventDate, notes: eventNotes,
time: eventTime, date: eventDate,
recurrence: eventRecurrence time: eventTime,
recurrence: eventRecurrence
)
) )
resetAddEventView() resetAddEventView()
} label: { } label: {
@@ -171,16 +184,8 @@ struct AddEventView: View {
//reset addeventView //reset addeventView
eventName = "" eventName = ""
eventSymbol = "star" eventSymbol = "star"
eventColor = [ eventColor = randomColor()
Color.red, eventNotes = ""
Color.orange,
Color.yellow,
Color.green,
Color.blue,
Color.indigo,
Color.purple
].randomElement() ?? Color.red
eventDescription = ""
eventDate = Date() eventDate = Date()
eventRecurrence = .none eventRecurrence = .none
dismiss() dismiss()
@@ -215,7 +220,7 @@ struct MagicClearButton: View {
eventCompleteDesc: .constant(""), eventCompleteDesc: .constant(""),
eventSymbol: .constant("star"), eventSymbol: .constant("star"),
eventColor: .constant(Color.red), eventColor: .constant(Color.red),
eventDescription: .constant("A very special day"), eventNotes: .constant("A very special day"),
eventDate: .constant(Date()), eventDate: .constant(Date()),
eventTime: .constant(true), eventTime: .constant(true),
eventRecurrence: .constant(.monthly), eventRecurrence: .constant(.monthly),

View File

@@ -18,16 +18,8 @@ struct ContentView: View {
@State private var eventComplete = false @State private var eventComplete = false
@State private var eventCompleteDesc = "" @State private var eventCompleteDesc = ""
@State private var eventSymbol = "star" @State private var eventSymbol = "star"
@State private var eventColor: Color = [ @State private var eventColor: Color = randomColor()
Color.red, @State private var eventNotes = ""
Color.orange,
Color.yellow,
Color.green,
Color.blue,
Color.indigo,
Color.purple
].randomElement() ?? Color.red
@State private var eventDescription = ""
@State private var eventDate = Date() @State private var eventDate = Date()
@State private var eventTime = false @State private var eventTime = false
@State private var eventRecurrence: Event.RecurrenceType = .none @State private var eventRecurrence: Event.RecurrenceType = .none
@@ -39,7 +31,7 @@ struct ContentView: View {
} else { } else {
return viewModel.events.filter { return viewModel.events.filter {
$0.name.localizedCaseInsensitiveContains(searchInput) || $0.name.localizedCaseInsensitiveContains(searchInput) ||
$0.description.localizedCaseInsensitiveContains(searchInput) $0.notes.localizedCaseInsensitiveContains(searchInput)
} }
} }
} }
@@ -125,7 +117,7 @@ struct ContentView: View {
eventCompleteDesc: $eventCompleteDesc, eventCompleteDesc: $eventCompleteDesc,
eventSymbol: $eventSymbol, eventSymbol: $eventSymbol,
eventColor: $eventColor, eventColor: $eventColor,
eventDescription: $eventDescription, eventNotes: $eventNotes,
eventDate: $eventDate, eventDate: $eventDate,
eventTime: $eventTime, eventTime: $eventTime,
eventRecurrence: $eventRecurrence, eventRecurrence: $eventRecurrence,
@@ -160,128 +152,6 @@ struct ContentView: View {
} }
} }
struct EventListView: View {
@ObservedObject var viewModel: EventViewModel
@State var event: Event
var body: some View {
NavigationLink() {
EditEventView(
viewModel: viewModel,
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)
// .foregroundStyle(
// event.complete ? .gray : .primary
// )
.animation(.spring, value: event.complete)
}
if !event.description.isEmpty {
Text(event.description)
.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)
.foregroundStyle(
event.color.color.opacity(
event.complete ? 0.5 : 1
)
)
.animation(.spring, value: event.complete)
}
Button() {
withAnimation(.spring) {
event.complete.toggle()
}
let eventToModify = viewModel.events.firstIndex() { currEvent in
currEvent.id == event.id
}
if let eventToModify = eventToModify {
viewModel.events[eventToModify] = event
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)
}
}
.buttonStyle(.borderless)
.frame(maxWidth: 25, maxHeight: 25)
.animation(.spring, value: event.complete)
}
}
}
}
struct SearchHelp: View { struct SearchHelp: View {
@Binding var searchInput: String @Binding var searchInput: String
@FocusState var focusedField: Field? @FocusState var focusedField: Field?
@@ -294,7 +164,7 @@ struct SearchHelp: View {
.padding(.trailing) .padding(.trailing)
Text("Can't find what you're looking for?") Text("Can't find what you're looking for?")
} }
Text("Tip: The Search bar searches event names and descriptions") Text("Tip: The Search bar searches event names and notes")
Button() { Button() {
searchInput = "" searchInput = ""
focusedField = nil focusedField = nil
@@ -311,22 +181,3 @@ struct SearchHelp: View {
#Preview { #Preview {
ContentView() ContentView()
} }
#Preview("EventListView") {
EventListView(
viewModel: EventViewModel(),
event:
Event(
name: "event",
complete: false,
completeDesc: "dofajiof",
symbol: "star",
color: ColorCodable(.orange),
description: "lksdjfakdflkasjlkjl",
date: Date(),
time: true,
recurrence: .daily
// )
)
)
}

View File

@@ -17,7 +17,7 @@ struct EditEventView: View {
@State private var eventCompleteDesc: String @State private var eventCompleteDesc: String
@State private var eventSymbol: String @State private var eventSymbol: String
@State private var eventColor: Color @State private var eventColor: Color
@State private var eventDescription: String @State private var eventNotes: String
@State private var eventDate: Date @State private var eventDate: Date
@State private var eventTime: Bool @State private var eventTime: Bool
@State private var eventRecurrence: Event.RecurrenceType @State private var eventRecurrence: Event.RecurrenceType
@@ -30,7 +30,7 @@ struct EditEventView: View {
_eventCompleteDesc = State(initialValue: event.wrappedValue.completeDesc) _eventCompleteDesc = State(initialValue: event.wrappedValue.completeDesc)
_eventSymbol = State(initialValue: event.wrappedValue.symbol) _eventSymbol = State(initialValue: event.wrappedValue.symbol)
_eventColor = State(initialValue: event.wrappedValue.color.color) _eventColor = State(initialValue: event.wrappedValue.color.color)
_eventDescription = State(initialValue: event.wrappedValue.description) _eventNotes = State(initialValue: event.wrappedValue.notes)
_eventDate = State(initialValue: event.wrappedValue.date) _eventDate = State(initialValue: event.wrappedValue.date)
_eventTime = State(initialValue: event.wrappedValue.time) _eventTime = State(initialValue: event.wrappedValue.time)
_eventRecurrence = State(initialValue: event.wrappedValue.recurrence) _eventRecurrence = State(initialValue: event.wrappedValue.recurrence)
@@ -40,7 +40,7 @@ struct EditEventView: View {
event.name = eventName event.name = eventName
event.symbol = eventSymbol event.symbol = eventSymbol
event.color = ColorCodable(eventColor) event.color = ColorCodable(eventColor)
event.description = eventDescription event.notes = eventNotes
event.date = eventDate event.date = eventDate
event.recurrence = eventRecurrence event.recurrence = eventRecurrence
@@ -57,32 +57,30 @@ struct EditEventView: View {
} }
var body: some View { var body: some View {
// NavigationStack { AddEventView(
AddEventView( viewModel: viewModel,
viewModel: viewModel, eventName: $eventName,
eventName: $eventName, eventComplete: $eventComplete,
eventComplete: $eventComplete, eventCompleteDesc: $eventCompleteDesc,
eventCompleteDesc: $eventCompleteDesc, eventSymbol: $eventSymbol,
eventSymbol: $eventSymbol, eventColor: $eventColor,
eventColor: $eventColor, eventNotes: $eventNotes,
eventDescription: $eventDescription, eventDate: $eventDate,
eventDate: $eventDate, eventTime: $eventTime,
eventTime: $eventTime, eventRecurrence: $eventRecurrence,
eventRecurrence: $eventRecurrence, adding: false //bc we editing existing event
adding: false //bc we editing existing event )
) .navigationTitle("Edit Event")
.navigationTitle("Edit Event") .toolbar {
.toolbar { ToolbarItem(placement: .topBarTrailing) {
ToolbarItem(placement: .topBarTrailing) { Button() {
Button() { saveEdits()
saveEdits() } label: {
} label: { Text("Done")
Text("Done")
}
.disabled(eventName == "")
} }
.disabled(eventName == "")
} }
// } }
} }
} }
@@ -90,17 +88,7 @@ struct EditEventView: View {
EditEventView( EditEventView(
viewModel: EventViewModel(), viewModel: EventViewModel(),
event: .constant( event: .constant(
Event( EventViewModel().example
name: "Birthday",
complete: false,
completeDesc: "",
symbol: "gear",
color: ColorCodable(.red),
description: "an event",
date: Date(),
time: true,
recurrence: .yearly
)
) )
) )
} }

View File

@@ -0,0 +1,136 @@
//
// EventListView.swift
// NearFuture
//
// Created by neon443 on 18/04/2025.
//
import SwiftUI
import SwiftData
struct EventListView: View {
@ObservedObject var viewModel: EventViewModel
@State var event: Event
var body: some View {
NavigationLink() {
EditEventView(
viewModel: viewModel,
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)
.foregroundStyle(
event.color.color.opacity(
event.complete ? 0.5 : 1
)
)
.animation(.spring, value: event.complete)
}
Button() {
withAnimation(.spring) {
event.complete.toggle()
}
let eventToModify = viewModel.events.firstIndex() { currEvent in
currEvent.id == event.id
}
if let eventToModify = eventToModify {
viewModel.events[eventToModify] = event
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)
}
}
.buttonStyle(.borderless)
.frame(maxWidth: 25, maxHeight: 25)
.animation(.spring, value: event.complete)
}
}
}
}
#Preview("EventListView") {
EventListView(
viewModel: EventViewModel(),
event:
EventViewModel().example
)
}

View File

@@ -26,7 +26,7 @@ struct Event: Identifiable, Codable {
var completeDesc: String var completeDesc: String
var symbol: String var symbol: String
var color: ColorCodable var color: ColorCodable
var description: String var notes: String
var date: Date var date: Date
var time: Bool var time: Bool
var recurrence: RecurrenceType var recurrence: RecurrenceType
@@ -93,6 +93,18 @@ class EventViewModel: ObservableObject {
@Published var events: [Event] = [] @Published var events: [Event] = []
@Published var icloudData: [Event] = [] @Published var icloudData: [Event] = []
@Published var example: Event = Event(
name: "event",
complete: false,
completeDesc: "dofajiof",
symbol: "star",
color: ColorCodable(.orange),
notes: "lksdjfakdflkasjlkjl",
date: Date(),
time: true,
recurrence: .daily
)
@Published var lastSync: Date? = nil @Published var lastSync: Date? = nil
@Published var icloudEventCount: Int = 0 @Published var icloudEventCount: Int = 0
@Published var localEventCount: Int = 0 @Published var localEventCount: Int = 0
@@ -156,28 +168,7 @@ class EventViewModel: ObservableObject {
} }
} }
func addEvent( func addEvent(newEvent: Event) {
name: String,
complete: Bool,
completedDesc: String,
symbol: String,
color: ColorCodable,
description: String,
date: Date,
time: Bool,
recurrence: Event.RecurrenceType
) {
let newEvent = Event(
name: name,
complete: complete,
completeDesc: completedDesc,
symbol: symbol,
color: color,
description: description,
date: date,
time: time,
recurrence: recurrence
)
events.append(newEvent) events.append(newEvent)
saveEvents() //sync with icloud saveEvents() //sync with icloud
} }
@@ -197,7 +188,6 @@ class EventViewModel: ObservableObject {
icloud.synchronize() icloud.synchronize()
if icloud.string(forKey: key) != nil { if icloud.string(forKey: key) != nil {
// print("has UbiquitousKeyValueStore")
icloud.removeObject(forKey: key) icloud.removeObject(forKey: key)
icloud.synchronize() icloud.synchronize()
return true return true
@@ -340,3 +330,23 @@ func describeOccurrence(date: Date, recurrence: Event.RecurrenceType) -> String
return "\(recurrenceDescription) \(dateString)" return "\(recurrenceDescription) \(dateString)"
} }
func randomRainbowColor() -> Color {
return [
Color.red,
Color.orange,
Color.yellow,
Color.green,
Color.blue,
Color.indigo,
Color.purple
].randomElement()!
}
func randomColor() -> Color {
let r = Double.random(in: 0...1)
let g = Double.random(in: 0...1)
let b = Double.random(in: 0...1)
let a = Double.random(in: 0...1)
return Color(red: r, green: g, blue: b, opacity: a)
}

View File

@@ -112,12 +112,6 @@ struct EventWidgetView: View {
} }
if isLarge { if isLarge {
if !event.description.isEmpty {
Text(event.description)
.font(.caption2)
.foregroundColor(.gray)
.padding(.top, -5)
}
Text(event.date.formatted(date: .long, time: .omitted)) Text(event.date.formatted(date: .long, time: .omitted))
.font(.caption2) .font(.caption2)
.foregroundColor(event.color.color) .foregroundColor(event.color.color)
@@ -141,8 +135,6 @@ struct EventWidgetView: View {
.foregroundColor(event.color.color) .foregroundColor(event.color.color)
.padding(.trailing, -12) .padding(.trailing, -12)
} }
} else {
/*@START_MENU_TOKEN@*/EmptyView()/*@END_MENU_TOKEN@*/
} }
} }
Spacer() Spacer()
@@ -150,7 +142,6 @@ struct EventWidgetView: View {
let xMoreEvents = events.count - showedEventsNum let xMoreEvents = events.count - showedEventsNum
Text("+\(xMoreEvents) more event\(xMoreEvents == 1 ? "" : "s")") Text("+\(xMoreEvents) more event\(xMoreEvents == 1 ? "" : "s")")
.font(.caption2) .font(.caption2)
// .foregroundStyle(.gray)
.padding(.top, -5) .padding(.top, -5)
.padding(.bottom, -15) .padding(.bottom, -15)
} }
@@ -162,61 +153,10 @@ struct EventWidgetView: View {
struct Widget_Previews: PreviewProvider { struct Widget_Previews: PreviewProvider {
static var events = [ static var events = [
Event( EventViewModel().example,
name: "Event Name", EventViewModel().example,
complete: false, EventViewModel().example,
completeDesc: "", EventViewModel().example
symbol: "gear",
color: ColorCodable(.blue),
description: "Event description",
date: Date.distantFuture,
time: false,
recurrence: .yearly
),
Event(
name: "distant past",
complete: false,
completeDesc: "",
symbol: "star",
color: ColorCodable(.orange),
description: "description",
date: Date.distantPast,
time: false,
recurrence: .daily
),
Event(
name: "event",
complete: false,
completeDesc: "",
symbol: "star",
color: ColorCodable(.purple),
description: "description",
date: Date(),
time: false,
recurrence: .daily
),
Event(
name: "An event",
complete: false,
completeDesc: "",
symbol: "star",
color: ColorCodable(.green),
description: "description",
date: Date(),
time: false,
recurrence: .daily
),
Event(
name: "time event",
complete: true,
completeDesc: "",
symbol: "clock",
color: ColorCodable(.brown),
description: "an event with a time",
date: Date(),
time: true,
recurrence: .none
)
] ]
static var previews: some View { static var previews: some View {
Group { Group {