Merge pull request #137 from nworbnhoj/qrcode

add as_qrcode to Notification modal
This commit is contained in:
bunnie 2022-04-08 14:28:26 +08:00 committed by GitHub
commit 679fde33a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 173 additions and 55 deletions

View file

@ -32,6 +32,8 @@ locales = {path = "../../locales"}
tts-frontend = {path="../tts"} tts-frontend = {path="../tts"}
qrcode = { version = "0.12", default-features = false }
[target.'cfg(not(any(windows,unix)))'.dependencies] [target.'cfg(not(any(windows,unix)))'.dependencies]
utralib = {path = "../../utralib"} utralib = {path = "../../utralib"}

View file

@ -14,6 +14,8 @@ mod progressbar;
pub use progressbar::*; pub use progressbar::*;
mod consoleinput; mod consoleinput;
pub use consoleinput::*; pub use consoleinput::*;
mod qrcode;
pub use self::qrcode::*;
use enum_dispatch::enum_dispatch; use enum_dispatch::enum_dispatch;
@ -37,6 +39,7 @@ pub enum ActionType {
CheckBoxes, CheckBoxes,
Slider, Slider,
Notification, Notification,
Qrcode,
ConsoleInput ConsoleInput
} }
@ -578,4 +581,4 @@ General form for modals:
- radio buttons - has an explicit "okay" button to close the modal; up/down arrows + select/enter pick the radio - radio buttons - has an explicit "okay" button to close the modal; up/down arrows + select/enter pick the radio
- check boxes - has an explicit "okay" button to close the modal; up/down arrows + select/enter checks boxes - check boxes - has an explicit "okay" button to close the modal; up/down arrows + select/enter checks boxes
- slider - left/right moves the slider, enter/select closes the modal - slider - left/right moves the slider, enter/select closes the modal
*/ */

View file

