feat: use markdown render body

waycrate · Sep 21, 2024 · 9c828eb · 9c828eb
1 parent 3d3c297
commit 9c828eb
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lala_bar/Cargo.toml b/lala_bar/Cargo.toml
@@ -18,6 +18,7 @@ iced = { version = "0.13.1", features = [
 	"image",
 	"advanced",
 	"svg",
+	"markdown"
 ] }
 iced_runtime = "0.13.0"
 iced_layershell = "0.7.1"

diff --git a/lala_bar/src/main.rs b/lala_bar/src/main.rs
@@ -4,8 +4,8 @@ use async_trait::async_trait;
 use futures::future::pending;
 use futures::StreamExt;
 use iced::widget::{
-    button, checkbox, column, container, image, row, scrollable, slider, svg, text, text_input,
-    Space,
+    button, checkbox, column, container, image, markdown, row, scrollable, slider, svg, text,
+    text_input, Space,
 };
 use iced::{executor, Alignment, Font};
 use iced::{Element, Length, Task as Command, Theme};
@@ -97,13 +97,26 @@ struct NotifyUnitWidgetInfo {
 }
 
 impl NotifyUnitWidgetInfo {
-    fn notify_button<'a>(&self) -> Element<'a, Message> {
+    fn notify_button<'a>(&self, bar: &'a LalaMusicBar) -> Element<'a, Message> {
         let notify = &self.unit;
         let notify_theme = if notify.is_critical() {
             button::primary
         } else {
             button::secondary
         };
+        let markdown_info = bar.notifications_markdown.get(&self.unit.id);
+        let text_render: Element<Message> = match markdown_info {
+            Some(data) => markdown::view(
+                data,
+                markdown::Settings::default(),
+                markdown::Style::from_palette(bar.theme().palette()),
+            )
+            .map(Message::LinkClicked)
+            .into(),
+            None => text(notify.body.clone())
+                .shaping(text::Shaping::Advanced)
+                .into(),
+        };
         match notify.image() {
             Some(ImageInfo::Svg(path)) => button(row![
                 svg(svg::Handle::from_path(path))
@@ -118,7 +131,7 @@ impl NotifyUnitWidgetInfo {
                             weight: iced::font::Weight::Bold,
                             ..Default::default()
                         }),
-                    text(notify.body.clone()).shaping(text::Shaping::Advanced)
+                    text_render
                 ]
             ])
             .style(notify_theme)
@@ -145,7 +158,7 @@ impl NotifyUnitWidgetInfo {
                             weight: iced::font::Weight::Bold,
                             ..Default::default()
                         }),
-                    text(notify.body.clone()).shaping(text::Shaping::Advanced)
+                    text_render
                 ]
             ])
             .width(Length::Fill)
@@ -164,7 +177,7 @@ impl NotifyUnitWidgetInfo {
                             weight: iced::font::Weight::Bold,
                             ..Default::default()
                         }),
-                    text(notify.body.clone()).shaping(text::Shaping::Advanced)
+                    text_render
                 ]
             ])
             .width(Length::Fill)
@@ -174,7 +187,7 @@ impl NotifyUnitWidgetInfo {
             .into(),
             _ => button(column![
                 text(notify.summery.clone()).shaping(text::Shaping::Advanced),
-                text(notify.body.clone()).shaping(text::Shaping::Advanced)
+                text_render
             ])
             .width(Length::Fill)
             .height(Length::Fill)
@@ -207,6 +220,7 @@ struct LalaMusicBar {
     hiddenid_lock: bool,
     right_panel: Option<iced::window::Id>,
     notifications: HashMap<u32, NotifyUnitWidgetInfo>,
+    notifications_markdown: HashMap<u32, Vec<markdown::Item>>,
     showned_notifications: HashMap<iced::window::Id, u32>,
     cached_notifications: HashMap<iced::window::Id, NotifyUnitWidgetInfo>,
     cached_hidden_notifications: Vec<NotifyUnitWidgetInfo>,
@@ -458,7 +472,7 @@ impl LalaMusicBar {
             .hidden_notification()
             .iter()
             .map(|wdgetinfo| {
-                container(wdgetinfo.notify_button())
+                container(wdgetinfo.notify_button(self))
                     .height(Length::Fixed(100.))
                     .into()
             })
@@ -555,6 +569,8 @@ enum Message {
     QuiteMode(bool),
     CloseErrorNotification(iced::window::Id),
     Ready(Sender<NotifyCommand>),
+    #[allow(unused)]
+    LinkClicked(markdown::Url),
 }
 
 impl From<NotifyMessage> for Message {
@@ -743,6 +759,7 @@ impl MultiApplication for LalaMusicBar {
                 hiddenid: None,
                 hiddenid_lock: false,
                 notifications: HashMap::new(),
+                notifications_markdown: HashMap::new(),
                 showned_notifications: HashMap::new(),
                 cached_notifications: HashMap::new(),
                 cached_hidden_notifications: Vec::new(),
@@ -822,6 +839,7 @@ impl MultiApplication for LalaMusicBar {
                 // If the widget is marked to removed
                 // Then delete it
                 self.notifications.remove(&nid);
+                self.notifications_markdown.remove(&nid);
             }
         }
         self.cached_notifications.remove(&id);
@@ -980,6 +998,8 @@ impl MultiApplication for LalaMusicBar {
                     ))
                 }
 
+                self.notifications_markdown
+                    .insert(notify.id, markdown::parse(&notify.body).collect());
                 self.notifications.insert(
                     notify.id,
                     NotifyUnitWidgetInfo {
@@ -1192,6 +1212,7 @@ impl MultiApplication for LalaMusicBar {
                     }
                 }
 
+                self.notifications_markdown.clear();
                 self.notifications.clear();
                 self.update_hidden_notification();
                 commands.push(Command::perform(async {}, |_| Message::CheckOutput));
@@ -1218,7 +1239,7 @@ impl MultiApplication for LalaMusicBar {
                     }
                 }
                 LaLaInfo::Notify(unitwidgetinfo) => {
-                    let btnwidgets: Element<Message> = unitwidgetinfo.notify_button();
+                    let btnwidgets: Element<Message> = unitwidgetinfo.notify_button(self);
 
                     let notify = &unitwidgetinfo.unit;
                     if notify.inline_reply_support() {