Merge pull request #204 from kevinaboos/better_login_status_messages

Provide more detailed and colored login status messages

Author: kevinaboos

src/login/login_screen.rs

@@ -215,6 +215,11 @@ live_design! {
 
 static MATRIX_SIGN_UP_URL: &str = "https://matrix.org/docs/chat_basics/matrix-for-im/#creating-a-matrix-account";
 
+// An unfortunate hack we must do to get the colors to work in Rust code.
+const COLOR_DANGER_RED: Vec4 = Vec4 { x: 220f32/255f32, y: 0f32, z: 5f32/255f32, w: 1f32 };
+const COLOR_ACCEPT_GREEN: Vec4 = Vec4 { x: 19f32/255f32, y: 136f32/255f32, z: 8f32/255f32, w: 1f32 };
+const MESSAGE_TEXT_COLOR: Vec4 = Vec4 { x: 68f32/255f32, y: 68f32/255f32, z: 68f32/255f32, w: 1f32 };
+
 #[derive(Live, LiveHook, Widget)]
 pub struct LoginScreen {
     #[deref] view: View,
@@ -241,8 +246,14 @@ impl Widget for LoginScreen {
                 let password = password_input.text();
                 let homeserver = homeserver_input.text();
                 if user_id.is_empty() || password.is_empty() {
+                    status_label.apply_over(cx, live!{
+                        draw_text: { color: (COLOR_DANGER_RED) }
+                    });
                     status_label.set_text("Please enter both User ID and Password.");
                 } else {
+                    status_label.apply_over(cx, live!{
+                        draw_text: { color: (MESSAGE_TEXT_COLOR) }
+                    });
                     status_label.set_text("Waiting for login response...");
                     submit_async_request(MatrixRequest::Login(LoginRequest {
                         user_id,
@@ -260,6 +271,9 @@ impl Widget for LoginScreen {
                     }
                     Some(LoginAction::Status(status)) => {
                         status_label.set_text(status);
+                        status_label.apply_over(cx, live!{
+                            draw_text: { color: (MESSAGE_TEXT_COLOR) }
+                        });
                         self.redraw(cx);
                     }
                     Some(LoginAction::LoginSuccess) => {
@@ -269,10 +283,16 @@ impl Widget for LoginScreen {
                         password_input.set_text("");
                         homeserver_input.set_text("");
                         status_label.set_text("Login successful!");
+                        status_label.apply_over(cx, live!{
+                            draw_text: { color: (COLOR_ACCEPT_GREEN) }
+                        });
                         self.redraw(cx);
                     }
                     Some(LoginAction::LoginFailure(error)) => {
                         status_label.set_text(error);
+                        status_label.apply_over(cx, live!{
+                            draw_text: { color: (COLOR_DANGER_RED) }
+                        });
                         self.redraw(cx);
                     }
                     _ => {}

src/persistent_state.rs

@@ -97,7 +97,9 @@ pub async fn restore_session(
         log!("Could not find previous session file for user {user_id}");
         bail!("Could not find previous session file");
     }
-    log!("Found existing session at '{}'", session_file.display());
+    let status_str = format!("Loading previous session file for {user_id}...");
+    log!("{status_str}: '{}'", session_file.display());
+    Cx::post_action(LoginAction::Status(status_str));
 
     // The session was serialized as JSON in a file.
     let serialized_session = fs::read_to_string(session_file).await?;
@@ -113,7 +115,7 @@ pub async fn restore_session(
         .build()
         .await?;
 
-    let status_str = format!("Restoring previous session for {}", user_session.meta.user_id);
+    let status_str = format!("Restoring previous login session for {}...", user_session.meta.user_id);
     log!("{status_str}");
     Cx::post_action(LoginAction::Status(status_str));
 

src/sliding_sync.rs

@@ -903,12 +903,12 @@ async fn async_main_loop(
         if let Some(session) = persistent_state::restore_session(specified_username).await.ok() {
             Some(session)
         } else {
-            let status_err = "Could not restore previous user session";
+            let status_err = "Error: failed to restore previous user session.";
             log!("{status_err}");
             Cx::post_action(LoginAction::Status(status_err.to_string()));
 
             if let Ok(cli) = cli_parse_result {
-                let status_str = format!("Attempting auto-login from CLI arguments as user {}", cli.username);
+                let status_str = format!("Attempting auto-login from CLI arguments as user {}...", cli.username);
                 log!("{status_str}");
                 Cx::post_action(LoginAction::Status(status_str));