diff --git a/apps/manifest.json b/apps/manifest.json index c1946cb50..0825a0d73 100644 --- a/apps/manifest.json +++ b/apps/manifest.json @@ -41,7 +41,8 @@ "appmenu.mtxchat": { "en": "Matrix chat" } - } + }, + "submenu": 1 }, "repl": { "context_name": "repl demo app", diff --git a/apps/mtxchat/locales/i18n.json b/apps/mtxchat/locales/i18n.json index 6fcf1535d..639365e0d 100644 --- a/apps/mtxchat/locales/i18n.json +++ b/apps/mtxchat/locales/i18n.json @@ -55,12 +55,11 @@ "ja": "MTXCHAT ready *EN*", "zh": "MTXCHAT ready *EN*" }, - "mtxchat.logged.in": { - "en": "logged in", - "en-tts": "logged in", - "fr": "connecté", - "ja": "logged in *EN*", - "zh": "logged in *EN*" + "mtxchat.login.item": { + "en": "Login", + "en-tts": "Login", + "ja": "Login *EN*", + "zh": "Login *EN*" }, "mtxchat.logged.out": { "en": "logged out", @@ -90,12 +89,12 @@ "ja": "/login *EN*", "zh": "/login *EN*" }, - "mtxchat.logout.help": { - "en": "/logout", - "en-tts": "logout", - "fr": "/logout (déconnexion)", - "ja": "/logout *EN*", - "zh": "/logout *EN*" + "mtxchat.logout.item": { + "en": "Logout", + "en-tts": "Logout", + "fr": "Logout (déconnexion)", + "ja": "Logout *EN*", + "zh": "Logout *EN*" }, "mtxchat.migration.completed": { "en": "migration completed", @@ -144,6 +143,10 @@ "en": "Matrix room", "en-tts": "Matrix room" }, + "mtxchat.room.item": { + "en": "Room", + "en-tts": "Room" + }, "mtxchat.room.name": { "en": "room name", "en-tts": "room name" @@ -221,5 +224,9 @@ "fr": "AVERTISSEMENT: WiFi pas connecté", "ja": "WARNING: WiFi not connected *EN*", "zh": "WARNING: WiFi not connected *EN*" + }, + "mtxchat.close.item": { + "en": "Close menu", + "en-tts": "Close menu" } } diff --git a/apps/mtxchat/src/api.rs b/apps/mtxchat/src/api.rs index 0de0d406a..d50e7f426 100644 --- a/apps/mtxchat/src/api.rs +++ b/apps/mtxchat/src/api.rs @@ -6,6 +6,8 @@ pub(crate) const SERVER_NAME_MTXCHAT: &str = "_Matrix chat_"; pub enum MtxchatOp { /// chat ui event Event = 0, + /// menu item click + Menu, /// chat ui user post Post, /// chat ui keystroke @@ -14,6 +16,14 @@ pub enum MtxchatOp { Quit, } +#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] +pub enum MenuOp { + Login, + Logout, + Noop, + Room, +} + pub struct Msg { pub type_: String, pub body: Option, diff --git a/apps/mtxchat/src/lib.rs b/apps/mtxchat/src/lib.rs index 6ed8e3e4e..44f87c779 100644 --- a/apps/mtxchat/src/lib.rs +++ b/apps/mtxchat/src/lib.rs @@ -280,18 +280,18 @@ impl<'a> MtxChat<'a> { if self.token.len() > 0 { if let Some(user_id) = web::whoami(&server, &self.token) { let i = match user_id.find('@') { - Some(index) => { index + 1 }, - None => { 0 }, + Some(index) => index + 1, + None => 0, }; let j = match user_id.find(':') { - Some(index) => { index }, - None => { user_id.len() }, + Some(index) => index, + None => user_id.len(), }; self.set(USER_ID_KEY, &user_id) .expect("failed to save user id"); self.set(USER_NAME_KEY, &user_id[i..j]) .expect("failed to save user name"); - self.set(USER_DOMAIN_KEY, &user_id[j+1..]) + self.set(USER_DOMAIN_KEY, &user_id[j + 1..]) .expect("failed to save user domain"); self.logged_in = true; } @@ -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 pub fn get_room_id(&mut self) -> Option { let mut room = String::new(); diff --git a/apps/mtxchat/src/main.rs b/apps/mtxchat/src/main.rs index 3f419a5eb..a0e35c679 100644 --- a/apps/mtxchat/src/main.rs +++ b/apps/mtxchat/src/main.rs @@ -4,8 +4,8 @@ mod api; use api::*; use chat::{Chat, Event, POST_TEXT_MAX}; +use gam::{MenuItem, MenuPayload}; use locales::t; -use modals::Modals; use mtxchat::MtxChat; use num_traits::*; use xous_ipc::Buffer; @@ -53,15 +53,48 @@ fn wrapped_main() -> ! { let chat = Chat::new( gam::APP_NAME_MTXCHAT, + gam::APP_MENU_0_MTXCHAT, Some(xous::connect(sid).unwrap()), Some(MtxchatOp::Post as usize), Some(MtxchatOp::Event 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 user_post: Option = None; loop { @@ -84,6 +117,24 @@ fn wrapped_main() -> ! { }); } 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) => { let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };