fix: try to support a mini notification widget

Cargo.toml

@@ -1,36 +1,15 @@
-[package]
-name = "lala_musicbar"
-version = "0.2.7"
-edition = "2021"
+[workspace]
+resolver = "2"
+members = ["./lala_bar", "./notification_iced"]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[workspace.package]
+version = "0.1.0"
 
-[dependencies]
-iced = { version = "0.12", features = [
-	"tokio",
-	"debug",
-	"image",
-	"advanced",
-	"svg",
-] }
-#iced_native = "0.12"
-iced_runtime = "0.12"
-iced_layershell = "0.4.0-rc1"
-tokio = { version = "1.39", features = ["full"] }
-iced_futures = "0.12.0"
-env_logger = "0.11.5"
-tracing = "0.1.40"
 
-futures-util = "0.3.30"
-once_cell = "1.19.0"
+[workspace.dependencies]
+notification_iced = { version = "0.1.0", path = "notification_iced"}
+futures = "0.3.30"
 serde = { version = "1.0.204", features = ["derive"] }
-
-zbus = { version = "4.4.0", default-features = false, features = ["tokio"] }
-tracing-subscriber = "0.3.18"
-anyhow = "1.0.86"
-alsa = "0.9.0"
-
-gio = "0.20.0"
-regex = "1.10.5"
-xdg = "2.5.2"
 url = "2.5.2"
+zbus = { version = "4.4.0", default-features = false, features = ["tokio"] }
+futures-util = "0.3.30"

lala_bar/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "lala-bar"
+version = "0.2.7"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+iced = { version = "0.12", features = [
+	"tokio",
+	"debug",
+	"image",
+	"advanced",
+	"svg",
+] }
+#iced_native = "0.12"
+iced_runtime = "0.12"
+iced_layershell = { git = "https://github.com/waycrate/exwlshelleventloop", package = "iced_layershell" }
+tokio = { version = "1.39", features = ["full"] }
+iced_futures = "0.12.0"
+env_logger = "0.11.5"
+tracing = "0.1.40"
+
+futures-util.workspace = true
+serde.workspace = true
+
+zbus.workspace = true
+tracing-subscriber = "0.3.18"
+anyhow = "1.0.86"
+alsa = "0.9.0"
+
+gio = "0.20.0"
+regex = "1.10.5"
+xdg = "2.5.2"
+url.workspace = true
+futures.workspace = true
+notification_iced.workspace = true

src/launcher.rs → lala_bar/src/launcher.rs

@@ -20,6 +20,14 @@ pub struct Launcher {
     pub should_delete: bool,
 }
 
+#[derive(Debug, Clone)]
+pub enum LaunchMessage {
+    SearchEditChanged(String),
+    SearchSubmit,
+    Launch(usize),
+    IcedEvent(Event),
+}
+
 impl Launcher {
     pub fn new() -> Self {
         Self {
@@ -34,11 +42,11 @@ impl Launcher {
         text_input::focus(INPUT_ID.clone())
     }
 
-    pub fn update(&mut self, message: Message, id: iced::window::Id) -> Command<Message> {
+    pub fn update(&mut self, message: LaunchMessage, id: iced::window::Id) -> Command<Message> {
         use iced::keyboard::key::Named;
         use iced_runtime::keyboard;
         match message {
-            Message::SearchSubmit => {
+            LaunchMessage::SearchSubmit => {
                 let re = regex::Regex::new(&self.text).ok();
                 let index = self
                     .apps
@@ -63,17 +71,17 @@ impl Launcher {
                     Command::none()
                 }
             }
-            Message::SearchEditChanged(edit) => {
+            LaunchMessage::SearchEditChanged(edit) => {
                 self.scrollpos = 0;
                 self.text = edit;
                 Command::none()
             }
-            Message::Launch(index) => {
+            LaunchMessage::Launch(index) => {
                 self.apps[index].launch();
                 self.should_delete = true;
                 Command::single(Action::Window(WindowAction::Close(id)))
             }
-            Message::IcedEvent(event) => {
+            LaunchMessage::IcedEvent(event) => {
                 let mut len = self.apps.len();
 
                 let re = regex::Regex::new(&self.text).ok();
@@ -112,16 +120,15 @@ impl Launcher {
                 }
                 text_input::focus(INPUT_ID.clone())
             }
-            _ => Command::none(),
         }
     }
 
     pub fn view(&self) -> Element<Message> {
         let re = regex::Regex::new(&self.text).ok();
         let text_ip: Element<Message> = text_input("put the launcher name", &self.text)
             .padding(10)
-            .on_input(Message::SearchEditChanged)
-            .on_submit(Message::SearchSubmit)
+            .on_input(|msg| Message::LauncherInfo(LaunchMessage::SearchEditChanged(msg)))
+            .on_submit(Message::LauncherInfo(LaunchMessage::SearchSubmit))
             .id(INPUT_ID.clone())
             .into();
         let bottom_vec: Vec<Element<Message>> = self

src/launcher/applications.rs → lala_bar/src/launcher/applications.rs

@@ -1,6 +1,8 @@
 use std::path::PathBuf;
 use std::str::FromStr;
 
+use super::LaunchMessage;
+
 use gio::{AppLaunchContext, DesktopAppInfo};
 
 use gio::prelude::*;
@@ -10,7 +12,7 @@ use iced::{Element, Length};
 
 use super::Message;
 
-static DEFAULT_ICON: &[u8] = include_bytes!("../../misc/text-plain.svg");
+static DEFAULT_ICON: &[u8] = include_bytes!("../../../misc/text-plain.svg");
 
 #[allow(unused)]
 #[derive(Debug, Clone)]
@@ -79,7 +81,7 @@ impl App {
             ]
             .spacing(10),
         )
-        .on_press(Message::Launch(index))
+        .on_press(Message::LauncherInfo(LaunchMessage::Launch(index)))
         .width(Length::Fill)
         .height(Length::Fixed(85.))
         .style(if selected {