mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-21 09:14:34 +00:00
implement mtxchat basic chat ui menu
This commit is contained in:
parent
4f03a27e79
commit
01ea471fd0
5 changed files with 95 additions and 21 deletions
|
|
@ -41,7 +41,8 @@
|
||||||
"appmenu.mtxchat": {
|
"appmenu.mtxchat": {
|
||||||
"en": "Matrix chat"
|
"en": "Matrix chat"
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"submenu": 1
|
||||||
},
|
},
|
||||||
"repl": {
|
"repl": {
|
||||||
"context_name": "repl demo app",
|
"context_name": "repl demo app",
|
||||||
|
|
|
||||||
|
|
@ -55,12 +55,11 @@
|
||||||
"ja": "MTXCHAT ready *EN*",
|
"ja": "MTXCHAT ready *EN*",
|
||||||
"zh": "MTXCHAT ready *EN*"
|
"zh": "MTXCHAT ready *EN*"
|
||||||
},
|
},
|
||||||
"mtxchat.logged.in": {
|
"mtxchat.login.item": {
|
||||||
"en": "logged in",
|
"en": "Login",
|
||||||
"en-tts": "logged in",
|
"en-tts": "Login",
|
||||||
"fr": "connecté",
|
"ja": "Login *EN*",
|
||||||
"ja": "logged in *EN*",
|
"zh": "Login *EN*"
|
||||||
"zh": "logged in *EN*"
|
|
||||||
},
|
},
|
||||||
"mtxchat.logged.out": {
|
"mtxchat.logged.out": {
|
||||||
"en": "logged out",
|
"en": "logged out",
|
||||||
|
|
@ -90,12 +89,12 @@
|
||||||
"ja": "/login *EN*",
|
"ja": "/login *EN*",
|
||||||
"zh": "/login *EN*"
|
"zh": "/login *EN*"
|
||||||
},
|
},
|
||||||
"mtxchat.logout.help": {
|
"mtxchat.logout.item": {
|
||||||
"en": "/logout",
|
"en": "Logout",
|
||||||
"en-tts": "logout",
|
"en-tts": "Logout",
|
||||||
"fr": "/logout (déconnexion)",
|
"fr": "Logout (déconnexion)",
|
||||||
"ja": "/logout *EN*",
|
"ja": "Logout *EN*",
|
||||||
"zh": "/logout *EN*"
|
"zh": "Logout *EN*"
|
||||||
},
|
},
|
||||||
"mtxchat.migration.completed": {
|
"mtxchat.migration.completed": {
|
||||||
"en": "migration completed",
|
"en": "migration completed",
|
||||||
|
|
@ -144,6 +143,10 @@
|
||||||
"en": "Matrix room",
|
"en": "Matrix room",
|
||||||
"en-tts": "Matrix room"
|
"en-tts": "Matrix room"
|
||||||
},
|
},
|
||||||
|
"mtxchat.room.item": {
|
||||||
|
"en": "Room",
|
||||||
|
"en-tts": "Room"
|
||||||
|
},
|
||||||
"mtxchat.room.name": {
|
"mtxchat.room.name": {
|
||||||
"en": "room name",
|
"en": "room name",
|
||||||
"en-tts": "room name"
|
"en-tts": "room name"
|
||||||
|
|
@ -221,5 +224,9 @@
|
||||||
"fr": "AVERTISSEMENT: WiFi pas connecté",
|
"fr": "AVERTISSEMENT: WiFi pas connecté",
|
||||||
"ja": "WARNING: WiFi not connected *EN*",
|
"ja": "WARNING: WiFi not connected *EN*",
|
||||||
"zh": "WARNING: WiFi not connected *EN*"
|
"zh": "WARNING: WiFi not connected *EN*"
|
||||||
|
},
|
||||||
|
"mtxchat.close.item": {
|
||||||
|
"en": "Close menu",
|
||||||
|
"en-tts": "Close menu"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,8 @@ pub(crate) const SERVER_NAME_MTXCHAT: &str = "_Matrix chat_";
|
||||||
pub enum MtxchatOp {
|
pub enum MtxchatOp {
|
||||||
/// chat ui event
|
/// chat ui event
|
||||||
Event = 0,
|
Event = 0,
|
||||||
|
/// menu item click
|
||||||
|
Menu,
|
||||||
/// chat ui user post
|
/// chat ui user post
|
||||||
Post,
|
Post,
|
||||||
/// chat ui keystroke
|
/// chat ui keystroke
|
||||||
|
|
@ -14,6 +16,14 @@ pub enum MtxchatOp {
|
||||||
Quit,
|
Quit,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]
|
||||||
|
pub enum MenuOp {
|
||||||
|
Login,
|
||||||
|
Logout,
|
||||||
|
Noop,
|
||||||
|
Room,
|
||||||
|
}
|
||||||
|
|
||||||
pub struct Msg {
|
pub struct Msg {
|
||||||
pub type_: String,
|
pub type_: String,
|
||||||
pub body: Option<String>,
|
pub body: Option<String>,
|
||||||
|
|
|
||||||
|
|
@ -280,12 +280,12 @@ impl<'a> MtxChat<'a> {
|
||||||
if self.token.len() > 0 {
|
if self.token.len() > 0 {
|
||||||
if let Some(user_id) = web::whoami(&server, &self.token) {
|
if let Some(user_id) = web::whoami(&server, &self.token) {
|
||||||
let i = match user_id.find('@') {
|
let i = match user_id.find('@') {
|
||||||
Some(index) => { index + 1 },
|
Some(index) => index + 1,
|
||||||
None => { 0 },
|
None => 0,
|
||||||
};
|
};
|
||||||
let j = match user_id.find(':') {
|
let j = match user_id.find(':') {
|
||||||
Some(index) => { index },
|
Some(index) => index,
|
||||||
None => { user_id.len() },
|
None => user_id.len(),
|
||||||
};
|
};
|
||||||
self.set(USER_ID_KEY, &user_id)
|
self.set(USER_ID_KEY, &user_id)
|
||||||
.expect("failed to save user id");
|
.expect("failed to save user id");
|
||||||
|
|
@ -374,6 +374,11 @@ impl<'a> MtxChat<'a> {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn logout(&mut self){
|
||||||
|
self.unset_debug(TOKEN_KEY);
|
||||||
|
// TODO logout with server
|
||||||
|
}
|
||||||
|
|
||||||
// assume logged in, token is valid
|
// assume logged in, token is valid
|
||||||
pub fn get_room_id(&mut self) -> Option<String> {
|
pub fn get_room_id(&mut self) -> Option<String> {
|
||||||
let mut room = String::new();
|
let mut room = String::new();
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
mod api;
|
mod api;
|
||||||
use api::*;
|
use api::*;
|
||||||
use chat::{Chat, Event, POST_TEXT_MAX};
|
use chat::{Chat, Event, POST_TEXT_MAX};
|
||||||
|
use gam::{MenuItem, MenuPayload};
|
||||||
use locales::t;
|
use locales::t;
|
||||||
use modals::Modals;
|
|
||||||
use mtxchat::MtxChat;
|
use mtxchat::MtxChat;
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
use xous_ipc::Buffer;
|
use xous_ipc::Buffer;
|
||||||
|
|
@ -53,15 +53,48 @@ fn wrapped_main() -> ! {
|
||||||
|
|
||||||
let chat = Chat::new(
|
let chat = Chat::new(
|
||||||
gam::APP_NAME_MTXCHAT,
|
gam::APP_NAME_MTXCHAT,
|
||||||
|
gam::APP_MENU_0_MTXCHAT,
|
||||||
Some(xous::connect(sid).unwrap()),
|
Some(xous::connect(sid).unwrap()),
|
||||||
Some(MtxchatOp::Post as usize),
|
Some(MtxchatOp::Post as usize),
|
||||||
Some(MtxchatOp::Event as usize),
|
Some(MtxchatOp::Event as usize),
|
||||||
Some(MtxchatOp::Rawkeys as usize),
|
Some(MtxchatOp::Rawkeys as usize),
|
||||||
);
|
);
|
||||||
|
|
||||||
let mut mtxchat = MtxChat::new(&chat);
|
let cid = xous::connect(sid).unwrap();
|
||||||
|
chat.menu_add(MenuItem {
|
||||||
|
name: xous_ipc::String::from_str(t!("mtxchat.room.item", locales::LANG)),
|
||||||
|
action_conn: Some(cid),
|
||||||
|
action_opcode: MtxchatOp::Menu as u32,
|
||||||
|
action_payload: MenuPayload::Scalar([MenuOp::Room as u32, 0, 0, 0]),
|
||||||
|
close_on_select: true,
|
||||||
|
})
|
||||||
|
.expect("failed add menu");
|
||||||
|
chat.menu_add(MenuItem {
|
||||||
|
name: xous_ipc::String::from_str(t!("mtxchat.login.item", locales::LANG)),
|
||||||
|
action_conn: Some(cid),
|
||||||
|
action_opcode: MtxchatOp::Menu as u32,
|
||||||
|
action_payload: MenuPayload::Scalar([MenuOp::Login as u32, 0, 0, 0]),
|
||||||
|
close_on_select: true,
|
||||||
|
})
|
||||||
|
.expect("failed add menu");
|
||||||
|
chat.menu_add(MenuItem {
|
||||||
|
name: xous_ipc::String::from_str(t!("mtxchat.logout.item", locales::LANG)),
|
||||||
|
action_conn: Some(cid),
|
||||||
|
action_opcode: MtxchatOp::Menu as u32,
|
||||||
|
action_payload: MenuPayload::Scalar([MenuOp::Logout as u32, 0, 0, 0]),
|
||||||
|
close_on_select: true,
|
||||||
|
})
|
||||||
|
.expect("failed add menu");
|
||||||
|
chat.menu_add(MenuItem {
|
||||||
|
name: xous_ipc::String::from_str(t!("mtxchat.close.item", locales::LANG)),
|
||||||
|
action_conn: Some(cid),
|
||||||
|
action_opcode: MtxchatOp::Menu as u32,
|
||||||
|
action_payload: MenuPayload::Scalar([MenuOp::Noop as u32, 0, 0, 0]),
|
||||||
|
close_on_select: true,
|
||||||
|
})
|
||||||
|
.expect("failed add menu");
|
||||||
|
|
||||||
let modals = Modals::new(&xns).expect("can't connect to Modals server");
|
let mut mtxchat = MtxChat::new(&chat);
|
||||||
let mut first_focus = true;
|
let mut first_focus = true;
|
||||||
let mut user_post: Option<String> = None;
|
let mut user_post: Option<String> = None;
|
||||||
loop {
|
loop {
|
||||||
|
|
@ -84,6 +117,24 @@ fn wrapped_main() -> ! {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Some(MtxchatOp::Menu) => {
|
Some(MtxchatOp::Menu) => {
|
||||||
|
log::info!("got Chat Menu Click");
|
||||||
|
xous::msg_scalar_unpack!(msg, menu_code, _, _, _, {
|
||||||
|
match FromPrimitive::from_usize(menu_code) {
|
||||||
|
Some(MenuOp::Login) => {
|
||||||
|
mtxchat.connect();
|
||||||
|
}
|
||||||
|
Some(MenuOp::Logout) => {
|
||||||
|
mtxchat.logout();
|
||||||
|
mtxchat.connect();
|
||||||
|
}
|
||||||
|
Some(MenuOp::Noop) => {}
|
||||||
|
Some(MenuOp::Room) => {
|
||||||
|
mtxchat.room_modal();
|
||||||
|
}
|
||||||
|
_ => (),
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
Some(MtxchatOp::Post) => {
|
Some(MtxchatOp::Post) => {
|
||||||
let buffer =
|
let buffer =
|
||||||
unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
|
unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue