From 381dee01ebb2e24c08e8ba8ade62a8279ee24164 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 30 Nov 2025 21:32:26 +0800 Subject: [PATCH] fix interfaces in GAM for stateful lists --- services/gam/src/modal.rs | 39 ++++++++-------------------- services/gam/src/modal/checkboxes.rs | 5 ++++ 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/services/gam/src/modal.rs b/services/gam/src/modal.rs index eed33aa8a..809b46f4b 100644 --- a/services/gam/src/modal.rs +++ b/services/gam/src/modal.rs @@ -153,46 +153,29 @@ 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/services/gam/src/modal/checkboxes.rs b/services/gam/src/modal/checkboxes.rs index 43ecba3d6..2dfa74acd 100644 --- a/services/gam/src/modal/checkboxes.rs +++ b/services/gam/src/modal/checkboxes.rs @@ -37,6 +37,11 @@ impl CheckBoxes { pub fn add_item(&mut self, new_item: ItemName) { self.items.push(new_item); } + pub fn add_checked_item(&mut self, new_item: ItemName) { + self.action_payload.add(&new_item.0); + self.items.push(new_item); + } + pub fn clear_items(&mut self) { self.items.clear(); } } impl ActionApi for CheckBoxes {