From 785d102e80ee20954f94781b1677973d22b0dbe6 Mon Sep 17 00:00:00 2001
From: kernelkind <kernelkind@gmail.com>
Date: Tue, 17 Dec 2024 13:53:21 -0500
Subject: [PATCH] show profile preview for external pubkeys

Closes: https://github.com/damus-io/notedeck/pull/589
Signed-off-by: kernelkind <kernelkind@gmail.com>
Signed-off-by: William Casarin <jb55@jb55.com>
---
 assets/icons/profile_icon_4x.png             | Bin 0 -> 4010 bytes
 crates/notedeck_columns/src/ui/add_column.rs | 100 +++++++++++++------
 2 files changed, 67 insertions(+), 33 deletions(-)
 create mode 100644 assets/icons/profile_icon_4x.png

diff --git a/assets/icons/profile_icon_4x.png b/assets/icons/profile_icon_4x.png
new file mode 100644
index 0000000000000000000000000000000000000000..db877425e0ee44372bb8947a06d8d5ff39d74cca
GIT binary patch
literal 4010
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
QNdN!<07*qoM6N<$f^6ku761SM

literal 0
HcmV?d00001

diff --git a/crates/notedeck_columns/src/ui/add_column.rs b/crates/notedeck_columns/src/ui/add_column.rs
index fa815853..388382bb 100644
--- a/crates/notedeck_columns/src/ui/add_column.rs
+++ b/crates/notedeck_columns/src/ui/add_column.rs
@@ -3,11 +3,10 @@ use std::collections::HashMap;
 
 use egui::{
     pos2, vec2, Align, Button, Color32, FontId, Id, ImageSource, Margin, Pos2, Rect, RichText,
-    Separator, Ui, Vec2,
+    Separator, Ui, Vec2, Widget,
 };
 use enostr::Pubkey;
