Simplify `checkbox` example

1 files changed, 29 insertions, 34 deletions

diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs
index 314cb3fe..81eb31c7 100644
--- a/examples/checkbox/src/main.rs
+++ b/examples/checkbox/src/main.rs
@@ -1,6 +1,6 @@
 use iced::executor;
 use iced::font::{self, Font};
-use iced::theme::Checkbox;
+use iced::theme;
 use iced::widget::{checkbox, column, container, row, text};
 use iced::{Application, Command, Element, Length, Settings, Theme};
 
@@ -12,17 +12,16 @@ pub fn main() -> iced::Result {
 
 #[derive(Default)]
 struct Example {
-    default_checkbox: bool,
-    custom_checkbox: bool,
-    styled_checkbox_enabled: bool,
-    styled_checkbox_checked: bool,
+    default: bool,
+    styled: bool,
+    custom: bool,
 }
 
 #[derive(Debug, Clone, Copy)]
 enum Message {
-    DefaultChecked(bool),
-    CustomChecked(bool),
-    StyledChecked(bool),
+    DefaultToggled(bool),
+    CustomToggled(bool),
+    StyledToggled(bool),
     FontLoaded(Result<(), font::Error>),
 }
 
@@ -46,13 +45,14 @@ impl Application for Example {
 
     fn update(&mut self, message: Message) -> Command<Message> {
         match message {
-            Message::DefaultChecked(value) => {
-                self.default_checkbox = value;
-                self.styled_checkbox_enabled = value;
+            Message::DefaultToggled(default) => {
+                self.default = default;
             }
-            Message::CustomChecked(value) => self.custom_checkbox = value,
-            Message::StyledChecked(value) => {
-                self.styled_checkbox_checked = value
+            Message::StyledToggled(styled) => {
+                self.styled = styled;
+            }
+            Message::CustomToggled(custom) => {
+                self.custom = custom;
             }
             Message::FontLoaded(_) => (),
         }
@@ -61,30 +61,25 @@ impl Application for Example {
     }
 
     fn view(&self) -> Element<Message> {
-        let default_checkbox = checkbox("Default", self.default_checkbox)
-            .on_toggle(Message::DefaultChecked);
+        let default_checkbox = checkbox("Default", self.default)
+            .on_toggle(Message::DefaultToggled);
 
-        let checkboxes = [
-            ("Primary", Checkbox::Primary),
-            ("Secondary", Checkbox::Secondary),
-            ("Success", Checkbox::Success),
-            ("Danger", Checkbox::Danger),
-        ];
+        let styled_checkbox = |label, style| {
+            checkbox(label, self.styled)
+                .on_toggle_maybe(self.default.then(|| Message::StyledToggled))
+                .style(style)
+        };
 
-        let checkboxes = row(checkboxes
-            .into_iter()
-            .map(|(label, style)| {
-                checkbox(label, self.styled_checkbox_checked)
-                    .on_toggle_maybe(
-                        self.default_checkbox.then(|| Message::StyledChecked),
-                    )
-                    .style(style)
-            })
-            .map(Element::from))
+        let checkboxes = row![
+            styled_checkbox("Primary", theme::Checkbox::Primary),
+            styled_checkbox("Secondary", theme::Checkbox::Secondary),
+            styled_checkbox("Success", theme::Checkbox::Success),
+            styled_checkbox("Danger", theme::Checkbox::Danger),
+        ]
         .spacing(10);
 
-        let custom_checkbox = checkbox("Custom", self.custom_checkbox)
-            .on_toggle(Message::CustomChecked)
+        let custom_checkbox = checkbox("Custom", self.custom)
+            .on_toggle(Message::CustomToggled)
             .icon(checkbox::Icon {
                 font: ICON_FONT,
                 code_point: '\u{e901}',