wip: render profile pics in column headers

Signed-off-by: William Casarin <[email protected]>

Author: jb55

src/route.rs

@@ -1,7 +1,10 @@
 use enostr::{NoteId, Pubkey};
 use nostrdb::{Ndb, Transaction};
 use serde::{Deserialize, Serialize};
-use std::fmt::{self};
+use std::{
+    borrow::Cow,
+    fmt::{self},
+};
 
 use crate::{
     accounts::AccountsRoute,
@@ -65,61 +68,37 @@ impl Route {
         Route::Accounts(AccountsRoute::AddAccount)
     }
 
-    pub fn title(&self, columns: &Columns, ndb: &Ndb) -> String {
+    pub fn title(&self, columns: &Columns) -> Cow<'static, str> {
         match self {
             Route::Timeline(tlr) => match tlr {
                 TimelineRoute::Timeline(id) => {
                     let timeline = columns
                         .find_timeline(*id)
                         .expect("expected to find timeline");
-                    timeline.kind.to_title(ndb)
-                }
-                TimelineRoute::Thread(id) => {
-                    let txn = Transaction::new(ndb).expect("txn");
-                    format!(
-                        "{}'s Thread",
-                        get_note_users_displayname_string(&txn, ndb, id)
-                    )
-                }
-                TimelineRoute::Reply(id) => {
-                    let txn = Transaction::new(ndb).expect("txn");
-                    format!(
-                        "{}'s Reply",
-                        get_note_users_displayname_string(&txn, ndb, id)
-                    )
-                }
-                TimelineRoute::Quote(id) => {
-                    let txn = Transaction::new(ndb).expect("txn");
-                    format!(
-                        "{}'s Quote",
-                        get_note_users_displayname_string(&txn, ndb, id)
-                    )
-                }
-                TimelineRoute::Profile(pubkey) => {
-                    let txn = Transaction::new(ndb).expect("txn");
-                    format!(
-                        "{}'s Profile",
-                        get_profile_displayname_string(&txn, ndb, pubkey)
-                    )
+                    timeline.kind.to_title()
                 }
+                TimelineRoute::Thread(_id) => Cow::Borrowed("Thread"),
+                TimelineRoute::Reply(_id) => Cow::Borrowed("Reply"),
+                TimelineRoute::Quote(_id) => Cow::Borrowed("Quote"),
+                TimelineRoute::Profile(_pubkey) => Cow::Borrowed("Profile"),
             },
 
-            Route::Relays => "Relays".to_owned(),
+            Route::Relays => Cow::Borrowed("Relays"),
 
             Route::Accounts(amr) => match amr {
-                AccountsRoute::Accounts => "Accounts".to_owned(),
-                AccountsRoute::AddAccount => "Add Account".to_owned(),
+                AccountsRoute::Accounts => Cow::Borrowed("Accounts"),
+                AccountsRoute::AddAccount => Cow::Borrowed("Add Account"),
             },
-            Route::ComposeNote => "Compose Note".to_owned(),
+            Route::ComposeNote => Cow::Borrowed("Compose Note"),
             Route::AddColumn(c) => match c {
-                AddColumnRoute::Base => "Add Column".to_owned(),
-                AddColumnRoute::UndecidedNotification => "Add Notifications Column".to_owned(),
+                AddColumnRoute::Base => Cow::Borrowed("Add Column"),
+                AddColumnRoute::UndecidedNotification => Cow::Borrowed("Add Notifications Column"),
                 AddColumnRoute::ExternalNotification => {
-                    "Add External Notifications Column".to_owned()
+                    Cow::Borrowed("Add External Notifications Column")
                 }
-                AddColumnRoute::Hashtag => "Add Hashtag Column".to_owned(),
+                AddColumnRoute::Hashtag => Cow::Borrowed("Add Hashtag Column"),
             },
-            Route::Support => "Damus Support".to_owned(),
+            Route::Support => Cow::Borrowed("Damus Support"),
         }
     }
 }

