From 852a12645b13054473130a27583cebb12ecf74ec Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 30 Nov 2025 21:33:04 +0800 Subject: [PATCH] round out stateful list creation in the ux-api libraries --- libs/ux-api/src/widgets/checkboxes.rs | 7 +++++ libs/ux-api/src/widgets/payload.rs | 41 +++++++-------------------- libs/ux-api/src/widgets/textentry.rs | 2 +- 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/libs/ux-api/src/widgets/checkboxes.rs b/libs/ux-api/src/widgets/checkboxes.rs index 755b5a745..42696749c 100644 --- a/libs/ux-api/src/widgets/checkboxes.rs +++ b/libs/ux-api/src/widgets/checkboxes.rs @@ -30,6 +30,13 @@ impl CheckBoxes { self.items.insert_item(0, list_len - 1, &unchecked_item); } + pub fn add_checked_item(&mut self, new_item: ItemName) { + let checked_item = format!("{}{}", CHECKED, new_item.as_str()); + let list_len = self.items.col_length(0).unwrap_or(1); + self.items.insert_item(0, list_len - 1, &checked_item); + self.action_payload.add(&checked_item); + } + pub fn clear_items(&mut self) { self.items.clear(); } } diff --git a/libs/ux-api/src/widgets/payload.rs b/libs/ux-api/src/widgets/payload.rs index 63afa1bd1..b80b97a0f 100644 --- a/libs/ux-api/src/widgets/payload.rs +++ b/libs/ux-api/src/widgets/payload.rs @@ -1,7 +1,5 @@ use zeroize::Zeroize; -use super::*; - /// We use a new type for item names, so that it's easy to resize this as needed. #[derive(Debug, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] pub struct ItemName(String); @@ -72,45 +70,28 @@ impl RadioButtonPayload { pub fn clear(&mut self) { self.0.0.clear(); } } #[derive(Debug, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] -pub struct CheckBoxPayload(pub [Option; MAX_ITEMS]); // returns a list of potential items that could be selected +pub struct CheckBoxPayload(Vec); // returns a list of potential items that could be selected impl CheckBoxPayload { - pub fn new() -> Self { CheckBoxPayload([const { None }; MAX_ITEMS]) } + pub fn new() -> Self { CheckBoxPayload(Vec::new()) } - pub fn payload(self) -> [Option; MAX_ITEMS] { self.0 } + pub fn payload(self) -> Vec { self.0 } - pub fn contains(&self, name: &str) -> bool { - for maybe_item in self.0.iter() { - if let Some(item) = maybe_item { - if item.as_str() == name { - return true; - } - } - } - false - } + pub fn contains(&self, name: &str) -> bool { self.0.iter().any(|item| item.0 == name) } pub fn add(&mut self, name: &str) -> bool { if self.contains(name) { return true; } - for maybe_item in self.0.iter_mut() { - if maybe_item.is_none() { - *maybe_item = Some(ItemName::new(name)); - return true; - } - } - false + self.0.push(ItemName::new(name)); + true } pub fn remove(&mut self, name: &str) -> bool { - for maybe_item in self.0.iter_mut() { - if let Some(item) = maybe_item { - if item.as_str() == name { - *maybe_item = None; - return true; - } - } + if let Some(pos) = self.0.iter().position(|item| item.0 == name) { + self.0.remove(pos); + true + } else { + false } - false } } diff --git a/libs/ux-api/src/widgets/textentry.rs b/libs/ux-api/src/widgets/textentry.rs index 1d41dfae2..93829706d 100644 --- a/libs/ux-api/src/widgets/textentry.rs +++ b/libs/ux-api/src/widgets/textentry.rs @@ -8,7 +8,7 @@ use crate::minigfx::*; use crate::service::api::Gid; const MAX_FIELDS: i16 = 10; -pub const MAX_ITEMS: usize = 8; +pub const MAX_ITEMS: usize = 40; pub type ValidatorErr = String; pub type Payloads = [TextEntryPayload; MAX_FIELDS as usize];