enhancement(image): Add a custom guess function to image widget #1

Author: ahqsoftwares

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "win32_notif"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 description = "Wrapper around Windows UWP XAML (WinRT) Notification api"
 license = "MIT"

Cargo.toml

@@ -0,0 +1,66 @@
+use std::{path::absolute, thread, time::Duration};
+
+use win32_notif::{
+  notification::{actions::{
+    action::{ActivationType, AfterActivationBehavior},
+    ActionButton, 
+  }, audio::{Audio, Src}, header::{Header, HeaderActivationType}, visual::{Image, Placement, Text}, ToastDuration}, NotificationActivatedEventHandler, NotificationBuilder, ToastsNotifier
+};
+
+fn main() {
+  let path = absolute("./examples/strawberry.jpg").unwrap();
+  let path = path.to_string_lossy();
+
+  let notifier = ToastsNotifier::new("Microsoft.Windows.Explorer").unwrap();
+
+  
+
+  let notif = NotificationBuilder::new()
+    .audio(Audio::new(Src::Reminder, true, false))
+    .header(Header::new("food01", "Order Food", "food", Some(HeaderActivationType::Foreground)))
+    .visual(
+      Image::create(20, format!("file:///{path}"))
+        .with_placement(Placement::Hero)
+        .without_image_query()
+    )
+    .visual(
+      Text::create(1, "Would you like to order lunch today?")
+    )
+    .action(
+      ActionButton::create("Yes")
+        .set_tooltip("Yes")
+        .set_activation_type(ActivationType::Foreground)
+        .set_after_activation_behavior(AfterActivationBehavior::PendingUpdate) 
+        .set_id("yes")
+    )
+    .action(
+      ActionButton::create("No")
+        .set_tooltip("No")
+        .set_activation_type(ActivationType::Foreground)
+        .set_after_activation_behavior(AfterActivationBehavior::Default)
+        .set_id("no")
+    )
+    .set_duration(ToastDuration::Long)
+    .on_activated(NotificationActivatedEventHandler::new(|a, b| {
+      println!("Triggered");
+      let notification = a.unwrap();
+      let args = b.unwrap();
+
+      println!("{args:?}");
+      if let Some(x) = args.button_id {
+        if &x == "yes" {
+          
+        }
+      }
+
+      Ok(())
+    }))
+    .build(0, &notifier, "01", "ahq")
+    .expect("Unable to build notification");
+
+  _ = notif.show();
+
+  loop {
+    thread::sleep(Duration::from_millis(200));
+  }
+}

examples/lunch.rs

@@ -61,7 +61,7 @@ impl NotificationActivatedEventHandler {
     mut func: T,
   ) -> Self {
     let handler: TypedEventHandler<ToastNotification, IInspectable> =
-      TypedEventHandler::new(move |a: Ref<ToastNotification>, b: Ref<IInspectable>| {
+       TypedEventHandler::new(move |a: Ref<ToastNotification>, b: Ref<IInspectable>| {
         let a = a.as_ref();
         let a = a.and_then(|a| PartialNotification { _toast: a }.into());
 

examples/prompt.rs

@@ -183,8 +183,8 @@ impl Into<String> for HintButtonStyle {
   fn into(self) -> String {
     match self {
       Self::None => "".to_string(),
-      Self::Success => "success".to_string(),
-      Self::Critical => "critical".to_string(),
+      Self::Success => "Success".to_string(),
+      Self::Critical => "Critical".to_string(),
     }
   }
 }

examples/strawberry.jpg

@@ -76,7 +76,31 @@ pub struct Image {
 
 impl TextOrImageElement for Image {}
 
+fn guess_src(src: String) -> String {
+  let protocols = ["https://", "http://", "file:///", "ms-appx:///", "ms-appdata:///local/"];
+
+  if !(protocols.iter().any(|x| src.starts_with(x))) {
+    return format!("file:///{src}");
+  }
+
+  src
+}
+
 impl Image {
+  /// The `src` should be the either of the following following
+  /// - `https://url or http://url`
+  /// - `file:///path/to/file`
+  /// 
+  /// If none of the above is provided, the `src` will be set to `file:///path/to/file`
+  pub fn create<T: Into<String>>(id: u64, src: T) -> Self {
+    Self::new(id, src.into(), None, false, Placement::None, ImageCrop::Default, false)
+  }
+
+  /// The `src` should be the either of the following following
+  /// - `https://url or http://url`
+  /// - `file:///path/to/file`
+  /// 
+  /// If none of the above is provided, the `src` will be set to `file:///path/to/file`
   pub fn new(
     id: u64,
     src: String,
@@ -144,23 +168,23 @@ impl ToXML for Image {
   fn to_xml(&self) -> String {
     format!(
       r#"
-        <image id="{id:#?}" {margin} {align} src={src:?} {alt} addImageQuery={add_image_query:#?} {placement} {crop} />
+        <image id="{id:#?}" {margin} {align} src={src} {add_image_query} {alt} {placement} {crop} />
       "#,
       align = self.align.to_string(),
       margin = match self.no_margin {
         true => "hint-remove-margin=\"true\"".to_string(),
         false => "".to_string(),
       },
       id = self.id,
-      src = &self.src,
+      src = format!("{:?}", self.src).replace("\\\\", "\\"),
       alt = self
         .alt
         .clone()
         .map_or_else(|| string!(""), |x| format!("alt={x:#?}")),
       add_image_query = if self.add_image_query {
-        "True"
+        "addImageQuery=\"True\""
       } else {
-        "False"
+        ""
       },
       placement = self.placement.to_string(),
       crop = self.crop.to_string()

src/structs/handler/activated.rs

@@ -1,20 +1,31 @@
-use windows::UI::Notifications::{
-  NotificationData, NotificationUpdateResult, ToastNotificationManager, ToastNotifier,
-};
+use std::sync::Arc;
+
+use windows::{core::HSTRING, UI::Notifications::{
+  NotificationData, NotificationUpdateResult, ToastNotificationHistory, ToastNotificationManager, ToastNotifier
+}};
 
 use crate::NotifError;
 
 use super::NotificationDataSet;
 
 pub struct ToastsNotifier {
   _inner: ToastNotifier,
+  app_id: Arc<str>
 }
 
 impl ToastsNotifier {
-  pub fn new(app_id: &str) -> Result<Self, NotifError> {
-    let _inner = ToastNotificationManager::CreateToastNotifierWithId(&app_id.into())?;
+  pub fn new<T: Into<String>>(app_id: T) -> Result<Self, NotifError> {
+    let string: String = app_id.into();
+    let _inner = ToastNotificationManager::CreateToastNotifierWithId(&string.into())?;
+
+    Ok(Self { _inner, app_id: Arc::new(string) })
+  }
 
-    Ok(Self { _inner })
+  pub fn manager(&self) -> Result<ToastsManager, NotifError> {
+    Ok(ToastsManager {
+      inner: Arc::new(ToastNotificationManager::History()?),
+      app_id: self.app_id.clone(),
+    })
   }
 
   pub fn update(
@@ -35,3 +46,15 @@ impl ToastsNotifier {
     &self._inner
   }
 }
+
+#[derive(Debug, Clone)]
+pub struct ToastsManager {
+  pub(crate) inner: Arc<ToastNotificationHistory>,
+  pub app_id: Arc<SafeString>
+}
+
+impl ToastsManager {
+  pub fn inner(&self) -> &Arc<ToastNotificationHistory> {
+    &self.inner
+  }
+}