src/timeline/kind.rs

@@ -6,7 +6,7 @@ use crate::ui::profile::preview::get_profile_displayname_string;
 use enostr::{Filter, Pubkey};
 use nostrdb::{Ndb, Transaction};
 use serde::{Deserialize, Serialize};
-use std::fmt::Display;
+use std::{borrow::Cow, fmt::Display};
 use tracing::{error, warn};
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -194,43 +194,16 @@ impl TimelineKind {
         }
     }
 
-    pub fn to_title(&self, ndb: &Ndb) -> String {
+    pub fn to_title(&self) -> Cow<'static, str> {
         match self {
             TimelineKind::List(list_kind) => match list_kind {
-                ListKind::Contact(pubkey_source) => match pubkey_source {
-                    PubkeySource::Explicit(pubkey) => {
-                        let txn = Transaction::new(ndb).expect("txn");
-                        format!(
-                            "{}'s Contacts",
-                            get_profile_displayname_string(&txn, ndb, pubkey)
-                        )
-                    }
-                    PubkeySource::DeckAuthor => "Contacts".to_owned(),
-                },
-            },
-            TimelineKind::Notifications(pubkey_source) => match pubkey_source {
-                PubkeySource::DeckAuthor => "Notifications".to_owned(),
-                PubkeySource::Explicit(pk) => {
-                    let txn = Transaction::new(ndb).expect("txn");
-                    format!(
-                        "{}'s Notifications",
-                        get_profile_displayname_string(&txn, ndb, pk)
-                    )
-                }
-            },
-            TimelineKind::Profile(pubkey_source) => match pubkey_source {
-                PubkeySource::DeckAuthor => "Profile".to_owned(),
-                PubkeySource::Explicit(pk) => {
-                    let txn = Transaction::new(ndb).expect("txn");
-                    format!(
-                        "{}'s Profile",
-                        get_profile_displayname_string(&txn, ndb, pk)
-                    )
-                }
+                ListKind::Contact(_pubkey_source) => Cow::Borrowed("Contacts"),
             },
-            TimelineKind::Universe => "Universe".to_owned(),
-            TimelineKind::Generic => "Custom Filter".to_owned(),
-            TimelineKind::Hashtag(hashtag) => format!("#{}", hashtag),
+            TimelineKind::Notifications(_pubkey_source) => Cow::Borrowed("Notifications"),
+            TimelineKind::Profile(pubkey_source) => Cow::Borrowed("Profile"),
+            TimelineKind::Universe => Cow::Borrowed("Universe"),
+            TimelineKind::Generic => Cow::Borrowed("Custom"),
+            TimelineKind::Hashtag(hashtag) => Cow::Owned(format!("#{}", hashtag)),
         }
     }
 }

src/ui/column/header.rs

@@ -12,7 +12,7 @@ use crate::{
     },
 };
 
-use egui::{pos2, Color32, Stroke};
+use egui::{pos2, Color32, RichText, Stroke};
 use enostr::Pubkey;
 use nostrdb::{Ndb, Transaction};
 
