Merge branch 'devel' of git.cscherr.de:PlexSheep/beatbaer into devel

src/player/mod.rs

@@ -60,7 +60,12 @@ impl Player {
     }
 
     fn entries(&self) -> Vec<Entry> {
-        let e = Entry::new(ui::entry::Kind::Album, "boom boom boom.", None);
+        let e = Entry::new(
+            ui::entry::Kind::Album,
+            "boom boom boom.",
+            "boomerboom",
+            None,
+        );
         let mut v = vec![e.clone()];
         for _ in 0..100 {
             v.push(e.clone());

src/player/ui/entry.rs

@@ -12,15 +12,17 @@ pub enum Kind {
 pub struct Entry {
     pub kind: Kind,
     pub title: String,
+    pub subtitle: String,
     /// image url because I can't be bothered to use lifetimes everywhere
     pub img_url: Option<String>,
 }
 
 impl Entry {
-    pub fn new(kind: Kind, title: &str, img: Option<String>) -> Self {
+    pub fn new(kind: Kind, title: &str, subtitle: &str, img: Option<String>) -> Self {
         Self {
             kind,
             title: title.to_owned(),
+            subtitle: subtitle.to_owned(),
             img_url: img,
         }
     }

src/player/ui/mod.rs

@@ -9,7 +9,6 @@ use self::showbox::ShowBox;
 
 use super::*;
 
-const ICON_RAW_PATH: &str = "file://../../../assets/img/icon-512.jpg";
 const ICON_RAW: &[u8; 36525] = include_bytes!("../../../assets/img/icon-512.jpg");
 
 impl Player {

src/player/ui/showbox.rs

@@ -1,6 +1,7 @@
-use egui::Color32;
+use egui::text::LayoutJob;
+use egui::{Color32, FontFamily, FontId, ImageSource, Label, TextFormat};
 
-use super::Entry;
+use super::{Entry, ICON_RAW};
 
 pub struct ShowBox {
     entry: Entry,
@@ -22,16 +23,25 @@ impl egui::Widget for ShowBox {
         egui::Frame::none()
             // .fill(Color32::DARK_GRAY)
             .show(ui, |ui| {
-                ui.label("Label with red background");
                 ui.vertical_centered(|ui| {
-                    ui.add(
+                    let mut r = ui.add(
                         egui::Image::new(self.entry.img())
                             .rounding(5.0)
                             .bg_fill(Color32::DARK_GRAY)
                             .shrink_to_fit()
                             .maintain_aspect_ratio(true),
                     );
-                    ui.button("i dont get it").union(ui.label("caption"))
+                    let mut job = LayoutJob::default();
+                    job.append(
+                        &self.entry.title,
+                        0.0,
+                        TextFormat {
+                            font_id: FontId::new(14.0, FontFamily::Proportional),
+                            ..Default::default()
+                        },
+                    );
+                    r.union(ui.add(Label::new(job)));
+                    r.union(ui.label(&self.entry.subtitle));
                 })
             })
             .response