macos notification enhancement and serialized arg passing

Author: yujonglee

Cargo.lock

@@ -6,6 +6,30 @@ pub enum NotificationEvent {
     Timeout,
 }
 
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, Default, serde::Serialize, serde::Deserialize, specta::Type,
+)]
+pub enum ParticipantStatus {
+    #[default]
+    Accepted,
+    Maybe,
+    Declined,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, specta::Type)]
+pub struct Participant {
+    pub name: Option<String>,
+    pub email: String,
+    pub status: ParticipantStatus,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, specta::Type)]
+pub struct EventDetails {
+    pub what: String,
+    pub timezone: Option<String>,
+    pub location: Option<String>,
+}
+
 #[derive(Debug, Clone)]
 pub struct NotificationContext {
     pub key: String,
@@ -20,6 +44,9 @@ pub struct Notification {
     pub timeout: Option<std::time::Duration>,
     pub event_id: Option<String>,
     pub start_time: Option<i64>,
+    pub participants: Option<Vec<Participant>>,
+    pub event_details: Option<EventDetails>,
+    pub action_label: Option<String>,
 }
 
 impl Notification {
@@ -36,6 +63,9 @@ pub struct NotificationBuilder {
     timeout: Option<std::time::Duration>,
     event_id: Option<String>,
     start_time: Option<i64>,
+    participants: Option<Vec<Participant>>,
+    event_details: Option<EventDetails>,
+    action_label: Option<String>,
 }
 
 impl NotificationBuilder {
@@ -69,6 +99,21 @@ impl NotificationBuilder {
         self
     }
 
+    pub fn participants(mut self, participants: Vec<Participant>) -> Self {
+        self.participants = Some(participants);
+        self
+    }
+
+    pub fn event_details(mut self, event_details: EventDetails) -> Self {
+        self.event_details = Some(event_details);
+        self
+    }
+
+    pub fn action_label(mut self, action_label: impl Into<String>) -> Self {
+        self.action_label = Some(action_label.into());
+        self
+    }
+
     pub fn build(self) -> Notification {
         Notification {
             key: self.key,
@@ -77,6 +122,9 @@ impl NotificationBuilder {
             timeout: self.timeout,
             event_id: self.event_id,
             start_time: self.start_time,
+            participants: self.participants,
+            event_details: self.event_details,
+            action_label: self.action_label,
         }
     }
 }

crates/notification-interface/src/lib.rs

@@ -21,6 +21,9 @@ swift-rs = { workspace = true, features = ["build"] }
 hypr-notification-interface = { workspace = true }
 swift-rs = { workspace = true }
 
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+
 [target.'cfg(target_os = "macos")'.dev-dependencies]
 objc2 = { workspace = true }
 objc2-app-kit = { workspace = true }

crates/notification-macos/Cargo.toml

@@ -20,15 +20,54 @@ fn main() {
             println!("timeout: {}", id);
         });
 
+        let participants = vec![
+            Participant {
+                name: None,
+                email: "[email protected]".to_string(),
+                status: ParticipantStatus::Accepted,
+            },
+            Participant {
+                name: Some("John Jeong".to_string()),
+                email: "[email protected]".to_string(),
+                status: ParticipantStatus::Accepted,
+            },
+            Participant {
+                name: Some("Yujong Lee".to_string()),
+                email: "[email protected]".to_string(),
+                status: ParticipantStatus::Maybe,
+            },
+            Participant {
+                name: Some("Tony Stark".to_string()),
+                email: "[email protected]".to_string(),
+                status: ParticipantStatus::Declined,
+            },
+        ];
+
+        let event_details = EventDetails {
+            what: "Discovery call - Apple <> Hyprnote".to_string(),
+            timezone: Some("America/Cupertino".to_string()),
+            location: Some("https://zoom.us/j/123456789".to_string()),
+        };
+
+        let start_time = std::time::SystemTime::now()
+            .duration_since(std::time::UNIX_EPOCH)
+            .unwrap()
+            .as_secs() as i64
+            + 120;
+
         let notification = Notification::builder()
             .key("test_notification")
             .title("Test Notification")
-            .message("Hover/click should now react")
+            .message("Meeting starting soon")
             .timeout(Duration::from_secs(30))
+            .participants(participants)
+            .event_details(event_details)
+            .action_label("Join Zoom & Start listening")
+            .start_time(start_time)
             .build();
 
         show(&notification);
-        std::thread::sleep(Duration::from_secs(30));
+        std::thread::sleep(Duration::from_secs(60));
         std::process::exit(0);
     });
 }

