tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(profile-view): split profile info entries when is_narrow

Browse Source
This commit is contained in:
Fernando López Guevara
2025-07-14 14:04:16 -03:00
committed by William Casarin
parent ab43bdb65a
commit e344b09475
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
crates/notedeck_columns/src/ui/profile/mod.rs
View File

@@ -12,8 +12,8 @@ use crate::{
ui::timeline::{tabs_ui, TimelineTabView}, ui::timeline::{tabs_ui, TimelineTabView},
}; };
use notedeck::{ use notedeck::{
name::get_display_name, profile::get_profile_url, Accounts, IsFollowing, MuteFun, NoteAction, name::get_display_name, profile::get_profile_url, ui::is_narrow, Accounts, IsFollowing,
NoteContext, NotedeckTextStyle, MuteFun, NoteAction, NoteContext, NotedeckTextStyle,
}; };
use notedeck_ui::{ use notedeck_ui::{
app_images, app_images,
@@ -229,20 +229,29 @@ impl<'a, 'd> ProfileView<'a, 'd> {
ui.add(about_section_widget(profile)); ui.add(about_section_widget(profile));
ui.horizontal_wrapped(|ui| { ui.horizontal_wrapped(|ui| {
if let Some(website_url) = profile let website_url = profile
.as_ref() .as_ref()
.map(|p| p.record().profile()) .map(|p| p.record().profile())
.and_then(|p| p.and_then(|p| p.website()).filter(|s| !s.is_empty())) .and_then(|p| p.and_then(|p| p.website()).filter(|s| !s.is_empty()));
{
handle_link(ui, website_url); let lud16 = profile
.as_ref()
.map(|p| p.record().profile())
.and_then(|p| p.and_then(|p| p.lud16()).filter(|s| !s.is_empty()));
if let Some(website_url) = website_url {
ui.horizontal(|ui| {
handle_link(ui, website_url);
});
} }
if let Some(lud16) = profile if let Some(lud16) = lud16 {
.as_ref() if is_narrow(ui.ctx()) && website_url.is_some() {
.map(|p| p.record().profile()) ui.end_row();
.and_then(|p| p.and_then(|p| p.lud16()).filter(|s| !s.is_empty())) }
{ ui.horizontal(|ui| {
handle_lud16(ui, lud16); handle_lud16(ui, lud16);
});
} }
}); });
}); });
@@ -269,6 +278,7 @@ fn handle_link(ui: &mut egui::Ui, website_url: &str) {
if ui if ui
.label(RichText::new(website_url).color(notedeck_ui::colors::PINK)) .label(RichText::new(website_url).color(notedeck_ui::colors::PINK))
.on_hover_cursor(egui::CursorIcon::PointingHand) .on_hover_cursor(egui::CursorIcon::PointingHand)
.on_hover_text(website_url)
.interact(Sense::click()) .interact(Sense::click())
.clicked() .clicked()
{ {
@@ -279,14 +289,11 @@ fn handle_link(ui: &mut egui::Ui, website_url: &str) {
} }
fn handle_lud16(ui: &mut egui::Ui, lud16: &str) { fn handle_lud16(ui: &mut egui::Ui, lud16: &str) {
let img = if ui.visuals().dark_mode { ui.add(app_images::filled_zap_image());
app_images::zap_image()
} else {
app_images::zap_image().tint(egui::Color32::BLACK)
};
ui.add(img);
let _ = ui.label(RichText::new(lud16).color(notedeck_ui::colors::PINK)); let _ = ui
.label(RichText::new(lud16).color(notedeck_ui::colors::PINK))
.on_hover_text(lud16);
} }
fn copy_key_widget(pfp_rect: &egui::Rect) -> impl egui::Widget + '_ { fn copy_key_widget(pfp_rect: &egui::Rect) -> impl egui::Widget + '_ {