modals: get rid of fields_amt value in alert modal builder, can be inferred

This commit is contained in:
Gianguido Sorà 2022-04-13 16:57:23 +02:00
parent 63cbe0e26f
commit 0c17bb6e34

View file

@ -15,8 +15,6 @@ pub struct AlertModalBuilder<'a> {
prompt: String, prompt: String,
validators: Vec<Option<TextValidationFn>>, validators: Vec<Option<TextValidationFn>>,
placeholders: Vec<Option<String>>, placeholders: Vec<Option<String>>,
fields_amt: u8, // TODO: this can go away, len(validators) and len(placeholders) are equal, which means
// fields_amt == len(validators) || len(placeholders)
modals: &'a Modals, modals: &'a Modals,
} }
@ -24,20 +22,21 @@ impl<'a> AlertModalBuilder<'a> {
pub fn field(&'a mut self, placeholder: Option<String>, validator: Option<TextValidationFn>) -> &'a mut Self { pub fn field(&'a mut self, placeholder: Option<String>, validator: Option<TextValidationFn>) -> &'a mut Self {
self.validators.push(validator); self.validators.push(validator);
self.placeholders.push(placeholder); self.placeholders.push(placeholder);
self.fields_amt += 1;
self self
} }
pub fn build(&self) -> Result<TextEntryPayloads, xous::Error> { pub fn build(&self) -> Result<TextEntryPayloads, xous::Error> {
self.modals.lock(); self.modals.lock();
let mut final_placeholders: Option<[Option<xous_ipc::String<256>>; 10]> = None; let mut final_placeholders: Option<[Option<xous_ipc::String<256>>; 10]> = None;
let fields_amt = self.validators.len();
match self.placeholders.len() { match self.placeholders.len() {
1.. => { 1.. => {
let mut pl:[Option<xous_ipc::String<256>>; 10] = Default::default(); let mut pl:[Option<xous_ipc::String<256>>; 10] = Default::default();
if self.fields_amt != self.placeholders.len() as u8 { if fields_amt != self.placeholders.len() {
log::warn!("can't have more fields than placeholders"); log::warn!("can't have more fields than placeholders");
self.modals.unlock();
return Err(xous::Error::UnknownError); return Err(xous::Error::UnknownError);
} }
@ -58,7 +57,7 @@ impl<'a> AlertModalBuilder<'a> {
let mut spec = ManagedPromptWithTextResponse { let mut spec = ManagedPromptWithTextResponse {
token: self.modals.token, token: self.modals.token,
prompt: xous_ipc::String::from_str(&self.prompt), prompt: xous_ipc::String::from_str(&self.prompt),
fields: self.fields_amt as u32, fields: fields_amt as u32,
placeholders: final_placeholders, placeholders: final_placeholders,
}; };
@ -130,7 +129,6 @@ impl Modals {
prompt: String::from(prompt), prompt: String::from(prompt),
validators: vec![], validators: vec![],
placeholders: vec![], placeholders: vec![],
fields_amt: 0,
modals: self modals: self
} }
} }