crates/notification-macos/examples/test_notification_with_event.rs

@@ -6,13 +6,7 @@ use swift_rs::{Bool, SRString, swift};
 
 pub use hypr_notification_interface::*;
 
-swift!(fn _show_notification(
-    key: &SRString,
-    title: &SRString,
-    message: &SRString,
-    timeout_seconds: f64,
-    start_time: i64
-) -> Bool);
+swift!(fn _show_notification(json_payload: &SRString) -> Bool);
 
 swift!(fn _dismiss_all_notifications() -> Bool);
 
@@ -93,20 +87,42 @@ pub unsafe extern "C" fn rust_on_notification_timeout(key_ptr: *const c_char) {
     }
 }
 
+#[derive(serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+struct NotificationPayload<'a> {
+    key: &'a str,
+    title: &'a str,
+    message: &'a str,
+    timeout_seconds: f64,
+    start_time: Option<i64>,
+    participants: Option<&'a [Participant]>,
+    event_details: Option<&'a EventDetails>,
+    action_label: Option<&'a str>,
+}
+
 pub fn show(notification: &hypr_notification_interface::Notification) {
+    let key = notification
+        .key
+        .as_deref()
+        .unwrap_or(notification.title.as_str());
+    let timeout_seconds = notification.timeout.map(|d| d.as_secs_f64()).unwrap_or(5.0);
+
+    let payload = NotificationPayload {
+        key,
+        title: &notification.title,
+        message: &notification.message,
+        timeout_seconds,
+        start_time: notification.start_time,
+        participants: notification.participants.as_deref(),
+        event_details: notification.event_details.as_ref(),
+        action_label: notification.action_label.as_deref(),
+    };
+
+    let json = serde_json::to_string(&payload).unwrap();
+    let json_str = SRString::from(json.as_str());
+
     unsafe {
-        let key = SRString::from(
-            notification
-                .key
-                .as_deref()
-                .unwrap_or(notification.title.as_str()),
-        );
-        let title = SRString::from(notification.title.as_str());
-        let message = SRString::from(notification.message.as_str());
-        let timeout_seconds = notification.timeout.map(|d| d.as_secs_f64()).unwrap_or(5.0);
-        let start_time = notification.start_time.unwrap_or(0);
-
-        _show_notification(&key, &title, &message, timeout_seconds, start_time);
+        _show_notification(&json_str);
     }
 }
 

crates/notification-macos/src/lib.rs

@@ -87,9 +87,12 @@ class CloseButton: NSButton {
   }
 }
 
