update state view

Author: alanpoon

src/home/room_screen.rs

@@ -30,7 +30,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::{get_global_image_viewer_modal, load_image_data, show_state, LoadState, IMAGE_LOAD_TIMEOUT}, 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::{TextOrImageAction, TextOrImageRef, TextOrImageWidgetRefExt}, timestamp::TimestampWidgetRefExt, typing_animation::TypingAnimationWidgetExt
+        avatar::AvatarWidgetRefExt, callout_tooltip::TooltipAction, html_or_plaintext::{HtmlOrPlaintextRef, HtmlOrPlaintextWidgetRefExt, RobrixHtmlLinkAction}, image_viewer_modal::{get_global_image_viewer_modal, load_image_data, update_state_views, LoadState, IMAGE_LOAD_TIMEOUT}, 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::{TextOrImageAction, 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;
@@ -4447,18 +4447,18 @@ fn populate_image_modal(cx: &mut Cx, timer: &mut Timer, mxc_uri: Option<OwnedMxc
                     },
                     Err(_) => {
                         cx.stop_timer(*timer);
-                        show_state(cx, view_set, 1);
+                        update_state_views(cx, view_set, LoadState::Error);
                         return LoadState::Error;
                     }
                 }
             }
             (MediaCacheEntry::Requested, _)
             | (MediaCacheEntry::Loaded(_), MediaFormat::Thumbnail(_)) => {
-                show_state(cx, view_set, 0);
+                update_state_views(cx, view_set, LoadState::Loading);
             }
             (MediaCacheEntry::Failed, _) => {
                 cx.stop_timer(*timer);
-                show_state(cx, view_set, 1);
+                update_state_views(cx, view_set, LoadState::Error);
             }
         }
     }

src/shared/image_viewer_modal.rs

@@ -516,18 +516,20 @@ fn round_to_3_decimal_places(dvec2: DVec2) -> DVec2 {
     }
 }
 
-/// Shows the view at the given state index in the provided view set,
+/// Shows the view at the given load state in the provided view set,
 /// and hides all other views in the set. The zoomable image is also
 /// hidden.
 /// 
-/// The ViewSet that contains the loading, error and timeout views.
-pub fn show_state(cx: &mut Cx, view_set: ViewSet, state_index: usize) {
+/// The ViewSet is in this order: the loading, error and timeout views.
+pub fn update_state_views(cx: &mut Cx, view_set: ViewSet, load_state: LoadState) {
     for (i, view_ref) in view_set.iter().enumerate() {
-        if i == state_index {
-            view_ref.set_visible(cx, true);
-        } else {
-            view_ref.set_visible(cx, false);
-        }
+        let should_show = match load_state {
+            LoadState::Loading => i == 0,
+            LoadState::Error => i == 1,
+            LoadState::Timeout => i == 2,
+            LoadState::Loaded => false, // Hide all views when loaded
+        };
+        view_ref.set_visible(cx, should_show);
     }
 }
 
@@ -549,4 +551,5 @@ pub enum LoadState {
     Loading,
     Loaded,
     Error,
+    Timeout,
 }

src/shared/text_or_image.rs

@@ -5,7 +5,7 @@
 
 use makepad_widgets::*;
 use matrix_sdk::ruma::{OwnedMxcUri, OwnedRoomId};
-use crate::shared::image_viewer_modal::{get_global_image_viewer_modal, show_state};
+use crate::shared::image_viewer_modal::{get_global_image_viewer_modal, update_state_views, LoadState};
 use crate::home::room_screen::RoomScreenProps;
 
 live_design! {
@@ -79,7 +79,7 @@ impl Widget for TextOrImage {
                     let image_viewer_modal = get_global_image_viewer_modal(cx);
                     if let Some(view_set) = image_viewer_modal.get_view_set() {
                         // Display Loading spinner
-                        show_state(cx, view_set, 0);
+                        update_state_views(cx, view_set, LoadState::Loading);
                     }
                     // Get room_id from RoomScreenProps in scope
                     if let Some(room_props) = scope.props.get::<RoomScreenProps>() {