-use nostrdb::Ndb;
-use tracing::error;
+use nostrdb::{Ndb, Transaction};
 
 use crate::{
     login_manager::AcquireKeyState,
@@ -16,9 +15,9 @@ use crate::{
     Damus,
 };
 
-use notedeck::{AppContext, NotedeckTextStyle, UserAccount};
+use notedeck::{AppContext, ImageCache, NotedeckTextStyle, UserAccount};
 
-use super::{anim::AnimationHelper, padding};
+use super::{anim::AnimationHelper, padding, ProfilePreview};
 
 pub enum AddColumnResponse {
     Timeline(Timeline),
@@ -98,6 +97,7 @@ impl AddColumnOption {
 pub struct AddColumnView<'a> {
     key_state_map: &'a mut HashMap<Id, AcquireKeyState>,
     ndb: &'a Ndb,
+    img_cache: &'a mut ImageCache,
     cur_account: Option<&'a UserAccount>,
 }
 
@@ -105,11 +105,13 @@ impl<'a> AddColumnView<'a> {
     pub fn new(
         key_state_map: &'a mut HashMap<Id, AcquireKeyState>,
         ndb: &'a Ndb,
+        img_cache: &'a mut ImageCache,
         cur_account: Option<&'a UserAccount>,
     ) -> Self {
         Self {
             key_state_map,
             ndb,
+            img_cache,
             cur_account,
         }
     }
@@ -144,7 +146,6 @@ impl<'a> AddColumnView<'a> {
 
     fn external_notification_ui(&mut self, ui: &mut Ui) -> Option<AddColumnResponse> {
         let id = ui.id().with("external_notif");
-
         self.external_ui(ui, id, |pubkey| {
             AddColumnOption::Notification(PubkeySource::Explicit(pubkey))
         })
@@ -176,7 +177,7 @@ impl<'a> AddColumnView<'a> {
         &mut self,
         ui: &mut Ui,
         id: egui::Id,
-        to_tl: fn(Pubkey) -> AddColumnOption,
+        to_option: fn(Pubkey) -> AddColumnOption,
     ) -> Option<AddColumnResponse> {
         padding(16.0, ui, |ui| {
             let key_state = self.key_state_map.entry(id).or_default();
@@ -195,28 +196,40 @@ impl<'a> AddColumnView<'a> {
 
             ui.add(text_edit);
 
-            if ui.button("Add").clicked() {
+            key_state.handle_input_change_after_acquire();
+            key_state.loading_and_error_ui(ui);
+
+            if key_state.get_login_keypair().is_none() && ui.add(find_user_button()).clicked() {
                 key_state.apply_acquire();
             }
 
-            if key_state.is_awaiting_network() {
-                ui.spinner();
-            }
+            let resp = if let Some(keypair) = key_state.get_login_keypair() {
+                let txn = Transaction::new(self.ndb).expect("txn");
+                if let Ok(profile) = self.ndb.get_profile_by_pubkey(&txn, keypair.pubkey.bytes()) {
+                    egui::Frame::window(ui.style())
+                        .outer_margin(Margin {
+                            left: 4.0,
+                            right: 4.0,
+                            top: 12.0,
+                            bottom: 32.0,
+                        })
+                        .show(ui, |ui| {
+                            ProfilePreview::new(&profile, self.img_cache).ui(ui);
+                        });
+                }
 
-            if let Some(error) = key_state.check_for_error() {
-                error!("acquire key error: {}", error);
-                ui.colored_label(
-                    Color32::RED,
-                    "Please enter a valid npub, public hex key or nip05",
-                );
-            }
-
-            if let Some(keypair) = key_state.check_for_successful_login() {
-                key_state.should_create_new();
-                to_tl(keypair.pubkey).take_as_response(self.ndb, self.cur_account)
+                if ui.add(add_column_button()).clicked() {
+                    to_option(keypair.pubkey).take_as_response(self.ndb, self.cur_account)
+                } else {
+                    None
+                }
             } else {
                 None
-            }
+            };
+            if resp.is_some() {
+                self.key_state_map.remove(&id);
+            };
+            resp
         })
         .inner
     }
@@ -360,7 +373,7 @@ impl<'a> AddColumnView<'a> {
         vec.push(ColumnOptionData {
             title: "Individual",
             description: "Stay up to date with someone's notes & replies",
-            icon: egui::include_image!("../../../../assets/icons/notifications_icon_dark_4x.png"),
+            icon: egui::include_image!("../../../../assets/icons/profile_icon_4x.png"),
             option: AddColumnOption::UndecidedIndividual,
         });
 
@@ -410,9 +423,7 @@ impl<'a> AddColumnView<'a> {
             vec.push(ColumnOptionData {
                 title: "Your Notes",
                 description: "Keep track of your notes & replies",
-                icon: egui::include_image!(
-                    "../../../../assets/icons/notifications_icon_dark_4x.png"
-                ),
+                icon: egui::include_image!("../../../../assets/icons/profile_icon_4x.png"),
                 option: AddColumnOption::Individual(source),
             });
         }
@@ -420,7 +431,7 @@ impl<'a> AddColumnView<'a> {
         vec.push(ColumnOptionData {
             title: "Someone else's Notes",
             description: "Stay up to date with someone else's notes & replies",
-            icon: egui::include_image!("../../../../assets/icons/notifications_icon_dark_4x.png"),
+            icon: egui::include_image!("../../../../assets/icons/profile_icon_4x.png"),
             option: AddColumnOption::ExternalIndividual,
         });
 
@@ -428,6 +439,31 @@ impl<'a> AddColumnView<'a> {
     }
 }
 
+fn find_user_button() -> impl Widget {
+    sized_button("Find User")
+}
+
+fn add_column_button() -> impl Widget {
+    sized_button("Add")
+}
+
+fn sized_button(text: &str) -> impl Widget + '_ {
+    move |ui: &mut egui::Ui| -> egui::Response {
+        let painter = ui.painter();
+        let galley = painter.layout(
+            text.to_owned(),
+            NotedeckTextStyle::Body.get_font_id(ui.ctx()),
+            Color32::WHITE,
+            ui.available_width(),
+        );
+
+        ui.add_sized(
+            galley.rect.expand2(vec2(16.0, 8.0)).size(),
+            Button::new(galley).rounding(8.0).fill(crate::colors::PINK),
+        )
+    }
+}
+
 struct ColumnOptionData {
     title: &'static str,
     description: &'static str,
@@ -445,6 +481,7 @@ pub fn render_add_column_routes(
     let mut add_column_view = AddColumnView::new(
         &mut app.view_state.id_state_map,
         ctx.ndb,
+        ctx.img_cache,
         ctx.accounts.get_selected_account(),
     );
     let resp = match route {
@@ -519,7 +556,7 @@ pub fn hashtag_ui(
     id_string_map: &mut HashMap<Id, String>,
 ) -> Option<AddColumnResponse> {
     padding(16.0, ui, |ui| {
-        let id = ui.id().with("hashtag");
+        let id = ui.id().with("hashtag)");
         let text_buffer = id_string_map.entry(id).or_default();
 
         let text_edit = egui::TextEdit::singleline(text_buffer)
@@ -535,10 +572,7 @@ pub fn hashtag_ui(
 
         ui.add_space(8.0);
         if ui
-            .add_sized(
-                egui::vec2(50.0, 40.0),
-                Button::new("Add").rounding(8.0).fill(crate::colors::PINK),
-            )
+            .add_sized(egui::vec2(50.0, 40.0), add_column_button())
             .clicked()
         {
             let resp = AddColumnOption::Hashtag(text_buffer.to_owned()).take_as_response(ndb, None);