Searching messages in a room (not encrypted)

src/app.rs

@@ -21,11 +21,11 @@ use crate::{
     },
     login::login_screen::LoginAction,
     persistence,
-    shared::callout_tooltip::{
+    shared::{callout_tooltip::{
         CalloutTooltipOptions,
         CalloutTooltipWidgetRefExt,
         TooltipAction,
-    },
+    }, message_search_input_bar::MessageSearchAction},
     sliding_sync::current_user_id,
     utils::{
         room_name_or_id,
@@ -153,6 +153,8 @@ impl LiveRegister for App {
         crate::settings::live_design(cx);
         crate::room::live_design(cx);
         crate::join_leave_room_modal::live_design(cx);
+        crate::right_panel::live_design(cx);
+        crate::right_panel::search_message::live_design(cx);
         crate::verification_modal::live_design(cx);
         crate::home::live_design(cx);
         crate::profile::live_design(cx);
@@ -243,6 +245,7 @@ impl MatchEvent for App {
                     &Scope::default().path,
                     StackNavigationAction::Push(live_id!(main_content_view))
                 );
+                self.ui.view(id!(message_search_input_view)).set_visible(cx, true);
                 self.ui.redraw(cx);
                 continue;
             }
@@ -251,10 +254,12 @@ impl MatchEvent for App {
             match action.as_widget_action().cast() {
                 AppStateAction::RoomFocused(selected_room) => {
                     self.app_state.selected_room = Some(selected_room.clone());
+                    self.ui.view(id!(message_search_input_view)).set_visible(cx, true);
                     continue;
                 }
                 AppStateAction::FocusNone => {
                     self.app_state.selected_room = None;
+                    self.ui.view(id!(message_search_input_view)).set_visible(cx, false);
                     continue;
                 }
                 AppStateAction::UpgradedInviteToJoinedRoom(room_id) => {
@@ -345,6 +350,13 @@ impl MatchEvent for App {
             //     }
             //     _ => {}
             // }
+            if let MessageSearchAction::Click(_) = action.as_widget_action().cast() {
+                cx.widget_action(
+                    self.ui.widget_uid(),
+                    &Scope::default().path,
+                    StackNavigationAction::Push(live_id!(search_result_view))
+                );
+            }
         }
     }
 }

src/home/home_screen.rs

@@ -12,8 +12,11 @@ live_design! {
     use crate::home::spaces_dock::SpacesDock;
     use crate::shared::styles::*;
     use crate::shared::room_filter_input_bar::RoomFilterInputBar;
+    use crate::shared::message_search_input_bar::MessageSearchInputBar;
+    use crate::shared::icon_button::RobrixIconButton;
     use crate::home::main_desktop_ui::MainDesktopUI;
     use crate::settings::settings_screen::SettingsScreen;
+    use crate::right_panel::*;
 
     NavigationWrapper = {{NavigationWrapper}} {
         view_stack = <StackNavigation> {}
@@ -51,11 +54,32 @@ live_design! {
                     main_page = <View> {
                         width: Fill, height: Fill
                         flow: Down
-
-                        <CachedWidget> {
-                            room_filter_input_bar = <RoomFilterInputBar> {}
+                        <View> {
+                            width: Fill, height: Fit
+                            flow: Right,
+                            <CachedWidget> {
+                                room_filter_input_bar = <RoomFilterInputBar> {
+                                    align: {x: 0.0 }
+                                }
+                            }
+                            message_search_input_view = <View> {
+                                width: Fill, height: Fit,
+                                visible: false,
+                                align: {x: 1.0},
+                                <CachedWidget> {
+                                    message_search_input_bar = <MessageSearchInputBar> {
+                                        width: 300,
+                                    }
+                                }
+                            }
+                        }
+
+                        <View> {
+                            width: Fill, height: Fill
+                            flow: Right
+                            <MainDesktopUI> {}
+                            <RightPanel> {}
                         }
-                        <MainDesktopUI> {}
                     }
 
                     settings_page = <View> {
@@ -128,12 +152,57 @@ live_design! {
                                             }
                                         }
                                     }
+                                    <View> {
+                                        height: Fit,
+                                        width: Fill,
+                                        align: {x: 1.0 }
+                                        mobile_message_search_input_view = <View> {
+                                            height: Fit,
+                                            width: 140,
+                                            visible: false,
+                                            <CachedWidget> {
+                                                message_search_input_bar = <MessageSearchInputBar> {
+                                                    width: 300
+                                                }
+                                            }
+                                        }
+                                    }
                                 }
                             }
                             body = {
                                 main_content = <MainMobileUI> {}
                             }
                         }
+                        search_result_view = <SearchResultView> {
+                            flow: Overlay
+                            header = {
+                                height: 50.0,
+                                margin: { top: 30.0 },
+                                content = {
+                                    flow: Right,
+                                    title_container = {
+                                        width: 0
+                                    }
+                                    button_container = <View> {
+                                        align: { y: 0.5 }
+                                        left_button = <RobrixIconButton> {
+                                            draw_icon: {
+                                                color: #666;
+                                            }
+                                            text: "Back"
+                                        }
+                                    }
+                                    <CachedWidget> {
+                                        message_search_input_bar = <MessageSearchInputBar> {
+                                            width: 300
+                                        }
+                                    }
+                                }
+                            }
+                            body = {
+                                margin: { top: 80.0 },
+                            }
+                        }
                     }
                 }
             }

src/home/main_desktop_ui.rs

@@ -2,9 +2,8 @@ use makepad_widgets::*;
 use matrix_sdk::ruma::OwnedRoomId;
 use std::collections::HashMap;
 
-use crate::{app::{AppState, AppStateAction, SelectedRoom}, utils::room_name_or_id};
+use crate::{app::{AppState, AppStateAction, SelectedRoom}, shared::message_search_input_bar::MessageSearchAction, utils::room_name_or_id};
 use super::{invite_screen::InviteScreenWidgetRefExt, room_screen::RoomScreenWidgetRefExt, rooms_list::RoomsListAction};
-
 live_design! {
     use link::theme::*;
     use link::shaders::*;
@@ -214,6 +213,7 @@ impl MainDesktopUI {
         dock.close_tab(cx, tab_id);
         self.tab_to_close = None;
         self.open_rooms.remove(&tab_id);
+        cx.widget_action(self.widget_uid(), &Scope::empty().path, MessageSearchAction::Clear);
     }
 
     /// Replaces an invite with a joined room in the dock.
@@ -381,6 +381,19 @@ impl WidgetMatchEvent for MainDesktopUI {
 
                     if let Some(ref selected_room) = &app_state.selected_room {
                         self.focus_or_create_tab(cx, selected_room.clone());
+                        // Call DockSave action to display the search message input box when a room is open.
+                        cx.widget_action(
+                            self.widget_uid(), 
+                            &HeapLiveIdPath::default(), 
+                            AppStateAction::RoomFocused(selected_room.clone())
+                        );
+                    } else {
+                        // If there is no selected room, focus on the home tab.
+                        cx.widget_action(
+                            self.widget_uid(),
+                            &HeapLiveIdPath::default(),
+                            AppStateAction::FocusNone,
+                        );
                     }
                     self.view.redraw(cx);
                 }