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

6
crates/notedeck_dave/src/ui/dave.rs
View File

@@ -5,7 +5,7 @@ use crate::{
use egui::{Align, Key, KeyboardShortcut, Layout, Modifiers};
use nostrdb::{Ndb, Transaction};
use notedeck::{Accounts, AppContext, Images, NoteAction, NoteContext};
use notedeck_ui::{icons::search_icon, jobs::JobsCache, NoteOptions, ProfilePic};
use notedeck_ui::{app_images, icons::search_icon, jobs::JobsCache, NoteOptions, ProfilePic};
/// DaveUi holds all of the data it needs to render itself
pub struct DaveUi<'a> {
@@ -216,6 +216,7 @@ impl<'a> DaveUi<'a> {
zaps: ctx.zaps,
pool: ctx.pool,
job_pool: ctx.job_pool,
unknown_ids: ctx.unknown_ids,
current_account_has_wallet: false,
};
@@ -359,8 +360,7 @@ fn new_chat_button() -> impl egui::Widget {
let img_size = 24.0;
let max_size = 32.0;
let img_data = egui::include_image!("../../../../assets/icons/newmessage_64.png");
let img = egui::Image::new(img_data).max_width(img_size);
let img = app_images::new_message_image().max_width(img_size);
let helper = notedeck_ui::anim::AnimationHelper::new(
ui,