Merge remote-tracking branches 'github/pr/877' and 'github/pr/885'

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

Author: jb55

Cargo.lock

@@ -5,6 +5,7 @@ pub use action::{MediaAction, NoteAction, ZapAction, ZapTargetAmount};
 pub use context::{BroadcastContext, ContextSelection, NoteContextSelection};
 
 use crate::JobPool;
+use crate::UnknownIds;
 use crate::{notecache::NoteCache, zaps::Zaps, Images};
 use enostr::{NoteId, RelayPool};
 use nostrdb::{Ndb, Note, NoteKey, QueryResult, Transaction};
@@ -21,6 +22,7 @@ pub struct NoteContext<'d> {
     pub zaps: &'d mut Zaps,
     pub pool: &'d mut RelayPool,
     pub job_pool: &'d mut JobPool,
+    pub unknown_ids: &'d mut UnknownIds,
     pub current_account_has_wallet: bool,
 }
 

crates/notedeck/src/note/mod.rs

@@ -201,7 +201,11 @@ impl UnknownIds {
             return;
         }
 
-        self.ids.entry(UnknownId::Pubkey(*pubkey)).or_default();
+        let unknown_id = UnknownId::Pubkey(*pubkey);
+        if self.ids.contains_key(&unknown_id) {
+            return;
+        }
+        self.ids.entry(unknown_id).or_default();
         self.mark_updated();
     }
 
@@ -211,9 +215,11 @@ impl UnknownIds {
             return;
         }
 
-        self.ids
-            .entry(UnknownId::Id(NoteId::new(*note_id)))
-            .or_default();
+        let unknown_id = UnknownId::Id(NoteId::new(*note_id));
+        if self.ids.contains_key(&unknown_id) {
+            return;
+        }
+        self.ids.entry(unknown_id).or_default();
         self.mark_updated();
     }
 }

crates/notedeck/src/unknowns.rs

