From 278fb8640a04f4e54e6a0548ccaa0e993630d5b1 Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Tue, 8 Aug 2023 07:20:01 +1000 Subject: [PATCH] embed room_modal into mtxchat::get_room_id() --- apps/mtxchat/locales/i18n.json | 8 ++++++-- apps/mtxchat/src/lib.rs | 31 ++++++++++++------------------- apps/mtxchat/src/main.rs | 7 +++++-- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apps/mtxchat/locales/i18n.json b/apps/mtxchat/locales/i18n.json index 0c0ca5e97..6fcf1535d 100644 --- a/apps/mtxchat/locales/i18n.json +++ b/apps/mtxchat/locales/i18n.json @@ -136,9 +136,13 @@ "ja": "password *EN*", "zh": "password *EN*" }, + "mtxchat.room": { + "en": "room", + "en-tts": "room" + }, "mtxchat.room.title": { - "en": "Matrix /room", - "en-tts": "Matrix /room" + "en": "Matrix room", + "en-tts": "Matrix room" }, "mtxchat.room.name": { "en": "room name", diff --git a/apps/mtxchat/src/lib.rs b/apps/mtxchat/src/lib.rs index 72588914d..2f21f4a1f 100644 --- a/apps/mtxchat/src/lib.rs +++ b/apps/mtxchat/src/lib.rs @@ -344,28 +344,13 @@ impl<'a> MtxChat<'a> { pub fn get_room_id(&mut self) -> bool { if self.room_id.len() > 0 { true - } else if self.room_name.len() == 0 { - false - } else if self.room_domain.len() == 0 { - false } else { - let name = self.get_or(ROOM_NAME_KEY, EMPTY); - let domain = self.get_or(ROOM_DOMAIN_KEY, EMPTY); + self.room_modal(); let mut room = String::new(); - write!( - room, - "#{}:{}", - &name, - &self.get_or(ROOM_DOMAIN_KEY, DOMAIN_MATRIX) - ) + write!(room, "#{}:{}", &self.room_name, &self.room_domain) .expect("failed to write room"); let mut server = String::new(); - write!( - server, - "{}{}", - HTTPS, - &self.get_or(USER_DOMAIN_KEY, DOMAIN_MATRIX) - ) + write!(server, "{}{}", HTTPS, &self.user_domain) .expect("failed to write server"); if let Some(room_id) = web::get_room_id(&server, &room, &self.token) { self.set_debug(ROOM_ID_KEY, &room_id); @@ -381,10 +366,18 @@ impl<'a> MtxChat<'a> { pub fn redraw(&self) { self.chat.redraw(); } + + pub fn room_modal(&mut self) { + let mut builder = self + .modals + .alert_builder(t!("mtxchat.room.title", locales::LANG)); let builder = match self.get(ROOM_NAME_KEY) { // TODO add TextValidationFn Ok(Some(room)) => builder.field_placeholder_persist(Some(room), None), - _ => builder.field(Some(t!("mtxchat.room.name", locales::LANG).to_string()), None), + _ => builder.field( + Some(t!("mtxchat.room.name", locales::LANG).to_string()), + None, + ), }; let builder = match self.get(ROOM_DOMAIN_KEY) { // TODO add TextValidationFn diff --git a/apps/mtxchat/src/main.rs b/apps/mtxchat/src/main.rs index 9c41cd4b6..f2b2f5abf 100644 --- a/apps/mtxchat/src/main.rs +++ b/apps/mtxchat/src/main.rs @@ -80,9 +80,11 @@ fn wrapped_main() -> ! { } while !mtxchat.get_room_id() { modals - .show_notification(t!("mtxchat.roomid.failed", locales::LANG), None) + .show_notification( + t!("mtxchat.roomid.failed", locales::LANG), + None, + ) .expect("notification failed"); - mtxchat.room_modal(); } mtxchat.redraw(); mtxchat.listen(); @@ -91,6 +93,7 @@ fn wrapped_main() -> ! { } }) } + Some(MtxchatOp::Menu) => { Some(MtxchatOp::Post) => { log::info!("TODO Post to Matrix server"); }