Merge pull request #66 from dev10110/hidePastEvents

Allows hiding past events

MeetingBar/AppDelegate.swift

@@ -25,6 +25,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
     var timeFormatObserver: DefaultsObservation?
     var eventTitleFormatObserver: DefaultsObservation?
     var disablePastEventObserver: DefaultsObservation?
+    var hidePastEventObserver: DefaultsObservation?
     var declinedEventsAppereanceObserver: DefaultsObservation?
     var showEventsForPeriodObserver: DefaultsObservation?
     var joinEventNotificationObserver: DefaultsObservation?
@@ -108,6 +109,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
             NSLog("Changed disablePastEvents from \(change.oldValue) to \(change.newValue)")
             self.statusBarItem.updateMenu()
         }
+        hidePastEventObserver = Defaults.observe(.hidePastEvents) { change in
+            NSLog("Changed hidePastEvents from \(change.oldValue) to \(change.newValue)")
+            self.statusBarItem.updateMenu()
+        }
         declinedEventsAppereanceObserver = Defaults.observe(.declinedEventsAppereance) { change in
             NSLog("Changed declinedEventsAppereance from \(change.oldValue) to \(change.newValue)")
             self.statusBarItem.updateMenu()

MeetingBar/DefaultsKeys.swift

@@ -31,6 +31,7 @@ extension Defaults.Keys {
     static let showEventDetails = Key<Bool>("showEventDetails", default: false)
     static let declinedEventsAppereance = Key<DeclinedEventsAppereance>("declinedEventsAppereance", default: .strikethrough)
     static let disablePastEvents = Key<Bool>("disablePastEvents", default: true)
+    static let hidePastEvents = Key<Bool>("hidePastEvents", default: false)
     static let timeFormat = Key<TimeFormat>("timeFormat", default: .military)
 
     // Integrations

MeetingBar/PreferencesView.swift

@@ -201,6 +201,7 @@ struct Appearance: View {
     @Default(.showEventDetails) var showEventDetails
     @Default(.declinedEventsAppereance) var declinedEventsAppereance
     @Default(.disablePastEvents) var disablePastEvents
+    @Default(.hidePastEvents) var hidePastEvents
 
     var body: some View {
         VStack(alignment: .leading, spacing: 15) {
@@ -234,6 +235,9 @@ struct Appearance: View {
                     Spacer()
                     Toggle("Show event details as submenu", isOn: $showEventDetails)
                 }
+              HStack{
+                Toggle("Hide past events", isOn: $hidePastEvents)
+              }
                 HStack {
                     Picker("Declined events:", selection: $declinedEventsAppereance) {
                         Text("show with strikethrough").tag(DeclinedEventsAppereance.strikethrough)

MeetingBar/StatusBarItemControler.swift

@@ -141,6 +141,12 @@ class StatusBarItemControler {
         }
 
         let now = Date()
+
+        if Defaults[.hidePastEvents]{
+          if event.endDate < now {
+            return
+          }
+        }
 
         let eventTitle = String(event.title)