Feature/register Support new account creation/registration

src/app.rs

@@ -9,8 +9,13 @@ use std::collections::HashMap;
 use makepad_widgets::{makepad_micro_serde::*, *};
 use matrix_sdk::ruma::{OwnedRoomId, RoomId};
 use crate::{
-    avatar_cache::clear_avatar_cache, home::{
-        main_desktop_ui::MainDesktopUiAction, new_message_context_menu::NewMessageContextMenuWidgetRefExt, room_screen::{clear_timeline_states, MessageAction}, rooms_list::{clear_all_invited_rooms, enqueue_rooms_list_update, RoomsListAction, RoomsListRef, RoomsListUpdate}
+    avatar_cache::clear_avatar_cache,
+    register::register_screen::RegisterAction,
+    home::{
+        main_desktop_ui::MainDesktopUiAction,
+        new_message_context_menu::NewMessageContextMenuWidgetRefExt,
+        room_screen::{clear_timeline_states, MessageAction},
+        rooms_list::{clear_all_invited_rooms, enqueue_rooms_list_update, RoomsListAction, RoomsListRef, RoomsListUpdate},
     }, join_leave_room_modal::{
         JoinLeaveModalKind, JoinLeaveRoomModalAction, JoinLeaveRoomModalWidgetRefExt
     }, login::login_screen::LoginAction, logout::logout_confirm_modal::{LogoutAction, LogoutConfirmModalAction, LogoutConfirmModalWidgetRefExt}, persistence, profile::user_profile_cache::clear_user_profile_cache, room::BasicRoomDetails, shared::callout_tooltip::{
@@ -36,6 +41,7 @@ live_design! {
     use crate::verification_modal::VerificationModal;
     use crate::join_leave_room_modal::JoinLeaveRoomModal;
     use crate::login::login_screen::LoginScreen;
+    use crate::register::register_screen::RegisterScreen;
     use crate::logout::logout_confirm_modal::LogoutConfirmModal;
     use crate::shared::popup_list::*;
     use crate::home::new_message_context_menu::*;
@@ -95,7 +101,10 @@ live_design! {
                             visible: true
                             login_screen = <LoginScreen> {}
                         }
-
+                        register_screen_view = <View> {
+                            visible: false
+                            register_screen = <RegisterScreen> {}
+                        }
                         <PopupList> {}
 
                         // Context menus should be shown in front of other UI elements,
@@ -174,6 +183,7 @@ impl LiveRegister for App {
         crate::home::live_design(cx);
         crate::profile::live_design(cx);
         crate::login::live_design(cx);
+        crate::register::live_design(cx);
         crate::logout::live_design(cx);
     }
 }
@@ -251,11 +261,55 @@ impl MatchEvent for App {
                 continue;
             }
 
-            if let Some(LoginAction::LoginSuccess) = action.downcast_ref() {
-                log!("Received LoginAction::LoginSuccess, hiding login view.");
-                self.app_state.logged_in = true;
-                self.update_login_visibility(cx);
-                self.ui.redraw(cx);
+            // Handle login-related actions
+            if let Some(login_action) = action.downcast_ref::<LoginAction>() {
+                match login_action {
+                    LoginAction::LoginSuccess => {
+                        log!("Received LoginAction::LoginSuccess, hiding login view.");
+                        self.app_state.logged_in = true;
+                        self.update_login_visibility(cx);
+                        self.ui.redraw(cx);
+                    }
+                    LoginAction::NavigateToRegister => {
+                        log!("Navigating from login to register screen");
+                        self.ui.view(id!(login_screen_view)).set_visible(cx, false);
+                        self.ui.view(id!(register_screen_view)).set_visible(cx, true);
+                        // Reset register button state when showing register screen
+                        let register_button = self.ui.button(id!(register_screen_view.register_screen.register_button));
+                        register_button.set_enabled(cx, true);
+                        register_button.reset_hover(cx);
+                        self.ui.redraw(cx);
+                    }
+                    _ => {}
+                }
+                continue;
+            }
+
+            // Handle register-related actions
+            if let Some(register_action) = action.downcast_ref::<RegisterAction>() {
+                match register_action {
+                    RegisterAction::NavigateToLogin => {
+                        log!("Navigating from register to login screen");
+                        // Reset the register screen state before hiding it
+                        if let Some(mut register_screen_ref) = self.ui.widget(id!(register_screen_view.register_screen)).borrow_mut::<crate::register::register_screen::RegisterScreen>() {
+                            register_screen_ref.reset_screen_state(cx);
+                        }
+                        self.ui.view(id!(register_screen_view)).set_visible(cx, false);
+                        self.ui.view(id!(login_screen_view)).set_visible(cx, true);
+                        self.ui.redraw(cx);
+                    }
+                    RegisterAction::RegistrationSuccess => {
+                        log!("Registration successful, transitioning to logged in state");
+                        // Clear register screen state after successful registration
+                        if let Some(mut register_screen_ref) = self.ui.widget(id!(register_screen_view.register_screen)).borrow_mut::<crate::register::register_screen::RegisterScreen>() {
+                            register_screen_ref.reset_screen_state(cx);
+                        }
+                        self.app_state.logged_in = true;
+                        self.update_login_visibility(cx);
+                        self.ui.redraw(cx);
+                    }
+                    _ => {}
+                }
                 continue;
             }
 
@@ -533,6 +587,7 @@ impl App {
                 .close(cx);
         }
         self.ui.view(ids!(login_screen_view)).set_visible(cx, show_login);
+        self.ui.view(ids!(register_screen_view)).set_visible(cx, false);
         self.ui.view(ids!(home_screen_view)).set_visible(cx, !show_login);
     }
 
@@ -592,6 +647,7 @@ impl App {
         if let Some(closure) = close_room_closure_opt {
             closure(cx);
         }
+>>>>>>> origin/main
     }
 }
 

src/home/main_desktop_ui.rs

@@ -214,7 +214,7 @@ impl MainDesktopUI {
     /// Closes all tabs
     pub fn close_all_tabs(&mut self, cx: &mut Cx) {
         let dock = self.view.dock(ids!(dock));
-        for tab_id in self.open_rooms.keys() {        
+        for tab_id in self.open_rooms.keys() {
             dock.close_tab(cx, *tab_id);
         }
 
@@ -226,6 +226,9 @@ impl MainDesktopUI {
         self.tab_to_close = None;
         self.room_order.clear();
         self.most_recently_selected_room = None;
+
+        // Reset state to prevent dock restoration on next login
+        self.drawn_previously = false;
     }
 
     /// Replaces an invite with a joined room in the dock.

src/home/rooms_list_header.rs

@@ -105,7 +105,11 @@ impl Widget for RoomsListHeader {
                         if discriminant(&self.sync_state) == discriminant(new_state) {
                             continue;
                         }
-                        if matches!(new_state, State::Offline) {
+
+                        // Only show offline notification for actual connection errors
+                        // States like Idle and Running are normal and shouldn't trigger error popups
+                        if matches!(new_state, State::Error | State::Terminated | State::Offline) {
+                            log!("Setting the RoomsListHeader to offline.");
                             self.view.view(ids!(loading_spinner)).set_visible(cx, false);
                             self.view.view(ids!(synced_icon)).set_visible(cx, false);
                             self.view.view(ids!(offline_icon)).set_visible(cx, true);
@@ -115,6 +119,7 @@ impl Widget for RoomsListHeader {
                                 kind: PopupKind::Error,
                             });
                         }
+                        // For all other states (Idle, Running, etc.), just update without error notification
                         self.sync_state = new_state.clone();
                         self.redraw(cx);
                     }

src/lib.rs

@@ -13,6 +13,8 @@ pub mod settings;
 
 /// Login screen
 pub mod login;
+/// Register screen
+pub mod register;
 /// Logout confirmation and state management
 pub mod logout;
 /// Core UI content: the main home screen (rooms list), room screen.

src/login/login_screen.rs

@@ -286,8 +286,6 @@ live_design! {
     }
 }
 
-static MATRIX_SIGN_UP_URL: &str = "https://matrix.org/docs/chat_basics/matrix-for-im/#creating-a-matrix-account";
-
 #[derive(Live, LiveHook, Widget)]
 pub struct LoginScreen {
     #[deref] view: View,
@@ -321,8 +319,7 @@ impl MatchEvent for LoginScreen {
         let login_status_modal_inner = self.view.login_status_modal(ids!(login_status_modal_inner));
 
         if signup_button.clicked(actions) {
-            log!("Opening URL \"{}\"", MATRIX_SIGN_UP_URL);
-            let _ = robius_open::Uri::new(MATRIX_SIGN_UP_URL).open();
+            cx.action(LoginAction::NavigateToRegister);
         }
 
         if login_button.clicked(actions)
@@ -370,6 +367,7 @@ impl MatchEvent for LoginScreen {
             }
 
             // Handle login-related actions received from background async tasks.
+            // Skip processing if the login screen is not visible (e.g., user is on register screen)
             match action.downcast_ref() {
                 Some(LoginAction::CliAutoLogin { user_id, homeserver }) => {
                     user_id_input.set_text(cx, user_id);
@@ -454,7 +452,8 @@ impl MatchEvent for LoginScreen {
                 submit_async_request(MatrixRequest::SpawnSSOServer{
                     identity_provider_id: format!("oidc-{}",brand),
                     brand: brand.to_string(),
-                    homeserver_url: homeserver_input.text()
+                    homeserver_url: homeserver_input.text(),
+                    is_registration: false,
                 });
             }
         }
@@ -493,5 +492,7 @@ pub enum LoginAction {
     /// When an SSO-based login is pendng, pressing the cancel button will send
     /// an HTTP request to this SSO server URL to gracefully shut it down.
     SsoSetRedirectUrl(Url),
+    /// Navigate to the register screen.
+    NavigateToRegister,
     None,
 }

src/register/mod.rs

@@ -0,0 +1,9 @@
+use makepad_widgets::*;
+
+pub mod register_screen;
+pub mod register_status_modal;
+
+pub fn live_design(cx: &mut Cx) {
+    register_screen::live_design(cx);
+    register_status_modal::live_design(cx);
+}