@ -5,12 +5,19 @@ use graphics_server::api::*;
use locales::t; use locales::t;
use core::fmt::Write; use core::fmt::Write;
#[derive(Debug, Copy, Clone)] use qrcode::{Color, QrCode};
use std::convert::TryInto;
pub(crate) const QUIET_MODULES: i16 = 2;
#[derive(Debug)]
pub struct Notification { pub struct Notification {
pub action_conn: xous::CID, pub action_conn: xous::CID,
pub action_opcode: u32, pub action_opcode: u32,
pub is_password: bool, pub is_password: bool,
pub manual_dismiss: bool, pub manual_dismiss: bool,
pub qrcode: Vec<bool>,
pub qrwidth: usize,
} }
impl Notification { impl Notification {
pub fn new(action_conn: xous::CID, action_opcode: u32) -> Self { pub fn new(action_conn: xous::CID, action_opcode: u32) -> Self {
@ -19,6 +26,8 @@ impl Notification {
action_opcode, action_opcode,
is_password: false, is_password: false,
manual_dismiss: true, manual_dismiss: true,
qrcode: Vec::new(),
qrwidth: 0,
} }
} }
pub fn set_is_password(&mut self, setting: bool) { pub fn set_is_password(&mut self, setting: bool) {
@ -30,49 +39,119 @@ impl Notification {
pub fn set_manual_dismiss(&mut self, setting: bool) { pub fn set_manual_dismiss(&mut self, setting: bool) {
self.manual_dismiss = setting; self.manual_dismiss = setting;
} }
pub fn set_as_qrcode(&mut self, setting: Option<&str>) {
match setting {
Some(setting) => {
let qrcode = QrCode::new(setting).unwrap();
self.qrwidth = qrcode.width();
self.qrcode = Vec::new();
for color in qrcode.to_colors().iter() {
match color {
Color::Dark => self.qrcode.push(true),
Color::Light => self.qrcode.push(false),
}
}
},
None => {
self.qrcode = Vec::new();
self.qrwidth = 0;
},
}
}
fn draw_text(&self, at_height: i16, modal: &Modal) {
// prime a textview with the correct general style parameters
let mut tv = TextView::new(
modal.canvas,
TextBounds::BoundingBox(Rectangle::new_coords(0, 0, 1, 1)),
);
tv.ellipsis = true;
tv.style = modal.style;
tv.invert = self.is_password;
tv.draw_border = false;
tv.margin = Point::new(0, 0);
tv.insertion = None;
tv.bounds_computed = None;
tv.bounds_hint = TextBounds::GrowableFromTl(
Point::new(modal.margin, at_height + modal.margin * 2),
(modal.canvas_width - modal.margin * 2) as u16,
);
write!(tv, "{}", t!("notification.dismiss", xous::LANG)).unwrap();
modal
.gam
.bounds_compute_textview(&mut tv)
.expect("couldn't simulate text size");
let textwidth = if let Some(bounds) = tv.bounds_computed {
bounds.br.x - bounds.tl.x
} else {
modal.canvas_width - modal.margin * 2
};
let offset = (modal.canvas_width - textwidth) / 2;
tv.bounds_computed = None;
tv.bounds_hint = TextBounds::BoundingBox(Rectangle::new(
Point::new(offset, at_height + modal.margin * 2),
Point::new(
modal.canvas_width - modal.margin,
at_height + modal.line_height + modal.margin * 2,
),
));
modal.gam.post_textview(&mut tv).expect("couldn't post tv");
}
fn draw_qrcode(&self, at_height: i16, modal: &Modal) {
// calculate pixel size of each module in the qrcode
let qrcode_modules: i16 = self.qrwidth.try_into().unwrap();
let modules: i16 = qrcode_modules + 2 * QUIET_MODULES;
let canvas_width = modal.canvas_width - 2 * modal.margin;
let mod_size_px: i16 = canvas_width / modules;
let qrcode_width_px = qrcode_modules * mod_size_px;
let quiet_px: i16 = (canvas_width - qrcode_width_px) / 2;
// Iterate thru qrcode and draw each module as a rectangle (square)
let black = DrawStyle::new(PixelColor::Dark, PixelColor::Dark, 1);
let top = at_height + 4 * modal.margin + quiet_px;
let left = modal.margin + quiet_px;
let mut top_left;
let mut bot_right;
let mut x: i16;
let mut y: i16;
let mut j: i16;
for (i, module) in self.qrcode.iter().enumerate() {
j = i.try_into().unwrap();
x = left + (j % qrcode_modules) * mod_size_px;
y = top + (j / qrcode_modules) * mod_size_px;
if *module {
top_left = Point::new(x, y);
bot_right = Point::new(x + mod_size_px, y + mod_size_px);
modal
.gam
.draw_rectangle(
modal.canvas,
Rectangle::new_with_style(top_left, bot_right, black),
)
.expect("couldn't draw qrcode module");
}
}
}
} }
impl ActionApi for Notification { impl ActionApi for Notification {
fn set_action_opcode(&mut self, op: u32) {self.action_opcode = op} fn set_action_opcode(&mut self, op: u32) {
self.action_opcode = op
}
fn height(&self, glyph_height: i16, margin: i16) -> i16 { fn height(&self, glyph_height: i16, margin: i16) -> i16 {
if self.manual_dismiss { if self.manual_dismiss {
glyph_height + margin * 2 + 5 let qr_height = if self.qrwidth > 0 { 300 } else { 0 };
glyph_height + margin * 2 + 5 + qr_height
} else { } else {
margin + 5 margin + 5
} }
} }
fn redraw(&self, at_height: i16, modal: &Modal) { fn redraw(&self, at_height: i16, modal: &Modal) {
if self.manual_dismiss { if self.manual_dismiss {
// prime a textview with the correct general style parameters self.draw_text(at_height, modal);
let mut tv = TextView::new(
modal.canvas,
TextBounds::BoundingBox(Rectangle::new_coords(0, 0, 1, 1))
);
tv.ellipsis = true;
tv.style = modal.style;
tv.invert = self.is_password;
tv.draw_border= false;
tv.margin = Point::new(0, 0,);
tv.insertion = None;
tv.bounds_computed = None; if self.qrwidth > 0 {
tv.bounds_hint = TextBounds::GrowableFromTl( self.draw_qrcode(at_height, modal);
Point::new(modal.margin, at_height + modal.margin * 2), }
(modal.canvas_width - modal.margin * 2) as u16
);
write!(tv, "{}", t!("notification.dismiss", xous::LANG)).unwrap();
modal.gam.bounds_compute_textview(&mut tv).expect("couldn't simulate text size");
let textwidth = if let Some(bounds) = tv.bounds_computed {
bounds.br.x - bounds.tl.x
} else {
modal.canvas_width - modal.margin * 2
};
let offset = (modal.canvas_width - textwidth) / 2;
tv.bounds_computed = None;
tv.bounds_hint = TextBounds::BoundingBox(Rectangle::new(
Point::new(offset, at_height + modal.margin * 2),
Point::new(modal.canvas_width - modal.margin, at_height + modal.line_height + modal.margin * 2)
));
modal.gam.post_textview(&mut tv).expect("couldn't post tv");
// divider lines // divider lines
let color = if self.is_password { let color = if self.is_password {
@ -81,11 +160,17 @@ impl ActionApi for Notification {
PixelColor::Dark PixelColor::Dark
}; };
modal.gam.draw_line(modal.canvas, Line::new_with_style( modal
Point::new(modal.margin, at_height + modal.margin), .gam
Point::new(modal.canvas_width - modal.margin, at_height + modal.margin), .draw_line(
DrawStyle::new(color, color, 1)) modal.canvas,
).expect("couldn't draw entry line"); Line::new_with_style(
Point::new(modal.margin, at_height + modal.margin),
Point::new(modal.canvas_width - modal.margin, at_height + modal.margin),
DrawStyle::new(color, color, 1),
),
)
.expect("couldn't draw entry line");
} }
} }
fn key_action(&mut self, k: char) -> (Option<ValidatorErr>, bool) { fn key_action(&mut self, k: char) -> (Option<ValidatorErr>, bool) {
@ -96,11 +181,15 @@ impl ActionApi for Notification {
} }
_ => { _ => {
if self.manual_dismiss { if self.manual_dismiss {
send_message(self.action_conn, xous::Message::new_scalar(self.action_opcode as usize, 0, 0, 0, 0)).expect("couldn't pass on dismissal"); send_message(
return(None, true) self.action_conn,
xous::Message::new_scalar(self.action_opcode as usize, 0, 0, 0, 0),
)
.expect("couldn't pass on dismissal");
return (None, true);
} }
} }
} }
(None, false) (None, false)
} }
} }