@@ -56,7 +56,6 @@ impl<'a> NavTitle<'a> {
     ) -> Option<RenderNavAction> {
         let icon_width = 32.0;
         let padding_external = 16.0;
-        let padding_internal = 8.0;
         let has_back = prev(self.routes).is_some();
 
         let (spacing_rect, titlebar_rect) = allocated_response
@@ -77,20 +76,7 @@ impl<'a> NavTitle<'a> {
             (allocated_response, None)
         };
 
-        self.title(
-            ui,
-            self.routes.last().unwrap(),
-            titlebar_resp.rect,
-            icon_width,
-            if has_back {
-                padding_internal
-            } else {
-                padding_external
-            },
-        );
-
-        let delete_button_resp =
-            self.delete_column_button(ui, titlebar_resp, icon_width, padding_external);
+        let delete_button_resp = self.title(ui, self.routes.last().unwrap());
 
         if delete_button_resp.clicked() {
             Some(RenderNavAction::RemoveColumn)
@@ -143,7 +129,6 @@ impl<'a> NavTitle<'a> {
     fn delete_column_button(
         &self,
         ui: &mut egui::Ui,
-        allocation_response: egui::Response,
         icon_width: f32,
         padding: f32,
     ) -> egui::Response {
@@ -157,26 +142,15 @@ impl<'a> NavTitle<'a> {
         };
         let img = egui::Image::new(img_data).max_width(img_size);
 
-        let button_rect = {
-            let titlebar_rect = allocation_response.rect;
-            let titlebar_width = titlebar_rect.width();
-            let titlebar_center = titlebar_rect.center();
-            let button_center_y = titlebar_center.y;
-            let button_center_x =
-                titlebar_center.x + (titlebar_width / 2.0) - (max_size / 2.0) - padding;
-            egui::Rect::from_center_size(
-                pos2(button_center_x, button_center_y),
-                egui::vec2(max_size, max_size),
-            )
-        };
-
-        let helper = AnimationHelper::new_from_rect(ui, "delete-column-button", button_rect);
+        let helper =
+            AnimationHelper::new(ui, "delete-column-button", egui::vec2(max_size, max_size));
 
         let cur_img_size = helper.scale_1d_pos(img_size);
 
         let animation_rect = helper.get_animation_rect();
         let animation_resp = helper.take_animation_response();
-        if allocation_response.union(animation_resp.clone()).hovered() {
+
+        if animation_resp.hovered() {
             img.paint_at(ui, animation_rect.shrink((max_size - cur_img_size) / 2.0));
         }
 
@@ -217,7 +191,7 @@ impl<'a> NavTitle<'a> {
     }
 
     fn title_pfp(&mut self, ui: &mut egui::Ui, top: &Route) {
-        let pfp_size = 48.0;
+        let pfp_size = 32.0;
         match top {
             Route::Timeline(tlr) => match tlr {
                 TimelineRoute::Timeline(tlid) => {
@@ -249,44 +223,23 @@ impl<'a> NavTitle<'a> {
         }
     }
 
-    fn title(
-        &mut self,
-        ui: &mut egui::Ui,
-        top: &Route,
-        titlebar_rect: egui::Rect,
-        icon_width: f32,
-        padding: f32,
-    ) {
-        let painter = ui.painter_at(titlebar_rect);
-
-        self.title_pfp(ui, top);
-
-        let font = egui::FontId::new(
-            get_font_size(ui.ctx(), &NotedeckTextStyle::Body),
-            egui::FontFamily::Name(NamedFontFamily::Bold.as_str().into()),
-        );
-
-        let max_title_width = titlebar_rect.width() - icon_width - padding * 2.;
+    fn title(&mut self, ui: &mut egui::Ui, top: &Route) -> egui::Response {
+        ui.horizontal(|ui| {
+            ui.spacing_mut().item_spacing.x = 10.0;
 
-        let title_galley = ui.fonts(|f| {
-            f.layout(
-                top.to_string(),
-                font,
-                ui.visuals().text_color(),
-                max_title_width,
-            )
-        });
-
-        let pos = {
-            let titlebar_center = titlebar_rect.center();
-            let text_height = title_galley.rect.height();
+            self.title_pfp(ui, top);
 
-            let galley_pos_x = titlebar_rect.left() + padding;
-            let galley_pos_y = titlebar_center.y - (text_height / 2.);
-            pos2(galley_pos_x, galley_pos_y)
-        };
+            ui.label(
+                RichText::new(top.title(self.columns))
+                    .text_style(NotedeckTextStyle::Body.text_style()),
+            );
 
-        painter.galley(pos, title_galley, Color32::WHITE);
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                self.delete_column_button(ui, 32.0, 10.0)
+            })
+            .inner
+        })
+        .inner
     }
 }