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

Merge remote-tracking branches 'github/pr/877' and 'github/pr/885'
Some checks failed
CI / Rustfmt + Clippy (push) Has been cancelled
Details
CI / Check (android) (push) Has been cancelled
Details
CI / Test (Linux) (push) Has been cancelled
Details
CI / Test (macOS) (push) Has been cancelled
Details
CI / Test (Windows) (push) Has been cancelled
Details
CI / rpm/deb (aarch64) (push) Has been cancelled
Details
CI / rpm/deb (x86_64) (push) Has been cancelled
Details
CI / macOS dmg (aarch64) (push) Has been cancelled
Details
CI / macOS dmg (x86_64) (push) Has been cancelled
Details
CI / Windows Installer (aarch64) (push) Has been cancelled
Details
CI / Windows Installer (x86_64) (push) Has been cancelled
Details
CI / Upload Artifacts to Server (push) Has been cancelled
Details

Browse Source 
Fernando López Guevara (2):
      fix(content): handle case where notes are not loaded
      feat(app_images): add module to manage static app image assets
This commit is contained in:
William Casarin
2025-06-25 10:29:49 -07:00
parent 5010d3662d 36667bc024 c6dbb0e856
commit 400050f3fb
25 changed files with 382 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/notedeck_columns/src/ui/note/post.rs
View File

@@ -14,6 +14,7 @@ use egui::{
};
use enostr::{FilledKeypair, FullKeypair, KeypairUnowned, NoteId, Pubkey, RelayPool};
use nostrdb::{Ndb, Transaction};
use notedeck_ui::app_images;
use notedeck_ui::blur::PixelDimensions;
use notedeck_ui::images::{get_render_state, RenderState};
use notedeck_ui::jobs::JobsCache;
@@ -640,11 +641,15 @@ fn media_upload_button() -> impl egui::Widget {
painter.rect_filled(resp.rect, 8.0, fill_color);
painter.rect_stroke(resp.rect, 8.0, stroke, egui::StrokeKind::Middle);
egui::Image::new(egui::include_image!(
"../../../../../assets/icons/media_upload_dark_4x.png"
))
.max_size(egui::vec2(16.0, 16.0))
.paint_at(ui, resp.rect.shrink(8.0));
let mut upload_img = app_images::media_upload_dark_image();
if !ui.visuals().dark_mode {
upload_img = upload_img.tint(egui::Color32::BLACK);
};
upload_img
.max_size(egui::vec2(16.0, 16.0))
.paint_at(ui, resp.rect.shrink(8.0));
resp
}
}
@@ -785,6 +790,7 @@ mod preview {
zaps: app.zaps,
pool: app.pool,
job_pool: app.job_pool,
unknown_ids: app.unknown_ids,
current_account_has_wallet: false,
};