@@ -12,7 +12,7 @@ use notedeck::{
 use notedeck_columns::{timeline::kind::ListKind, timeline::TimelineKind, Damus};
 
 use notedeck_dave::{Dave, DaveAvatar};
-use notedeck_ui::{AnimationHelper, ProfilePic};
+use notedeck_ui::{app_images, AnimationHelper, ProfilePic};
 
 static ICON_WIDTH: f32 = 40.0;
 pub static ICON_EXPANSION_MULTIPLE: f32 = 1.2;
@@ -438,8 +438,7 @@ fn milestone_name() -> impl Widget {
 fn expand_side_panel_button() -> impl Widget {
     |ui: &mut egui::Ui| -> egui::Response {
         let img_size = 40.0;
-        let img_data = egui::include_image!("../../../assets/damus_rounded_80.png");
-        let img = egui::Image::new(img_data)
+        let img = app_images::damus_image()
             .max_width(img_size)
             .sense(egui::Sense::click());
 
@@ -450,17 +449,16 @@ fn expand_side_panel_button() -> impl Widget {
 fn expanding_button(
     name: &'static str,
     img_size: f32,
-    light_img: &egui::ImageSource,
-    dark_img: &egui::ImageSource,
+    light_img: egui::Image,
+    dark_img: egui::Image,
     ui: &mut egui::Ui,
 ) -> egui::Response {
     let max_size = ICON_WIDTH * ICON_EXPANSION_MULTIPLE; // max size of the widget
-    let img_data = if ui.visuals().dark_mode {
+    let img = if ui.visuals().dark_mode {
         dark_img
     } else {
         light_img
     };
-    let img = egui::Image::new(img_data.clone()).max_width(img_size);
 
     let helper = AnimationHelper::new(ui, name, egui::vec2(max_size, max_size));
 
@@ -479,8 +477,8 @@ fn support_button(ui: &mut egui::Ui) -> egui::Response {
     expanding_button(
         "help-button",
         16.0,
-        &egui::include_image!("../../../assets/icons/help_icon_inverted_4x.png"),
-        &egui::include_image!("../../../assets/icons/help_icon_dark_4x.png"),
+        app_images::help_light_image(),
+        app_images::help_dark_image(),
         ui,
     )
 }
@@ -489,8 +487,8 @@ fn settings_button(ui: &mut egui::Ui) -> egui::Response {
     expanding_button(
         "settings-button",
         32.0,
-        &egui::include_image!("../../../assets/icons/settings_light_4x.png"),
-        &egui::include_image!("../../../assets/icons/settings_dark_4x.png"),
+        app_images::settings_light_image(),
+        app_images::settings_dark_image(),
         ui,
     )
 }
@@ -499,8 +497,8 @@ fn notifications_button(ui: &mut egui::Ui) -> egui::Response {
     expanding_button(
         "notifications-button",
         24.0,
-        &egui::include_image!("../../../assets/icons/notifications_dark_4x.png"),
-        &egui::include_image!("../../../assets/icons/notifications_dark_4x.png"),
+        app_images::notifications_button_image(),
+        app_images::notifications_button_image(),
         ui,
     )
 }
@@ -509,15 +507,20 @@ fn home_button(ui: &mut egui::Ui) -> egui::Response {
     expanding_button(
         "home-button",
         24.0,
-        &egui::include_image!("../../../assets/icons/home-toolbar.png"),
-        &egui::include_image!("../../../assets/icons/home-toolbar.png"),
+        app_images::home_button_image(),
+        app_images::home_button_image(),
         ui,
     )
 }
 
 fn columns_button(ui: &mut egui::Ui) -> egui::Response {
-    let btn = egui::include_image!("../../../assets/icons/columns_80.png");
-    expanding_button("columns-button", 40.0, &btn, &btn, ui)
+    expanding_button(
+        "columns-button",
+        40.0,
+        app_images::columns_image(),
+        app_images::columns_image(),
+        ui,
+    )
 }
 
 fn dave_sidebar_rect(ui: &mut egui::Ui) -> Rect {
@@ -574,9 +577,8 @@ fn wallet_button() -> impl Widget {
         let img_size = 24.0;
 
         let max_size = img_size * ICON_EXPANSION_MULTIPLE;
-        let img_data = egui::include_image!("../../../assets/icons/wallet-icon.svg");
 
-        let mut img = egui::Image::new(img_data).max_width(img_size);
+        let mut img = app_images::wallet_image().max_width(img_size);
 
         if !ui.visuals().dark_mode {
             img = img.tint(egui::Color32::BLACK);

crates/notedeck_chrome/src/chrome.rs

@@ -3,6 +3,7 @@ use crate::{fonts, theme};
 use eframe::NativeOptions;
 use egui::ThemePreference;
 use notedeck::{AppSizeHandler, DataPath};
+use notedeck_ui::app_images;
 use tracing::info;
 
 pub fn setup_chrome(ctx: &egui::Context, args: &notedeck::Args, theme: ThemePreference) {
@@ -53,9 +54,7 @@ pub fn generate_native_options(paths: DataPath) -> NativeOptions {
             .with_fullsize_content_view(true)
             .with_titlebar_shown(false)
             .with_title_shown(false)
-            .with_icon(std::sync::Arc::new(
-                eframe::icon_data::from_png_bytes(app_icon()).expect("icon"),
-            ));
+            .with_icon(std::sync::Arc::new(app_images::app_icon()));
 
         if let Some(window_size) = AppSizeHandler::new(&paths).get_app_size() {
             builder.with_inner_size(window_size)
@@ -68,9 +67,8 @@ pub fn generate_native_options(paths: DataPath) -> NativeOptions {
         // for 3d widgets
         depth_buffer: 24,
         window_builder: Some(window_builder),
-        viewport: egui::ViewportBuilder::default().with_icon(std::sync::Arc::new(
-            eframe::icon_data::from_png_bytes(app_icon()).expect("icon"),
-        )),
+        viewport: egui::ViewportBuilder::default()
+            .with_icon(std::sync::Arc::new(app_images::app_icon())),
         ..Default::default()
     }
 }
@@ -89,17 +87,13 @@ fn generate_native_options_with_builder_modifiers(
     }
 }
 
-pub fn app_icon() -> &'static [u8; 271986] {
-    std::include_bytes!("../../../assets/damus-app-icon.png")
-}
-
 pub fn generate_mobile_emulator_native_options() -> eframe::NativeOptions {
     generate_native_options_with_builder_modifiers(|builder| {
         builder
             .with_fullsize_content_view(true)
             .with_titlebar_shown(false)
             .with_title_shown(false)
             .with_inner_size([405.0, 915.0])
-            .with_icon(eframe::icon_data::from_png_bytes(app_icon()).expect("icon"))
+            .with_icon(app_images::app_icon())
     })
 }

crates/notedeck_chrome/src/setup.rs

@@ -420,11 +420,11 @@ fn render_nav_body(
         zaps: ctx.zaps,
         pool: ctx.pool,
         job_pool: ctx.job_pool,
+        unknown_ids: ctx.unknown_ids,
         current_account_has_wallet: get_current_wallet(ctx.accounts, ctx.global_wallet).is_some(),
     };
     match top {
         Route::Timeline(kind) => render_timeline_route(
-            ctx.unknown_ids,
             &mut app.timeline_cache,
             ctx.accounts,
             kind,
@@ -436,7 +436,6 @@ fn render_nav_body(
             &mut app.jobs,
         ),
         Route::Thread(selection) => render_thread_route(
-            ctx.unknown_ids,
             &mut app.threads,
             ctx.accounts,
             selection,

crates/notedeck_columns/src/nav.rs

@@ -6,12 +6,11 @@ use crate::{
 };
 
 use enostr::Pubkey;
-use notedeck::{Accounts, MuteFun, NoteContext, UnknownIds};
+use notedeck::{Accounts, MuteFun, NoteContext};
 use notedeck_ui::{jobs::JobsCache, NoteOptions};
 
 #[allow(clippy::too_many_arguments)]
 pub fn render_timeline_route(
-    unknown_ids: &mut UnknownIds,
     timeline_cache: &mut TimelineCache,
     accounts: &mut Accounts,
     kind: &TimelineKind,
@@ -50,7 +49,6 @@ pub fn render_timeline_route(
                     pubkey,
                     accounts,
                     timeline_cache,
-                    unknown_ids,
                     col,
                     ui,
                     &accounts.mutefun(),
@@ -79,7 +77,6 @@ pub fn render_timeline_route(
 
 #[allow(clippy::too_many_arguments)]
 pub fn render_thread_route(
-    unknown_ids: &mut UnknownIds,
     threads: &mut Threads,
     accounts: &mut Accounts,
     selection: &ThreadSelection,
@@ -95,7 +92,6 @@ pub fn render_thread_route(
 
     ui::ThreadView::new(
         threads,
-        unknown_ids,
         selection.selected_or_root(),
         note_options,
         &accounts.mutefun(),
@@ -113,7 +109,6 @@ pub fn render_profile_route(
     pubkey: &Pubkey,
     accounts: &Accounts,
     timeline_cache: &mut TimelineCache,
-    unknown_ids: &mut UnknownIds,
     col: usize,
     ui: &mut egui::Ui,
     is_muted: &MuteFun,
@@ -127,7 +122,6 @@ pub fn render_profile_route(
         col,
         timeline_cache,
         note_options,
-        unknown_ids,
         is_muted,
         note_context,
         jobs,

crates/notedeck_columns/src/timeline/route.rs

@@ -1,13 +1,16 @@
 use crate::login_manager::AcquireKeyState;
 use crate::ui::{Preview, PreviewConfig};
 use egui::{
-    Align, Button, Color32, Frame, Image, InnerResponse, Margin, RichText, TextBuffer, Vec2,
+    Align, Button, Color32, Frame, InnerResponse, Layout, Margin, RichText, TextBuffer, TextEdit,
+    Vec2,
 };
-use egui::{Layout, TextEdit};
 use egui_winit::clipboard::Clipboard;
 use enostr::Keypair;
 use notedeck::{fonts::get_font_size, AppAction, NotedeckTextStyle};
-use notedeck_ui::context_menu::{input_context, PasteBehavior};
+use notedeck_ui::{
+    app_images,
+    context_menu::{input_context, PasteBehavior},
+};
 
 pub struct AccountLoginView<'a> {
     manager: &'a mut AcquireKeyState,
@@ -138,15 +141,15 @@ fn login_textedit(manager: &mut AcquireKeyState) -> TextEdit {
 
 fn eye_button(ui: &mut egui::Ui, is_visible: bool) -> egui::Response {
     let is_dark_mode = ui.visuals().dark_mode;
-    let icon = Image::new(if is_visible && is_dark_mode {
-        egui::include_image!("../../../../assets/icons/eye-dark.png")
+    let icon = if is_visible && is_dark_mode {
+        app_images::eye_dark_image()
     } else if is_visible {
-        egui::include_image!("../../../../assets/icons/eye-light.png")
+        app_images::eye_light_image()
     } else if is_dark_mode {
-        egui::include_image!("../../../../assets/icons/eye-slash-dark.png")
+        app_images::eye_slash_dark_image()
     } else {
-        egui::include_image!("../../../../assets/icons/eye-slash-light.png")
-    });
+        app_images::eye_slash_light_image()
+    };
     ui.add(Button::image(icon).frame(false))
 }
 

crates/notedeck_columns/src/ui/account_login_view.rs

@@ -1,10 +1,11 @@
 use egui::{
-    Align, Button, Frame, Image, InnerResponse, Layout, RichText, ScrollArea, Ui, UiBuilder, Vec2,
+    Align, Button, Frame, InnerResponse, Layout, RichText, ScrollArea, Ui, UiBuilder, Vec2,
 };
 use nostrdb::{Ndb, Transaction};
 use notedeck::{Accounts, Images};
 use notedeck_ui::colors::PINK;
 
+use notedeck_ui::app_images;
 use notedeck_ui::profile::preview::SimpleProfilePreview;
 
 pub struct AccountsView<'a> {
@@ -175,10 +176,8 @@ fn scroll_area() -> ScrollArea {
 }
 
 fn add_account_button() -> Button<'static> {
-    let img_data = egui::include_image!("../../../../assets/icons/add_account_icon_4x.png");
-    let img = Image::new(img_data).fit_to_exact_size(Vec2::new(48.0, 48.0));
     Button::image_and_text(
-        img,
+        app_images::add_account_image().fit_to_exact_size(Vec2::new(48.0, 48.0)),
         RichText::new(" Add account")
             .size(16.0)
             // TODO: this color should not be hard coded. Find some way to add it to the visuals