aljaz/notedeck
1
0
Fork 0
mirror of https://github.com/aljazceru/notedeck.git synced 2026-01-15 06:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename ui::Note to ui::NoteView

Browse Source 
Easier to jump to when using tags.

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-07-10 09:52:33 -07:00
parent f795fe6088
commit 61bc9d9919
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib.rs
View File

@@ -18,6 +18,7 @@ mod key_parsing;
mod key_storage;
pub mod login_manager;
mod macos_key_storage;
mod note;
mod notecache;
mod post;
mod profile;

4
src/timeline.rs
View File

@@ -347,7 +347,9 @@ pub fn timeline_view(ui: &mut egui::Ui, app: &mut Damus, timeline: usize) {
ui::padding(8.0, ui, |ui| {
let textmode = app.textmode;
let resp = ui::Note::new(app, &note).note_previews(!textmode).show(ui);
let resp = ui::NoteView::new(app, &note)
.note_previews(!textmode)
.show(ui);
if let Some(action) = resp.action {
debug!("bar action: {:?}", action);

2
src/ui/mod.rs
View File

@@ -17,7 +17,7 @@ pub use account_switcher::AccountSelectionWidget;
pub use fixed_window::{FixedWindow, FixedWindowResponse};
pub use global_popup::DesktopGlobalPopup;
pub use mention::Mention;
pub use note::{BarAction, Note, NoteResponse, PostReplyView, PostView};
pub use note::{BarAction, NoteResponse, NoteView, PostReplyView, PostView};
pub use preview::{Preview, PreviewApp, PreviewConfig};
pub use profile::{profile_preview_controller, ProfilePic, ProfilePreview};
pub use relay::RelayView;

2
src/ui/note/contents.rs
View File

@@ -89,7 +89,7 @@ fn render_note_preview(
ui.visuals().noninteractive().bg_stroke.color,
))
.show(ui, |ui| {
ui::Note::new(app, &note)
ui::NoteView::new(app, &note)
.actionbar(false)
.small_pfp(true)
.note_previews(false)

10
src/ui/note/mod.rs
View File

@@ -12,7 +12,7 @@ use crate::{colors, notecache::CachedNote, ui, ui::View, Damus};
use egui::{Label, RichText, Sense};
use nostrdb::{NoteKey, Transaction};
pub struct Note<'a> {
pub struct NoteView<'a> {
app: &'a mut Damus,
note: &'a nostrdb::Note<'a>,
flags: NoteOptions,
@@ -23,7 +23,7 @@ pub struct NoteResponse {
pub action: Option<BarAction>,
}
impl<'a> View for Note<'a> {
impl<'a> View for NoteView<'a> {
fn ui(&mut self, ui: &mut egui::Ui) {
self.show(ui);
}
@@ -114,10 +114,10 @@ fn reply_desc(
}
}
impl<'a> Note<'a> {
impl<'a> NoteView<'a> {
pub fn new(app: &'a mut Damus, note: &'a nostrdb::Note<'a>) -> Self {
let flags = NoteOptions::actionbar | NoteOptions::note_previews;
Note { app, note, flags }
Self { app, note, flags }
}
pub fn actionbar(mut self, enable: bool) -> Self {
@@ -225,7 +225,7 @@ impl<'a> Note<'a> {
ui,
egui::Id::new((profile_key, note_key)),
pfp_size,
ui::Note::expand_size(),
ui::NoteView::expand_size(),
anim_speed,
);

9
src/ui/note/reply.rs
View File

@@ -39,13 +39,14 @@ impl<'a> PostReplyView<'a> {
+ ui::PostView::inner_margin()
+ ui::ProfilePic::small_size() / 2.0;
let note_offset =
pfp_offset - ui::ProfilePic::medium_size() / 2.0 - ui::Note::expand_size() / 2.0;
let note_offset = pfp_offset
- ui::ProfilePic::medium_size() / 2.0
- ui::NoteView::expand_size() / 2.0;
egui::Frame::none()
.outer_margin(egui::Margin::same(note_offset))
.show(ui, |ui| {
ui::Note::new(self.app, self.note)
ui::NoteView::new(self.app, self.note)
.actionbar(false)
.medium_pfp(true)
.show(ui);
@@ -111,7 +112,7 @@ impl<'a> PostReplyView<'a> {
rect.min.y = avail_rect.min.y
+ (ui::ProfilePic::medium_size() / 2.0
+ ui::ProfilePic::medium_size()
+ ui::Note::expand_size() * 2.0)
+ ui::NoteView::expand_size() * 2.0)
+ 1.0;
// For some reason we need to nudge the reply line's height a