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

rerewrote daysUntillEvent, now acc can count days

Browse Source 
inlineLarge titlebar, backwards compatible view extension
competed events go to archive
fix long event name and notes alignemnts
can refresh icloud settings to sync
This commit is contained in:
neon443
2025-05-04 12:31:01 +01:00
parent c97d37711c
commit ffbd17fad8
9 changed files with 191 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
NearFuture/Item.swift
View File

@@ -76,30 +76,24 @@ struct ColorCodable: Codable, Equatable {
func daysUntilEvent(_ eventDate: Date) -> (long: String, short: String) {
let calendar = Calendar.current
let now = Date()
let isToday = calendar.isDate(now, inSameDayAs: eventDate)
let components = calendar.dateComponents([.second, .day], from: now, to: eventDate)
guard !isToday else { return ("Today", "Today") }
let secsComponents = eventDate.timeIntervalSinceNow
guard let daysCompontents = components.day else { return ("N/A", "N/A") }
let secs = Double(secsComponents)
var days = 0
var long = ""
var short = ""
if secs < 0 {
let startOfDayNow = calendar.startOfDay(for: Date())
let startOfDayEvent = calendar.startOfDay(for: eventDate)
let components = calendar.dateComponents([.day], from: startOfDayNow, to: startOfDayEvent)
guard let days = components.day else { return ("N/A", "N/A") }
guard days != 0 else { return ("Today", "Today") }
if days < 0 {
//past
days = Int(floor(secs/86400))
long = "\(-days) day\(plu(days)) ago"
short = "\(days)d"
return (
"\(-days) day\(plu(days)) ago",
"\(days)d"
)
} else {
//future
days = Int(ceil(secs/86400))
long = "\(days) day\(plu(days))"
short = "\(days)d"
return (
"\(days) day\(plu(days))",
"\(days)d"
)
}
return (long, short)
}
class EventViewModel: ObservableObject {