changed default image

Author: alanpoon

resources/img/default_image.png

@@ -199,7 +199,7 @@ live_design! {
                         // Tooltips must be shown in front of all other UI elements,
                         // since they can be shown as a hover atop any other widget.
                         app_tooltip = <CalloutTooltip> {}
-                        
+
                         image_viewer_modal = <ImageViewerModal> {}
                     }
                 } // end of body
@@ -248,6 +248,7 @@ impl LiveHook for App {
         // Here we set the global singleton for the PopupList widget,
         // which is used to access PopupList Widget from anywhere in the app.
         crate::shared::popup_list::set_global_popup_list(cx, &self.ui);
+        crate::shared::image_viewer_modal::set_global_image_viewer_modal(cx, self.ui.image_viewer_modal(id!(image_viewer_modal)));
     }
 }
 
@@ -257,7 +258,6 @@ impl MatchEvent for App {
         // such that background threads/tasks will be able to can access it.
         let _app_data_dir = crate::app_data_dir();
         log!("App::handle_startup(): app_data_dir: {:?}", _app_data_dir);
-        crate::shared::image_viewer_modal::set_global_image_viewer_modal(cx, self.ui.image_viewer_modal(id!(image_viewer_modal)));
 
         if let Err(e) = persistence::load_window_state(self.ui.window(id!(main_window)), cx) {
             error!("Failed to load window state: {}", e);
@@ -414,12 +414,6 @@ impl MatchEvent for App {
                 continue;
             }
 
-            match action.as_widget_action().cast() {
-                crate::shared::image_viewer_modal::ImageViewerAction::Clicked(mxc_uri) => {
-                    self.ui.image_viewer_modal(id!(image_viewer_modal)).open(cx, Some(mxc_uri));
-                }
-                _ => {}
-            }
             // // message source modal handling.
             // match action.as_widget_action().cast() {
             //     MessageAction::MessageSourceModalOpen { room_id: _, event_id: _, original_json: _ } => {

src/app.rs

@@ -32,7 +32,7 @@ use crate::{
         user_profile::{AvatarState, ShowUserProfileAction, UserProfile, UserProfileAndRoomId, UserProfilePaneInfo, UserProfileSlidingPaneRef, UserProfileSlidingPaneWidgetExt},
         user_profile_cache,
     }, shared::{
-        avatar::AvatarWidgetRefExt, callout_tooltip::TooltipAction, html_or_plaintext::{HtmlOrPlaintextRef, HtmlOrPlaintextWidgetRefExt, RobrixHtmlLinkAction}, image_viewer_modal::ImageViewerModalWidgetExt, jump_to_bottom_button::{JumpToBottomButtonWidgetExt, UnreadMessageCount}, popup_list::{enqueue_popup_notification, PopupItem, PopupKind}, restore_status_view::RestoreStatusViewWidgetExt, styles::COLOR_FG_DANGER_RED, text_or_image::{TextOrImageRef, TextOrImageWidgetRefExt}, timestamp::TimestampWidgetRefExt, typing_animation::TypingAnimationWidgetExt
+        avatar::AvatarWidgetRefExt, callout_tooltip::TooltipAction, html_or_plaintext::{HtmlOrPlaintextRef, HtmlOrPlaintextWidgetRefExt, RobrixHtmlLinkAction}, jump_to_bottom_button::{JumpToBottomButtonWidgetExt, UnreadMessageCount}, popup_list::{enqueue_popup_notification, PopupItem, PopupKind}, restore_status_view::RestoreStatusViewWidgetExt, styles::COLOR_FG_DANGER_RED, text_or_image::{TextOrImageRef, TextOrImageWidgetRefExt}, timestamp::TimestampWidgetRefExt, typing_animation::TypingAnimationWidgetExt
     }, sliding_sync::{get_client, submit_async_request, take_timeline_endpoints, BackwardsPaginateUntilEventRequest, MatrixRequest, PaginationDirection, TimelineRequestSender, UserPowerLevels}, utils::{self, room_name_or_id, unix_time_millis_to_datetime, ImageFormat, MEDIA_THUMBNAIL_FORMAT}
 };
 use crate::home::event_reaction_list::ReactionListWidgetRefExt;
@@ -753,7 +753,7 @@ live_design! {
             // The user profile sliding pane should be displayed on top of other "static" subviews
             // (on top of all other views that are always visible).
             user_profile_sliding_pane = <UserProfileSlidingPane> { }
-            image_viewer_modal = <ImageViewerModal> {}
+            
             // The loading pane appears while the user is waiting for something in the room screen
             // to finish loading, e.g., when loading an older replied-to message.
             //loading_pane = <LoadingPane> { }
@@ -870,7 +870,6 @@ impl Widget for RoomScreen {
             //       and wrap it in a `if let Event::Signal` conditional.
             user_profile_cache::process_user_profile_updates(cx);
             avatar_cache::process_avatar_updates(cx);
-
         }
 
         if let Event::Actions(actions) = event {
@@ -981,12 +980,6 @@ impl Widget for RoomScreen {
                         );
                     }
                 }
-                if let Some(crate::shared::image_viewer_modal::ImageViewerAction::Test) = action.downcast_ref() {
-                    println!("test");
-                    self.view.image_viewer_modal(id!(image_viewer_modal)).open(cx, None);
-                }
-                
-            
             }
 
             /*
@@ -1200,8 +1193,6 @@ impl Widget for RoomScreen {
             // Forward the event to the inner timeline view, but capture any actions it produces
             // such that we can handle the ones relevant to only THIS RoomScreen widget right here and now,
             // ensuring they are not mistakenly handled by other RoomScreen widget instances.
-            self.view.handle_event(cx, event, &mut room_scope);
-            return;
             let mut actions_generated_within_this_room_screen = cx.capture_actions(|cx|
                 self.view.handle_event(cx, event, &mut room_scope)
             );
@@ -3556,10 +3547,6 @@ fn populate_image_message_content(
                 } else {
                     // Add click handler for the image
                     let _mxc_uri_clone = mxc_uri.clone();
-                    // text_or_image_ref.set_image_click_handler(cx, move |cx| {
-                    //     let image_viewer_modal = cx.get_global::<ImageViewerModalRef>();
-                    //     image_viewer_modal.open(cx, mxc_uri_clone.clone());
-                    // });
                 }
 
                 // We're done drawing the image, so mark it as fully drawn.
@@ -3608,13 +3595,6 @@ fn populate_image_message_content(
                         let err_str = format!("{body}\n\nFailed to display image: {e:?}");
                         error!("{err_str}");
                         text_or_image_ref.show_text(cx, &err_str);
-                    } else {
-                        // Add click handler for the blurhash image
-                        let _mxc_uri_clone = mxc_uri.clone();
-                        // text_or_image_ref.set_image_click_handler(cx, move |cx| {
-                        //     let image_viewer_modal = cx.get_global::<ImageViewerModalRef>();
-                        //     image_viewer_modal.open(cx, mxc_uri_clone.clone());
-                        // });
                     }
                 }
                 fully_drawn = false;
@@ -4283,12 +4263,8 @@ impl Widget for Message {
         // clickable or otherwise interactive.
         match event.hits(cx, self.view(id!(replied_to_message)).area()) {
             Hit::FingerDown(fe) => {
-                // cx.set_key_focus(self.view(id!(replied_to_message)).area());
-                // println!("Opening context menu for replied-to message preview");
-                //self.view.image_viewer_modal(id!(image_viewer_modal)).open(cx, None);
+                cx.set_key_focus(self.view(id!(replied_to_message)).area());
                 if fe.device.mouse_button().is_some_and(|b| b.is_secondary()) {
-                    println!("Opening context menu for replied-to message preview");
-                    self.view.image_viewer_modal(id!(image_viewer_modal)).open(cx, None);
                     cx.widget_action(
                         details.room_screen_widget_uid,
                         &scope.path,
@@ -4297,7 +4273,6 @@ impl Widget for Message {
                             abs_pos: fe.abs,
                         }
                     );
-                    
                 }
             }
             Hit::FingerLongPress(lp) => {
@@ -4336,11 +4311,8 @@ impl Widget for Message {
         match event.hits(cx, message_view_area) {
             Hit::FingerDown(fe) => {
                 cx.set_key_focus(message_view_area);
-                
                 // A right click means we should display the context menu.
                 if fe.device.mouse_button().is_some_and(|b| b.is_secondary()) {
-                    println!("Opening context menu for replied-to message preview");
-                cx.action(crate::shared::image_viewer_modal::ImageViewerAction::Test);
                     cx.widget_action(
                         details.room_screen_widget_uid,
                         &scope.path,

src/home/room_screen.rs

@@ -330,9 +330,6 @@ impl MatchEvent for LoginScreen {
             || password_input.returned(actions).is_some()
             || homeserver_input.returned(actions).is_some()
         {
-            // let image_viewer_modal = crate::shared::image_viewer_modal::get_global_image_viewer_modal(cx);
-            // image_viewer_modal.open(cx, None);
-            // return;
             let user_id = user_id_input.text();
             let password = password_input.text();
             let homeserver = homeserver_input.text();