change to MessageSearchAction

Author: alanpoon

src/app.rs

@@ -4,7 +4,7 @@ use makepad_widgets::*;
 use matrix_sdk::ruma::{OwnedRoomId, RoomId};
 
 use crate::{
-    home::{new_message_context_menu::NewMessageContextMenuWidgetRefExt, room_screen::MessageAction, rooms_list::RoomsListAction}, login::login_screen::LoginAction, shared::{callout_tooltip::{CalloutTooltipOptions, CalloutTooltipWidgetRefExt, TooltipAction}, popup_list::PopupNotificationAction}, utils::room_name_or_id, verification::VerificationAction, verification_modal::{VerificationModalAction, VerificationModalWidgetRefExt}
+    home::{new_message_context_menu::NewMessageContextMenuWidgetRefExt, room_screen::MessageAction, rooms_list::RoomsListAction}, login::login_screen::LoginAction, shared::{callout_tooltip::{CalloutTooltipOptions, CalloutTooltipWidgetRefExt, TooltipAction}, message_search_input_bar::MessageSearchAction, popup_list::PopupNotificationAction}, utils::room_name_or_id, verification::VerificationAction, verification_modal::{VerificationModalAction, VerificationModalWidgetRefExt}
 };
 
 live_design! {
@@ -242,6 +242,7 @@ impl MatchEvent for App {
                     &Scope::default().path,
                     StackNavigationAction::NavigateTo(live_id!(main_content_view))
                 );
+                self.ui.view(id!(message_search_input_view)).set_visible(cx, true);
                 self.ui.redraw(cx);
             }
 
@@ -251,6 +252,7 @@ impl MatchEvent for App {
                 }
                 AppStateAction::FocusNone => {
                     self.app_state.selected_room = None;
+                    self.ui.view(id!(message_search_input_view)).set_visible(cx, false);
                 }
                 AppStateAction::UpgradedInviteToJoinedRoom(room_id) => {
                     if let Some(selected_room) = self.app_state.selected_room.as_mut() {
@@ -318,6 +320,24 @@ impl MatchEvent for App {
             //     }
             //     _ => {}
             // }
+            match action.as_widget_action().cast() {
+                MessageSearchAction::Click(_) => {
+                    self.ui
+                        .view(id!(main_content_view.header.content.message_search_input_mobile_view))
+                        .apply_over(cx, live!{
+                            width: 220
+                        });
+                }
+                MessageSearchAction::Clear => {
+                    self.ui
+                        .view(id!(main_content_view.header.content.message_search_input_mobile_view))
+                        .apply_over(cx, live!{
+                            width: 150
+                        });
+                }
+                _ => {}
+            }
+
         }
     }
 }

src/home/home_screen.rs

@@ -10,6 +10,7 @@ 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::home::main_desktop_ui::MainDesktopUI;
 
     NavigationWrapper = {{NavigationWrapper}} {
@@ -32,11 +33,30 @@ live_design! {
 
             <View> {
                 flow: Down
-                width: Fill, height: Fill
-
-                <CachedWidget> {
-                    <RoomFilterInputBar> {}
+                width: Fill, height: Fill,
+                spacing: 2,
+                <View> {
+                    flow: Overlay,
+                    width: Fill,
+                    height: Fit,
+                    <CachedWidget> {
+                        <RoomFilterInputBar> {
+                            width: 300
+                        }
+                    }
+                    message_search_input_view = <View> {
+                        width: Fill, height: Fit,
+                        visible: false,
+                        align: {x: 1.0},
+                        <CachedWidget> {
+                            message_search_input_bar = <MessageSearchInputBar> {
+                                width: 300,
+                            }
+                        }
+                    }
+                    
                 }
+                
                 <MainDesktopUI> {}
             }
         }
@@ -75,6 +95,21 @@ live_design! {
                                         }
                                     }
                                 }
+                                <View> {
+                                    height: Fit,
+                                    width: Fill,
+                                    align: {x: 1.0 }
+                                    message_search_input_mobile_view = <View> {
+                                        height: Fit,
+                                        width: 150,
+                                        align: {x: 1.0 }
+                                        <CachedWidget> {
+                                            message_search_input_bar = <MessageSearchInputBar> {
+                                                width: 300
+                                            }
+                                        }
+                                    }
+                                }
                             }
                         }
                         body = {

src/home/invite_screen.rs

@@ -108,7 +108,7 @@ live_design! {
                 text: ""
                 draw_text: {
                     text_style: <TITLE_TEXT>{
-                        font_size: 18,
+                        font_size: 40,
                     },
                     color: #000
                 }

src/home/main_desktop_ui.rs

@@ -2,7 +2,7 @@ use makepad_widgets::*;
 use matrix_sdk::ruma::OwnedRoomId;
 use std::collections::HashMap;
 
-use crate::{app::{AppState, AppStateAction, SelectedRoom}, shared::room_filter_input_bar::RoomFilterAction, 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::*;
@@ -209,7 +209,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, RoomFilterAction::Clear);
+        cx.widget_action(self.widget_uid(), &Scope::empty().path, MessageSearchAction::Clear);
     }
 
     /// Replaces an invite with a joined room in the dock.