mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
move buttons and menus around for toggling modes
a little easier to use with a hot key for switching ui modes
This commit is contained in:
parent
73c0946325
commit
992cbb4388
4 changed files with 56 additions and 56 deletions
|
|
@ -379,40 +379,9 @@ fn main() -> ! {
|
||||||
allow_totp_rendering.store(true, Ordering::SeqCst);
|
allow_totp_rendering.store(true, Ordering::SeqCst);
|
||||||
vault_ui.redraw();
|
vault_ui.redraw();
|
||||||
}
|
}
|
||||||
Some(VaultOp::MenuTotpMode) => {
|
|
||||||
*mode.lock().unwrap() = VaultMode::Totp;
|
|
||||||
// reload DB on mode switch
|
|
||||||
xous::send_message(
|
|
||||||
actions_conn,
|
|
||||||
xous::Message::new_blocking_scalar(ActionOp::ReloadDb.to_usize().unwrap(), 0, 0, 0, 0),
|
|
||||||
)
|
|
||||||
.ok();
|
|
||||||
vault_ui.refresh_draw_list();
|
|
||||||
allow_totp_rendering.store(true, Ordering::SeqCst);
|
|
||||||
xous::send_message(
|
|
||||||
pump_conn,
|
|
||||||
xous::Message::new_scalar(PumpOp::Pump.to_usize().unwrap(), 0, 0, 0, 0),
|
|
||||||
)
|
|
||||||
.expect("couldn't start the pumper");
|
|
||||||
vault_ui.redraw();
|
|
||||||
}
|
|
||||||
Some(VaultOp::MenuPwMode) => {
|
|
||||||
{
|
|
||||||
// lock needs to go out of scope so we don't hang the later ops
|
|
||||||
*mode.lock().unwrap() = VaultMode::Password;
|
|
||||||
}
|
|
||||||
allow_totp_rendering.store(false, Ordering::SeqCst);
|
|
||||||
// reload DB on mode switch
|
|
||||||
xous::send_message(
|
|
||||||
actions_conn,
|
|
||||||
xous::Message::new_blocking_scalar(ActionOp::ReloadDb.to_usize().unwrap(), 0, 0, 0, 0),
|
|
||||||
)
|
|
||||||
.ok();
|
|
||||||
vault_ui.redraw();
|
|
||||||
}
|
|
||||||
Some(VaultOp::KeyPress) => xous::msg_scalar_unpack!(msg, k1, _k2, _k3, _k4, {
|
Some(VaultOp::KeyPress) => xous::msg_scalar_unpack!(msg, k1, _k2, _k3, _k4, {
|
||||||
let k = char::from_u32(k1 as u32).unwrap_or('\u{0000}');
|
let k = char::from_u32(k1 as u32).unwrap_or('\u{0000}');
|
||||||
log::debug!("key {}", k);
|
log::info!("key {}", k);
|
||||||
if menu_active {
|
if menu_active {
|
||||||
menu_mgr.key_press(k);
|
menu_mgr.key_press(k);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -435,7 +404,61 @@ fn main() -> ! {
|
||||||
vault_ui.redraw();
|
vault_ui.redraw();
|
||||||
}
|
}
|
||||||
'→' => {
|
'→' => {
|
||||||
vault_ui.nav(NavDir::Reserved);
|
let current_mode = *mode.lock().unwrap();
|
||||||
|
match current_mode {
|
||||||
|
VaultMode::Password => {
|
||||||
|
{
|
||||||
|
*mode.lock().unwrap() = VaultMode::Totp;
|
||||||
|
}
|
||||||
|
// reload DB on mode switch
|
||||||
|
xous::send_message(
|
||||||
|
actions_conn,
|
||||||
|
xous::Message::new_blocking_scalar(
|
||||||
|
ActionOp::ReloadDb.to_usize().unwrap(),
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.ok();
|
||||||
|
vault_ui.refresh_draw_list();
|
||||||
|
allow_totp_rendering.store(true, Ordering::SeqCst);
|
||||||
|
xous::send_message(
|
||||||
|
pump_conn,
|
||||||
|
xous::Message::new_scalar(
|
||||||
|
PumpOp::Pump.to_usize().unwrap(),
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.expect("couldn't start the pumper");
|
||||||
|
vault_ui.redraw();
|
||||||
|
}
|
||||||
|
VaultMode::Totp => {
|
||||||
|
{
|
||||||
|
// lock needs to go out of scope so we don't hang the later ops
|
||||||
|
*mode.lock().unwrap() = VaultMode::Password;
|
||||||
|
}
|
||||||
|
allow_totp_rendering.store(false, Ordering::SeqCst);
|
||||||
|
// reload DB on mode switch
|
||||||
|
xous::send_message(
|
||||||
|
actions_conn,
|
||||||
|
xous::Message::new_blocking_scalar(
|
||||||
|
ActionOp::ReloadDb.to_usize().unwrap(),
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.ok();
|
||||||
|
vault_ui.redraw();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
vault_ui.redraw();
|
vault_ui.redraw();
|
||||||
}
|
}
|
||||||
'🔥' => {
|
'🔥' => {
|
||||||
|
|
|
||||||
|
|
@ -9,20 +9,6 @@ use crate::VaultOp;
|
||||||
pub fn create_submenu(vault_conn: xous::CID, actions_conn: xous::CID, menu_mgr: xous::SID) -> MenuMatic {
|
pub fn create_submenu(vault_conn: xous::CID, actions_conn: xous::CID, menu_mgr: xous::SID) -> MenuMatic {
|
||||||
let mut menu_items = Vec::<MenuItem>::new();
|
let mut menu_items = Vec::<MenuItem>::new();
|
||||||
|
|
||||||
menu_items.push(MenuItem {
|
|
||||||
name: String::from(t!("vault.menu_totp_mode", locales::LANG)),
|
|
||||||
action_conn: Some(vault_conn),
|
|
||||||
action_opcode: VaultOp::MenuTotpMode.to_u32().unwrap(),
|
|
||||||
action_payload: MenuPayload::Scalar([0, 0, 0, 0]),
|
|
||||||
close_on_select: true,
|
|
||||||
});
|
|
||||||
menu_items.push(MenuItem {
|
|
||||||
name: String::from(t!("vault.menu_pw_mode", locales::LANG)),
|
|
||||||
action_conn: Some(vault_conn),
|
|
||||||
action_opcode: VaultOp::MenuPwMode.to_u32().unwrap(),
|
|
||||||
action_payload: MenuPayload::Scalar([0, 0, 0, 0]),
|
|
||||||
close_on_select: true,
|
|
||||||
});
|
|
||||||
menu_items.push(MenuItem {
|
menu_items.push(MenuItem {
|
||||||
name: String::from(t!("vault.menu_edit", locales::LANG)),
|
name: String::from(t!("vault.menu_edit", locales::LANG)),
|
||||||
action_conn: Some(vault_conn),
|
action_conn: Some(vault_conn),
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,6 @@ pub enum NavDir {
|
||||||
Up,
|
Up,
|
||||||
Down,
|
Down,
|
||||||
Autotype,
|
Autotype,
|
||||||
Reserved,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Centralizes tunable UI parameters for TOTP
|
/// Centralizes tunable UI parameters for TOTP
|
||||||
|
|
@ -443,9 +442,6 @@ impl VaultUi {
|
||||||
self.handle_autotype(item.guid, false).unwrap();
|
self.handle_autotype(item.guid, false).unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
NavDir::Reserved => {
|
|
||||||
// tbd
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
VaultMode::Totp => {
|
VaultMode::Totp => {
|
||||||
|
|
@ -462,9 +458,6 @@ impl VaultUi {
|
||||||
self.usb_dev.send_str(&code).ok();
|
self.usb_dev.send_str(&code).ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
NavDir::Reserved => {
|
|
||||||
// tbd
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
self.totp_code = None;
|
self.totp_code = None;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,6 @@ pub(crate) enum VaultOp {
|
||||||
MenuAutotypeRate,
|
MenuAutotypeRate,
|
||||||
MenuLeftyMode,
|
MenuLeftyMode,
|
||||||
MenuDone,
|
MenuDone,
|
||||||
MenuTotpMode,
|
|
||||||
MenuPwMode,
|
|
||||||
|
|
||||||
BasisChange,
|
BasisChange,
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue