feat: update nav to use custom title renderer via trait

Since we added the new trait-based title rendering, let's switch our
title implementation to use it. For all this all we get is the ability
to:

- Handle the TitledRoute type directly in the title renderer
- Return custom responses

All without exploding the Nav's type signature too much thanks to the
associated type on the trait.

Next up is including more data in the titled response, such as the
profile urls. I tried to do this without TitledRoute but we can't
pass Column and Ndb references into our title renderer without borrow
issues.

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

Author: jb55

Cargo.lock

@@ -26,7 +26,7 @@ eframe = { workspace = true }
 egui_extras = { workspace = true }
 ehttp = "0.2.0"
 egui_tabs = { git = "https://github.com/damus-io/egui-tabs", branch = "egui-0.28" }
-egui_nav = { git = "https://github.com/damus-io/egui-nav", rev = "fd0900bdff4be35709372e921f2b49f68b261469" }
+egui_nav = { git = "https://github.com/damus-io/egui-nav", rev = "475fe105739cc2b40613acb6d935c0cb72cddcc4" }
 egui_virtual_list = { git = "https://github.com/jb55/hello_egui", branch = "egui-0.28", package = "egui_virtual_list" }
 reqwest = { version = "0.12.4", default-features = false, features = [ "rustls-tls-native-roots" ] }
 image = { version = "0.25", features = ["jpeg", "png", "webp"] }

Cargo.toml

@@ -1,8 +1,6 @@
 use crate::{
     accounts::render_accounts_route,
     actionbar::NoteAction,
-    app_style::{get_font_size, NotedeckTextStyle},
-    fonts::NamedFontFamily,
     notes_holder::NotesHolder,
     profile::Profile,
     relay_pool_manager::RelayPoolManager,
@@ -15,16 +13,15 @@ use crate::{
     ui::{
         self,
         add_column::render_add_column_routes,
-        anim::{AnimationHelper, ICON_EXPANSION_MULTIPLE},
+        column::{NavColumnHeader, TitleResponse},
         note::{PostAction, PostType},
         support::SupportView,
         RelayView, View,
     },
     Damus,
 };
 
-use egui::{pos2, Color32, InnerResponse, Stroke};
-use egui_nav::{Nav, NavAction, NavResponse, TitleBarResponse};
+use egui_nav::{Nav, NavAction, NavResponse};
 use nostrdb::{Ndb, Transaction};
 use tracing::{error, info};
 
@@ -45,17 +42,16 @@ impl From<NoteAction> for RenderNavAction {
     }
 }
 
+pub type NotedeckNavResponse = NavResponse<Option<RenderNavAction>, TitleResponse>;
+
 pub struct RenderNavResponse {
     column: usize,
-    response: NavResponse<Option<RenderNavAction>, TitleResponse>,
+    response: NotedeckNavResponse,
 }
 
 impl RenderNavResponse {
     #[allow(private_interfaces)]
-    pub fn new(
-        column: usize,
-        response: NavResponse<Option<RenderNavAction>, TitleResponse>,
-    ) -> Self {
+    pub fn new(column: usize, response: NotedeckNavResponse) -> Self {
         RenderNavResponse { column, response }
     }
 
@@ -135,8 +131,14 @@ impl RenderNavResponse {
             col_changed = true;
         }
 
-        if let Some(title_response) = &self.response.title_response {
-            match title_response {
+        if let Some(response) = &self.response.title_response {
+            match response.inner {
+                TitleResponse::GoBack => {
+                    app.columns_mut().column_mut(col).router_mut().go_back();
+                }
+
+                TitleResponse::Nothing => {}
+
                 TitleResponse::RemoveColumn => {
                     let tl = app.columns().find_timeline_for_column_index(col);
                     if let Some(timeline) = tl {
@@ -166,11 +168,10 @@ pub fn render_nav(col: usize, app: &mut Damus, ui: &mut egui::Ui) -> RenderNavRe
         .map(|r| r.get_titled_route(&app.columns, &app.ndb))
         .collect();
 
-    let nav_response = Nav::new(routes)
+    let nav_response = Nav::new(routes, NavColumnHeader::new())
         .navigating(app.columns_mut().column_mut(col).router_mut().navigating)
         .returning(app.columns_mut().column_mut(col).router_mut().returning)
         .id_source(egui::Id::new(col_id))
-        .title(48.0, title_bar)
         .show_mut(ui, |ui, nav| match &nav.top().route {
             Route::Timeline(tlr) => render_timeline_route(
                 &app.ndb,
@@ -211,7 +212,7 @@ pub fn render_nav(col: usize, app: &mut Damus, ui: &mut egui::Ui) -> RenderNavRe
                 let kp = app.accounts.get_selected_account()?.to_full()?;
                 let draft = app.drafts.compose_mut();
 
-                let txn = nostrdb::Transaction::new(&app.ndb).expect("txn");
+                let txn = Transaction::new(&app.ndb).expect("txn");
                 let post_response = ui::PostView::new(
                     &app.ndb,
                     draft,
@@ -252,172 +253,3 @@ fn unsubscribe_timeline(ndb: &Ndb, timeline: &Timeline) {
         }
     }
 }
-
-fn title_bar(
-    ui: &mut egui::Ui,
-    allocated_response: egui::Response,
-    title_name: String,
-    back_name: Option<String>,
-) -> egui::InnerResponse<TitleBarResponse<TitleResponse>> {
-    let icon_width = 32.0;
-    let padding_external = 16.0;
-    let padding_internal = 8.0;
-    let has_back = back_name.is_some();
-
-    let (spacing_rect, titlebar_rect) = allocated_response
-        .rect
-        .split_left_right_at_x(allocated_response.rect.left() + padding_external);
-    ui.advance_cursor_after_rect(spacing_rect);
-
-    let (titlebar_resp, maybe_button_resp) = if has_back {
-        let (button_rect, titlebar_rect) = titlebar_rect
-            .split_left_right_at_x(allocated_response.rect.left() + icon_width + padding_external);
-        (
-            allocated_response.with_new_rect(titlebar_rect),
-            Some(back_button(ui, button_rect)),
-        )
-    } else {
-        (allocated_response, None)
-    };
-
-    title(
-        ui,
-        title_name,
-        titlebar_resp.rect,
-        icon_width,
-        if has_back {
-            padding_internal
-        } else {
-            padding_external
-        },
-    );
-
-    let delete_button_resp = delete_column_button(ui, titlebar_resp, icon_width, padding_external);
-    let title_response = if delete_button_resp.clicked() {
-        Some(TitleResponse::RemoveColumn)
-    } else {
-        None
-    };
-
-    let titlebar_resp = TitleBarResponse {
-        title_response,
-        go_back: maybe_button_resp.map_or(false, |r| r.clicked()),
-    };
-
-    InnerResponse::new(titlebar_resp, delete_button_resp)
-}
-
-fn back_button(ui: &mut egui::Ui, button_rect: egui::Rect) -> egui::Response {
-    let horizontal_length = 10.0;
-    let arrow_length = 5.0;
-
-    let helper = AnimationHelper::new_from_rect(ui, "note-compose-button", button_rect);
-    let painter = ui.painter_at(helper.get_animation_rect());
-    let stroke = Stroke::new(1.5, ui.visuals().text_color());
-
-    // Horizontal segment
-    let left_horizontal_point = pos2(-horizontal_length / 2., 0.);
-    let right_horizontal_point = pos2(horizontal_length / 2., 0.);
-    let scaled_left_horizontal_point = helper.scale_pos_from_center(left_horizontal_point);
-    let scaled_right_horizontal_point = helper.scale_pos_from_center(right_horizontal_point);
-
-    painter.line_segment(
-        [scaled_left_horizontal_point, scaled_right_horizontal_point],
-        stroke,
-    );
-
-    // Top Arrow
-    let sqrt_2_over_2 = std::f32::consts::SQRT_2 / 2.;
-    let right_top_arrow_point = helper.scale_pos_from_center(pos2(
-        left_horizontal_point.x + (sqrt_2_over_2 * arrow_length),
-        right_horizontal_point.y + sqrt_2_over_2 * arrow_length,
-    ));
-
-    let scaled_left_arrow_point = scaled_left_horizontal_point;
-    painter.line_segment([scaled_left_arrow_point, right_top_arrow_point], stroke);
-
-    let right_bottom_arrow_point = helper.scale_pos_from_center(pos2(
-        left_horizontal_point.x + (sqrt_2_over_2 * arrow_length),
-        right_horizontal_point.y - sqrt_2_over_2 * arrow_length,
-    ));
-
-    painter.line_segment([scaled_left_arrow_point, right_bottom_arrow_point], stroke);
-
-    helper.take_animation_response()
-}
-
-fn delete_column_button(
-    ui: &mut egui::Ui,
-    allocation_response: egui::Response,
-    icon_width: f32,
-    padding: f32,
-) -> egui::Response {
-    let img_size = 16.0;
-    let max_size = icon_width * ICON_EXPANSION_MULTIPLE;
-
-    let img_data = if ui.visuals().dark_mode {
-        egui::include_image!("../assets/icons/column_delete_icon_4x.png")
-    } else {
-        egui::include_image!("../assets/icons/column_delete_icon_light_4x.png")
-    };
-    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 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() {
-        img.paint_at(ui, animation_rect.shrink((max_size - cur_img_size) / 2.0));
-    }
-
-    animation_resp
-}
-
-fn title(
-    ui: &mut egui::Ui,
-    title_name: String,
-    titlebar_rect: egui::Rect,
-    icon_width: f32,
-    padding: f32,
-) {
-    let painter = ui.painter_at(titlebar_rect);
-
-    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.;
-    let title_galley =
-        ui.fonts(|f| f.layout(title_name, font, ui.visuals().text_color(), max_title_width));
-
-    let pos = {
-        let titlebar_center = titlebar_rect.center();
-        let text_height = title_galley.rect.height();
-
-        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)
-    };
-
-    painter.galley(pos, title_galley, Color32::WHITE);
-}
-
-enum TitleResponse {
-    RemoveColumn,
-}

src/nav.rs

@@ -33,7 +33,7 @@ fn is_empty(s: &str) -> bool {
     s.chars().all(|c| c.is_whitespace())
 }
 
-pub fn get_profile_name<'a>(record: &'a ProfileRecord) -> Option<DisplayName<'a>> {
+pub fn get_profile_name<'a>(record: &ProfileRecord<'a>) -> Option<DisplayName<'a>> {
     let profile = record.record().profile()?;
     let display_name = profile.display_name().filter(|n| !is_empty(n));
     let name = profile.name().filter(|n| !is_empty(n));

src/profile.rs

@@ -1,5 +1,5 @@
 use enostr::{NoteId, Pubkey};
-use nostrdb::Ndb;
+use nostrdb::{Ndb, Transaction};
 use serde::{Deserialize, Serialize};
 use std::fmt::{self};
 
@@ -87,16 +87,32 @@ impl Route {
                     timeline.kind.to_title(ndb)
                 }
                 TimelineRoute::Thread(id) => {
-                    format!("{}'s Thread", get_note_users_displayname_string(ndb, id))
+                    let txn = Transaction::new(ndb).expect("txn");
+                    format!(
+                        "{}'s Thread",
+                        get_note_users_displayname_string(&txn, ndb, id)
+                    )
                 }
                 TimelineRoute::Reply(id) => {
-                    format!("{}'s Reply", get_note_users_displayname_string(ndb, id))
+                    let txn = Transaction::new(ndb).expect("txn");
+                    format!(
+                        "{}'s Reply",
+                        get_note_users_displayname_string(&txn, ndb, id)
+                    )
                 }
                 TimelineRoute::Quote(id) => {
-                    format!("{}'s Quote", get_note_users_displayname_string(ndb, id))
+                    let txn = Transaction::new(ndb).expect("txn");
+                    format!(
+                        "{}'s Quote",
+                        get_note_users_displayname_string(&txn, ndb, id)
+                    )
                 }
                 TimelineRoute::Profile(pubkey) => {
-                    format!("{}'s Profile", get_profile_displayname_string(ndb, pubkey))
+                    let txn = Transaction::new(ndb).expect("txn");
+                    format!(
+                        "{}'s Profile",
+                        get_profile_displayname_string(&txn, ndb, pubkey)
+                    )
                 }
             },
 

src/route.rs

@@ -171,22 +171,33 @@ impl TimelineKind {
             TimelineKind::List(list_kind) => match list_kind {
                 ListKind::Contact(pubkey_source) => match pubkey_source {
                     PubkeySource::Explicit(pubkey) => {
-                        format!("{}'s Contacts", get_profile_displayname_string(ndb, 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) => format!(
-                    "{}'s Notifications",
-                    get_profile_displayname_string(ndb, pk)
-                ),
+                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) => {
-                    format!("{}'s Profile", get_profile_displayname_string(ndb, pk))
+                    let txn = Transaction::new(ndb).expect("txn");
+                    format!(
+                        "{}'s Profile",
+                        get_profile_displayname_string(&txn, ndb, pk)
+                    )
                 }
             },
             TimelineKind::Universe => "Universe".to_owned(),