View file

@ -32,6 +32,7 @@ pub struct ManagedPromptWithTextResponse {
pub struct ManagedNotification { pub struct ManagedNotification {
pub token: [u32; 4], pub token: [u32; 4],
pub message: xous_ipc::String::<1024>, pub message: xous_ipc::String::<1024>,
pub as_qrcode: bool,
} }
#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] #[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)]
pub struct ManagedProgress { pub struct ManagedProgress {

View file

@ -85,6 +85,20 @@ impl Modals {
let spec = ManagedNotification { let spec = ManagedNotification {
token: self.token, token: self.token,
message: xous_ipc::String::from_str(notification), message: xous_ipc::String::from_str(notification),
as_qrcode: false,
};
let buf = Buffer::into_buf(spec).or(Err(xous::Error::InternalError))?;
buf.lend(self.conn, Opcode::Notification.to_u32().unwrap()).or(Err(xous::Error::InternalError))?;
Ok(())
}
/// this blocks until the qrcode has been acknowledged.
pub fn show_qrcode(&self, text: &str) -> Result<(), xous::Error> {
self.lock();
let spec = ManagedNotification {
token: self.token,
message: xous_ipc::String::from_str(text),
as_qrcode: true,
}; };
let buf = Buffer::into_buf(spec).or(Err(xous::Error::InternalError))?; let buf = Buffer::into_buf(spec).or(Err(xous::Error::InternalError))?;
buf.lend(self.conn, Opcode::Notification.to_u32().unwrap()).or(Err(xous::Error::InternalError))?; buf.lend(self.conn, Opcode::Notification.to_u32().unwrap()).or(Err(xous::Error::InternalError))?;
@ -249,4 +263,4 @@ impl Drop for Modals {
// if there was object-specific state (such as a one-time use server for async callbacks, specific to the object instance), // if there was object-specific state (such as a one-time use server for async callbacks, specific to the object instance),
// de-allocate those items here. They don't need a reference count because they are object-specific // de-allocate those items here. They don't need a reference count because they are object-specific
} }
} }

View file

@ -91,15 +91,6 @@ fn xmain() -> ! {
validator: None, validator: None,
}; };
let mut fixed_items = Vec::<ItemName>::new(); let mut fixed_items = Vec::<ItemName>::new();
let notification = gam::modal::Notification::new(
renderer_cid,
Opcode::NotificationReturn.to_u32().unwrap()
);
let mut gutter = gam::modal::Notification::new(
renderer_cid,
Opcode::Gutter.to_u32().unwrap()
);
gutter.set_manual_dismiss(false);
let mut progress_action = Slider::new(renderer_cid, Opcode::Gutter.to_u32().unwrap(), let mut progress_action = Slider::new(renderer_cid, Opcode::Gutter.to_u32().unwrap(),
0, 100, 1, Some("%"), 0, true, true 0, 100, 1, Some("%"), 0, true, true
); );
@ -316,11 +307,19 @@ fn xmain() -> ! {
log::debug!("should be active!"); log::debug!("should be active!");
}, },
RendererState::RunNotification(config) => { RendererState::RunNotification(config) => {
let mut notification = gam::modal::Notification::new(
renderer_cid,
Opcode::NotificationReturn.to_u32().unwrap()
);
let text = config.message.as_str().unwrap();
if config.as_qrcode {
notification.set_as_qrcode(Some(text));
}
#[cfg(feature="tts")] #[cfg(feature="tts")]
tts.tts_simple(config.message.as_str().unwrap()).unwrap(); tts.tts_simple(config.message.as_str().unwrap()).unwrap();
renderer_modal.modify( renderer_modal.modify(
Some(ActionType::Notification(notification)), Some(ActionType::Notification(notification)),
Some(config.message.as_str().unwrap()), false, Some(text), false,
None, true, None None, true, None
); );
renderer_modal.activate(); renderer_modal.activate();
@ -395,7 +394,12 @@ fn xmain() -> ! {
#[cfg(feature="tts")] #[cfg(feature="tts")]
tts.tts_simple(text.as_str().unwrap()).unwrap(); tts.tts_simple(text.as_str().unwrap()).unwrap();
bot_text.push_str(text.as_str().unwrap()); bot_text.push_str(text.as_str().unwrap());
} }
let mut gutter = gam::modal::Notification::new(
renderer_cid,
Opcode::Gutter.to_u32().unwrap()
);
gutter.set_manual_dismiss(false);
renderer_modal.modify( renderer_modal.modify(
Some(ActionType::Notification(gutter)), Some(ActionType::Notification(gutter)),
Some(&top_text), config.title.is_none(), Some(&top_text), config.title.is_none(),
@ -632,4 +636,4 @@ fn next_lock(work_queue: &mut Vec::<(xous::MessageSender, [u32; 4])>) -> Option<
} else { } else {
None None
} }
} }

View file

@ -95,6 +95,11 @@ pub(crate) fn spawn_test() {
log::info!("testing notification"); log::info!("testing notification");
modals.show_notification("这是一个测验!").expect("notification failed"); modals.show_notification("这是一个测验!").expect("notification failed");
log::info!("notification test done"); log::info!("notification test done");
// 4. test qrcode
log::info!("testing qrcode");
modals.show_qrcode("https://github.com/betrusted-io/xous-core").expect("qrcode failed");
log::info!("qrcode test done");
} }
}); });
} }