-class ActionButton: NSButton {
+class NotificationButton: NSButton {
   weak var notification: NotificationInstance?
 
+  private static let normalBg = NSColor(calibratedWhite: 0.95, alpha: 0.9).cgColor
+  private static let pressedBg = NSColor(calibratedWhite: 0.85, alpha: 0.9).cgColor
+
   override init(frame frameRect: NSRect) {
     super.init(frame: frameRect)
     setup()
@@ -114,7 +117,7 @@ class ActionButton: NSButton {
     }
 
     layer?.cornerRadius = 8
-    layer?.backgroundColor = NSColor(calibratedWhite: 0.95, alpha: 0.9).cgColor
+    layer?.backgroundColor = Self.normalBg
     layer?.borderColor = NSColor(calibratedWhite: 0.7, alpha: 0.5).cgColor
     layer?.borderWidth = 0.5
 
@@ -131,22 +134,40 @@ class ActionButton: NSButton {
     return s
   }
 
-  override func mouseDown(with event: NSEvent) {
-    layer?.backgroundColor = NSColor(calibratedWhite: 0.85, alpha: 0.9).cgColor
+  func animatePress() {
+    layer?.backgroundColor = Self.pressedBg
     DispatchQueue.main.asyncAfter(deadline: .now() + 0.08) {
-      self.layer?.backgroundColor = NSColor(calibratedWhite: 0.95, alpha: 0.9).cgColor
+      self.layer?.backgroundColor = Self.normalBg
     }
-    if let notification = notification {
-      notification.key.withCString { keyPtr in
-        rustOnNotificationAccept(keyPtr)
-      }
-      notification.dismiss()
+  }
+
+  func performAction() {}
+
+  override func mouseDown(with event: NSEvent) {
+    animatePress()
+    performAction()
+  }
+}
+
+class ActionButton: NotificationButton {
+  override func performAction() {
+    guard let notification = notification else { return }
+    notification.key.withCString { keyPtr in
+      rustOnNotificationAccept(keyPtr)
     }
+    notification.dismiss()
   }
 }
 
-class DetailsButton: NSButton {
+class DetailsButton: NotificationButton {
+  override func performAction() {
+    notification?.toggleExpansion()
+  }
+}
+
+class CollapseButton: NSButton {
   weak var notification: NotificationInstance?
+  var trackingArea: NSTrackingArea?
 
   override init(frame frameRect: NSRect) {
     super.init(frame: frameRect)
@@ -161,39 +182,50 @@ class DetailsButton: NSButton {
   private func setup() {
     wantsLayer = true
     isBordered = false
-    bezelStyle = .rounded
-    controlSize = .small
-    font = NSFont.systemFont(ofSize: 12, weight: .medium)
-    focusRingType = .none
-
-    contentTintColor = NSColor(calibratedWhite: 0.1, alpha: 1.0)
-    if #available(macOS 11.0, *) {
-      bezelColor = NSColor(calibratedWhite: 0.9, alpha: 1.0)
-    }
-
-    layer?.cornerRadius = 8
-    layer?.backgroundColor = NSColor(calibratedWhite: 0.95, alpha: 0.9).cgColor
-    layer?.borderColor = NSColor(calibratedWhite: 0.7, alpha: 0.5).cgColor
-    layer?.borderWidth = 0.5
-
-    layer?.shadowColor = NSColor(calibratedWhite: 0.0, alpha: 0.5).cgColor
-    layer?.shadowOpacity = 0.2
-    layer?.shadowRadius = 2
-    layer?.shadowOffset = CGSize(width: 0, height: 1)
+    bezelStyle = .regularSquare
+    imagePosition = .noImage
+    title = "Show less"
+    font = NSFont.systemFont(ofSize: 11, weight: .regular)
+    contentTintColor = NSColor.secondaryLabelColor
+    layer?.backgroundColor = NSColor.clear.cgColor
   }
 
   override var intrinsicContentSize: NSSize {
     var s = super.intrinsicContentSize
-    s.width += 12
-    s.height = max(24, s.height + 2)
+    s.height = max(16, s.height)
     return s
   }
 
+  override func updateTrackingAreas() {
+    super.updateTrackingAreas()
+    if let area = trackingArea { removeTrackingArea(area) }
+    let area = NSTrackingArea(
+      rect: bounds,
+      options: [.activeAlways, .mouseEnteredAndExited, .inVisibleRect],
+      owner: self,
+      userInfo: nil
+    )
+    addTrackingArea(area)
+    trackingArea = area
+  }
+
   override func mouseDown(with event: NSEvent) {
-    layer?.backgroundColor = NSColor(calibratedWhite: 0.85, alpha: 0.9).cgColor
+    contentTintColor = NSColor.tertiaryLabelColor
     DispatchQueue.main.asyncAfter(deadline: .now() + 0.08) {
-      self.layer?.backgroundColor = NSColor(calibratedWhite: 0.95, alpha: 0.9).cgColor
+      self.contentTintColor = NSColor.secondaryLabelColor
     }
     notification?.toggleExpansion()
   }
+
+  override func mouseEntered(with event: NSEvent) {
+    super.mouseEntered(with: event)
+    NSCursor.pointingHand.push()
+    contentTintColor = NSColor.labelColor
+  }
+
+  override func mouseExited(with event: NSEvent) {
+    super.mouseExited(with: event)
+    NSCursor.pop()
+    contentTintColor = NSColor.secondaryLabelColor
+  }
 }