Merge branch 'main' into image_upload

Author: alanpoon

README.md

@@ -189,9 +189,10 @@ These are generally sorted in order of priority. If you're interested in helping
 - [x] Join room by accepting invite
 - [x] Join room by searching for room alias, room ID, or via a Matrix link
 - [x] Knock on room (request to join)
-- [ ] Administrative abilities: ban, kick, etc
-- [ ] Room creation/settings/info screen
+- [x] Leave joined and invited rooms
+- [ ] Room settings/info screen
 - [ ] Room members pane
+- [ ] Administrative abilities: ban, kick, etc
 - [x] Offline mode with persistent event cache: https://github.com/project-robius/robrix/pull/445
 
 

src/app.rs

@@ -9,7 +9,8 @@ use serde::{Deserialize, Serialize};
 use crate::{
     avatar_cache::clear_avatar_cache,
     home::{
-        main_desktop_ui::MainDesktopUiAction, navigation_tab_bar::{NavigationBarAction, SelectedTab}, new_message_context_menu::NewMessageContextMenuWidgetRefExt, room_screen::{InviteAction, MessageAction, clear_timeline_states}, rooms_list::{RoomsListAction, RoomsListRef, RoomsListUpdate, clear_all_invited_rooms, enqueue_rooms_list_update}
+        invite_modal::{InviteModalAction, InviteModalWidgetRefExt},
+        main_desktop_ui::MainDesktopUiAction, navigation_tab_bar::{NavigationBarAction, SelectedTab}, new_message_context_menu::NewMessageContextMenuWidgetRefExt, room_screen::{InviteAction, MessageAction, clear_timeline_states}, rooms_list::{RoomsListAction, RoomsListRef, RoomsListUpdate, clear_all_invited_rooms, enqueue_rooms_list_update}, room_context_menu::RoomContextMenuWidgetRefExt
     },
     join_leave_room_modal::{
         JoinLeaveModalKind, JoinLeaveRoomModalAction, JoinLeaveRoomModalWidgetRefExt
@@ -42,6 +43,8 @@ live_design! {
     use crate::shared::confirmation_modal::*;
     use crate::shared::popup_list::*;
     use crate::home::new_message_context_menu::*;
+    use crate::home::room_context_menu::*;
+    use crate::home::invite_modal::InviteModal;
     use crate::shared::callout_tooltip::CalloutTooltip;
     use crate::shared::image_viewer::ImageViewer;
     use crate::shared::file_previewer::FilePreviewer;
@@ -117,6 +120,7 @@ live_design! {
                         // Context menus should be shown in front of other UI elements,
                         // but behind verification modals.
                         new_message_context_menu = <NewMessageContextMenu> { }
+                        room_context_menu = <RoomContextMenu> { }
 
                         // A modal to confirm sending out an invite to a room.
                         invite_confirmation_modal = <Modal> {
@@ -132,6 +136,13 @@ live_design! {
                             }
                         }
 
+                        // A modal to invite a user to a room.
+                        invite_modal = <Modal> {
+                            content: {
+                                invite_modal_inner = <InviteModal> {}
+                            }
+                        }
+
                         // Show the logout confirmation modal.
                         logout_confirm_modal = <Modal> {
                             content: {
@@ -324,6 +335,22 @@ impl MatchEvent for App {
                 continue;
             }
 
+            // Handle an action requesting to open the room context menu.
+            if let RoomsListAction::OpenRoomContextMenu { details, pos } = action.as_widget_action().cast() {
+                self.ui.callout_tooltip(ids!(app_tooltip)).hide(cx);
+                let room_context_menu = self.ui.room_context_menu(ids!(room_context_menu));
+                let expected_dimensions = room_context_menu.show(cx, details);
+                // Ensure the context menu does not spill over the window's bounds.
+                let rect = self.ui.window(ids!(main_window)).area().rect(cx);
+                let pos_x = min(pos.x, rect.size.x - expected_dimensions.x);
+                let pos_y = min(pos.y, rect.size.y - expected_dimensions.y);
+                room_context_menu.apply_over(cx, live! {
+                    main_content = { margin: { left: (pos_x), top: (pos_y) } }
+                });
+                self.ui.redraw(cx);
+                continue;
+            }
+
             if let RoomsListAction::Selected(selected_room) = action.as_widget_action().cast() {
                 // A room has been selected, update the app state and navigate to the main content view.
                 let display_name = selected_room.room_name().to_string();
@@ -487,14 +514,28 @@ impl MatchEvent for App {
             }
 
             // Handle a request to show the invite confirmation modal.
-            if let Some(InviteAction::ShowConfirmationModal(content_opt)) = action.downcast_ref() {
+            if let Some(InviteAction::ShowInviteConfirmationModal(content_opt)) = action.downcast_ref() {
                 if let Some(content) = content_opt.borrow_mut().take() {
                     invite_confirmation_modal_inner.show(cx, content);
                     self.ui.modal(ids!(invite_confirmation_modal)).open(cx);
                 }
                 continue;
             }
 
+            // Handle InviteModalAction to open/close the invite modal.
+            match action.downcast_ref() {
+                Some(InviteModalAction::Open(room_name_id)) => {
+                    self.ui.invite_modal(ids!(invite_modal_inner)).show(cx, room_name_id.clone());
+                    self.ui.modal(ids!(invite_modal)).open(cx);
+                    continue;
+                }
+                Some(InviteModalAction::Close) => {
+                    self.ui.modal(ids!(invite_modal)).close(cx);
+                    continue;
+                }
+                _ => {}
+            }
+
             // // message source modal handling.
             // match action.as_widget_action().cast() {
             //     MessageAction::MessageSourceModalOpen { room_id: _, event_id: _, original_json: _ } => {