mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
embed room_modal into mtxchat::get_room_id()
This commit is contained in:
parent
c3379b08e0
commit
278fb8640a
3 changed files with 23 additions and 23 deletions
|
|
@ -136,9 +136,13 @@
|
||||||
"ja": "password *EN*",
|
"ja": "password *EN*",
|
||||||
"zh": "password *EN*"
|
"zh": "password *EN*"
|
||||||
},
|
},
|
||||||
|
"mtxchat.room": {
|
||||||
|
"en": "room",
|
||||||
|
"en-tts": "room"
|
||||||
|
},
|
||||||
"mtxchat.room.title": {
|
"mtxchat.room.title": {
|
||||||
"en": "Matrix /room",
|
"en": "Matrix room",
|
||||||
"en-tts": "Matrix /room"
|
"en-tts": "Matrix room"
|
||||||
},
|
},
|
||||||
"mtxchat.room.name": {
|
"mtxchat.room.name": {
|
||||||
"en": "room name",
|
"en": "room name",
|
||||||
|
|
|
||||||
|
|
@ -344,28 +344,13 @@ impl<'a> MtxChat<'a> {
|
||||||
pub fn get_room_id(&mut self) -> bool {
|
pub fn get_room_id(&mut self) -> bool {
|
||||||
if self.room_id.len() > 0 {
|
if self.room_id.len() > 0 {
|
||||||
true
|
true
|
||||||
} else if self.room_name.len() == 0 {
|
|
||||||
false
|
|
||||||
} else if self.room_domain.len() == 0 {
|
|
||||||
false
|
|
||||||
} else {
|
} else {
|
||||||
let name = self.get_or(ROOM_NAME_KEY, EMPTY);
|
self.room_modal();
|
||||||
let domain = self.get_or(ROOM_DOMAIN_KEY, EMPTY);
|
|
||||||
let mut room = String::new();
|
let mut room = String::new();
|
||||||
write!(
|
write!(room, "#{}:{}", &self.room_name, &self.room_domain)
|
||||||
room,
|
|
||||||
"#{}:{}",
|
|
||||||
&name,
|
|
||||||
&self.get_or(ROOM_DOMAIN_KEY, DOMAIN_MATRIX)
|
|
||||||
)
|
|
||||||
.expect("failed to write room");
|
.expect("failed to write room");
|
||||||
let mut server = String::new();
|
let mut server = String::new();
|
||||||
write!(
|
write!(server, "{}{}", HTTPS, &self.user_domain)
|
||||||
server,
|
|
||||||
"{}{}",
|
|
||||||
HTTPS,
|
|
||||||
&self.get_or(USER_DOMAIN_KEY, DOMAIN_MATRIX)
|
|
||||||
)
|
|
||||||
.expect("failed to write server");
|
.expect("failed to write server");
|
||||||
if let Some(room_id) = web::get_room_id(&server, &room, &self.token) {
|
if let Some(room_id) = web::get_room_id(&server, &room, &self.token) {
|
||||||
self.set_debug(ROOM_ID_KEY, &room_id);
|
self.set_debug(ROOM_ID_KEY, &room_id);
|
||||||
|
|
@ -381,10 +366,18 @@ impl<'a> MtxChat<'a> {
|
||||||
pub fn redraw(&self) {
|
pub fn redraw(&self) {
|
||||||
self.chat.redraw();
|
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) {
|
let builder = match self.get(ROOM_NAME_KEY) {
|
||||||
// TODO add TextValidationFn
|
// TODO add TextValidationFn
|
||||||
Ok(Some(room)) => builder.field_placeholder_persist(Some(room), None),
|
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) {
|
let builder = match self.get(ROOM_DOMAIN_KEY) {
|
||||||
// TODO add TextValidationFn
|
// TODO add TextValidationFn
|
||||||
|
|
|
||||||
|
|
@ -80,9 +80,11 @@ fn wrapped_main() -> ! {
|
||||||
}
|
}
|
||||||
while !mtxchat.get_room_id() {
|
while !mtxchat.get_room_id() {
|
||||||
modals
|
modals
|
||||||
.show_notification(t!("mtxchat.roomid.failed", locales::LANG), None)
|
.show_notification(
|
||||||
|
t!("mtxchat.roomid.failed", locales::LANG),
|
||||||
|
None,
|
||||||
|
)
|
||||||
.expect("notification failed");
|
.expect("notification failed");
|
||||||
mtxchat.room_modal();
|
|
||||||
}
|
}
|
||||||
mtxchat.redraw();
|
mtxchat.redraw();
|
||||||
mtxchat.listen();
|
mtxchat.listen();
|
||||||
|
|
@ -91,6 +93,7 @@ fn wrapped_main() -> ! {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
Some(MtxchatOp::Menu) => {
|
||||||
Some(MtxchatOp::Post) => {
|
Some(MtxchatOp::Post) => {
|
||||||
log::info!("TODO Post to Matrix server");
|
log::info!("TODO Post to Matrix server");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue