modal: add method to return a vec of payloads

content() automatically filters out non-dirty items
This commit is contained in:
Gianguido Sorà 2022-04-13 15:48:46 +02:00
parent c702025283
commit 08bbce93f6

View file

@ -12,13 +12,22 @@ const MAX_FIELDS: i16 = 10;
pub type ValidatorErr = xous_ipc::String::<256>; pub type ValidatorErr = xous_ipc::String::<256>;
pub type Payloads = [TextEntryPayload; MAX_FIELDS as usize];
#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone, Eq, PartialEq, Default)] #[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone, Eq, PartialEq, Default)]
pub struct TextEntryPayloads ([TextEntryPayload; MAX_FIELDS as usize]); pub struct TextEntryPayloads (Payloads);
impl TextEntryPayloads { impl TextEntryPayloads {
pub fn first(&self) -> TextEntryPayload { pub fn first(&self) -> TextEntryPayload {
self.0[0] self.0[0]
} }
pub fn content(&self) -> Vec<TextEntryPayload> {
self.0
.iter().cloned()
.filter(|payload| payload.dirty)
.collect()
}
} }
#[derive(Debug, Copy, Clone, num_derive::FromPrimitive, num_derive::ToPrimitive)] #[derive(Debug, Copy, Clone, num_derive::FromPrimitive, num_derive::ToPrimitive)]
@ -434,6 +443,7 @@ impl ActionApi for TextEntry {
_ => { _ => {
payload.content.push(k).expect("ran out of space storing password"); payload.content.push(k).expect("ran out of space storing password");
log::trace!("****update payload: {}", payload.content); log::trace!("****update payload: {}", payload.content);
payload.dirty = true;
self.action_payloads[self.selected_field as usize] = payload; self.action_payloads[self.selected_field as usize] = payload;
} }
} }