From 3e5603ddfd644bb8dbed67809bb014555434dbf3 Mon Sep 17 00:00:00 2001
From: genusistimelord <lordsatin@hotmail.com>
Date: Tue, 21 May 2024 09:52:23 -0400
Subject: [PATCH] upgraded Date Picker to newest iced changes

---
 Cargo.lock                         |   8 ++
 Cargo.toml                         |   3 +-
 examples/date_picker/src/main.rs   | 138 +++++++++--------------------
 src/core/date.rs                   |   8 +-
 src/style.rs                       |   2 -
 src/style/badge.rs                 |  18 ++--
 src/style/date_picker.rs           | 135 ++++++++++------------------
 src/style/number_input.rs          |   2 +-
 src/style/status.rs                |   2 +
 src/widgets/date_picker.rs         |  52 ++++++-----
 src/widgets/helpers.rs             |   8 +-
 src/widgets/overlay/date_picker.rs |  93 ++++++++++++-------
 12 files changed, 215 insertions(+), 254 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 96f63f89..692d3dcd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -755,6 +755,14 @@ dependencies = [
  "zbus",
 ]
 
+[[package]]
+name = "date_picker"
+version = "0.1.0"
+dependencies = [
+ "iced",
+ "iced_aw",
+]
+
 [[package]]
 name = "dconf_rs"
 version = "0.3.0"
diff --git a/Cargo.toml b/Cargo.toml
index 796654a0..c6908c0f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,7 @@ default = [
     "badge",
     "card",
     "number_input",
-    #"date_picker",
+    "date_picker",
     #"color_picker",
     #"grid",
     #"tab_bar",
@@ -80,6 +80,7 @@ members = [
     "examples/badge",
     "examples/card",
     "examples/number_input",
+    "examples/date_picker",
     #"examples/color_picker",
     #"examples/font_loading",
     #"examples/grid",
diff --git a/examples/date_picker/src/main.rs b/examples/date_picker/src/main.rs
index 1bfe6cb6..9b218474 100644
--- a/examples/date_picker/src/main.rs
+++ b/examples/date_picker/src/main.rs
@@ -1,12 +1,17 @@
 use iced::{
-    alignment, font,
-    widget::{container, text, Button, Container, Row, Text},
-    Alignment, Application, Command, Element, Length, Settings, Theme,
+    widget::{Button, Container, Row, Text},
+    Alignment, Element, Length,
 };
 use iced_aw::{date_picker::Date, helpers::date_picker};
 
 fn main() -> iced::Result {
-    DatePickerExample::run(Settings::default())
+    iced::program(
+        "DatePicker example",
+        DatePickerExample::update,
+        DatePickerExample::view,
+    )
+    .font(iced_aw::BOOTSTRAP_FONT_BYTES)
+    .run()
 }
 
 #[derive(Clone, Debug)]
@@ -15,109 +20,52 @@ enum Message {
     ChooseDate,
     SubmitDate(Date),
     CancelDate,
-    #[allow(dead_code)]
-    Loaded(Result<(), String>),
-    FontLoaded(Result<(), font::Error>),
 }
 
-enum DatePickerExample {
-    Loading,
-    Loaded(State),
-}
-
-struct State {
+#[derive(Default)]
+struct DatePickerExample {
     date: Date,
     show_picker: bool,
 }
 
-async fn load() -> Result<(), String> {
-    Ok(())
-}
-
-impl Application for DatePickerExample {
-    type Message = Message;
-    type Theme = Theme;
-    type Executor = iced::executor::Default;
-    type Flags = ();
-
-    fn new(_flags: ()) -> (DatePickerExample, Command<Message>) {
-        (
-            DatePickerExample::Loading,
-            Command::batch(vec![
-                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
-                Command::perform(load(), Message::Loaded),
-            ]),
-        )
-    }
-
-    fn title(&self) -> String {
-        String::from("DatePicker example")
-    }
-
-    fn update(&mut self, message: Self::Message) -> Command<Message> {
-        match self {
-            DatePickerExample::Loading => {
-                if let Message::Loaded(_) = message {
-                    *self = DatePickerExample::Loaded(State {
-                        date: Date::today(),
-                        show_picker: false,
-                    })
-                }
+impl DatePickerExample {
+    fn update(&mut self, message: Message) {
+        match message {
+            Message::ChooseDate => {
+                self.show_picker = true;
+            }
+            Message::SubmitDate(date) => {
+                self.date = date;
+                self.show_picker = false;
+            }
+            Message::CancelDate => {
+                self.show_picker = false;
             }
-            DatePickerExample::Loaded(state) => match message {
-                Message::ChooseDate => {
-                    state.show_picker = true;
-                }
-                Message::SubmitDate(date) => {
-                    state.date = date;
-                    state.show_picker = false;
-                }
-                Message::CancelDate => {
-                    state.show_picker = false;
-                }
-                _ => {}
-            },
         }
-
-        Command::none()
     }
 
-    fn view(&self) -> Element<'_, Self::Message> {
-        match self {
-            DatePickerExample::Loading => container(
-                text("Loading...")
-                    .horizontal_alignment(alignment::Horizontal::Center)
-                    .size(50),
-            )
-            .width(Length::Fill)
-            .height(Length::Fill)
-            .center_y()
-            .center_x()
-            .into(),
-            DatePickerExample::Loaded(state) => {
-                let but = Button::new(Text::new("Set Date")).on_press(Message::ChooseDate);
+    fn view(&self) -> Element<'_, Message> {
+        let but = Button::new(Text::new("Set Date")).on_press(Message::ChooseDate);
 
-                let datepicker = date_picker(
-                    state.show_picker,
-                    state.date,
-                    but,
-                    Message::CancelDate,
-                    Message::SubmitDate,
-                );
+        let datepicker = date_picker(
+            self.show_picker,
+            self.date,
+            but,
+            Message::CancelDate,
+            Message::SubmitDate,
+        );
 
-                let row = Row::new()
-                    .align_items(Alignment::Center)
-                    .spacing(10)
-                    .push(datepicker)
-                    .push(Text::new(format!("Date: {}", state.date,)));
+        let row = Row::new()
+            .align_items(Alignment::Center)
+            .spacing(10)
+            .push(datepicker)
+            .push(Text::new(format!("Date: {}", self.date,)));
 
-                Container::new(row)
-                    .center_x()
-                    .center_y()
-                    .width(Length::Fill)
-                    .height(Length::Fill)
-                    .into()
-            }
-        }
+        Container::new(row)
+            .center_x(Length::Fill)
+            .center_y(Length::Fill)
+            .width(Length::Fill)
+            .height(Length::Fill)
+            .into()
     }
 }
diff --git a/src/core/date.rs b/src/core/date.rs
index 2179fce1..ef30120e 100644
--- a/src/core/date.rs
+++ b/src/core/date.rs
@@ -5,7 +5,7 @@ use once_cell::sync::Lazy;
 use std::fmt::Display;
 
 /// The date value
-#[derive(Clone, Copy, Debug, Default)]
+#[derive(Clone, Copy, Debug)]
 pub struct Date {
     /// The year value of the date.
     pub year: i32,
@@ -15,6 +15,12 @@ pub struct Date {
     pub day: u32,
 }
 
+impl Default for Date {
+    fn default() -> Self {
+        Self { year: 2024, month: 1, day: 1 }
+    }
+}
+
 impl Date {
     /// Creates a new date from the current timestamp.
     #[must_use]
diff --git a/src/style.rs b/src/style.rs
index 5c456810..71647e7d 100644
--- a/src/style.rs
+++ b/src/style.rs
@@ -19,8 +19,6 @@ pub use color_picker::ColorPickerStyles;
 
 #[cfg(feature = "date_picker")]
 pub mod date_picker;
-#[cfg(feature = "date_picker")]
-pub use date_picker::DatePickerStyle;
 
 #[cfg(feature = "tab_bar")]
 pub mod tab_bar;
diff --git a/src/style/badge.rs b/src/style/badge.rs
index 001230b1..83bfbbe0 100644
--- a/src/style/badge.rs
+++ b/src/style/badge.rs
@@ -67,12 +67,12 @@ pub fn primary(theme: &Theme, status: Status) -> Style {
     let base = styled(palette.primary.strong);
 
     match status {
-        Status::Active | Status::Pressed | Status::Focused => base,
         Status::Hovered => Style {
             background: Background::Color(palette.primary.base.color),
             ..base
         },
         Status::Disabled => disabled(base),
+        _ => base,
     }
 }
 
@@ -83,12 +83,12 @@ pub fn secondary(theme: &Theme, status: Status) -> Style {
     let base = styled(palette.secondary.strong);
 
     match status {
-        Status::Active | Status::Pressed | Status::Focused => base,
         Status::Hovered => Style {
             background: Background::Color(palette.primary.base.color),
             ..base
         },
         Status::Disabled => disabled(base),
+        _ => base,
     }
 }
 
@@ -99,12 +99,12 @@ pub fn success(theme: &Theme, status: Status) -> Style {
     let base = styled(palette.success.strong);
 
     match status {
-        Status::Active | Status::Pressed | Status::Focused => base,
         Status::Hovered => Style {
             background: Background::Color(palette.primary.base.color),
             ..base
         },
         Status::Disabled => disabled(base),
+        _ => base,
     }
 }
 
@@ -115,12 +115,12 @@ pub fn danger(theme: &Theme, status: Status) -> Style {
     let base = styled(palette.danger.strong);
 
     match status {
-        Status::Active | Status::Pressed | Status::Focused => base,
         Status::Hovered => Style {
             background: Background::Color(palette.primary.base.color),
             ..base
         },
         Status::Disabled => disabled(base),
+        _ => base,
     }
 }
 
@@ -130,12 +130,12 @@ pub fn warning(_theme: &Theme, status: Status) -> Style {
     let base = from_color(colors::WARNING, colors::BLACK);
 
     match status {
-        Status::Active | Status::Pressed | Status::Focused => base,
         Status::Hovered => Style {
             background: base.background,
             ..base
         },
         Status::Disabled => disabled(base),
+        _ => base,
     }
 }
 
@@ -145,12 +145,12 @@ pub fn info(_theme: &Theme, status: Status) -> Style {
     let base = from_color(colors::INFO, colors::BLACK);
 
     match status {
-        Status::Active | Status::Pressed | Status::Focused => base,
         Status::Hovered => Style {
             background: base.background,
             ..base
         },
         Status::Disabled => disabled(base),
+        _ => base,
     }
 }
 
@@ -160,12 +160,12 @@ pub fn light(_theme: &Theme, status: Status) -> Style {
     let base = from_color(colors::LIGHT, colors::BLACK);
 
     match status {
-        Status::Active | Status::Pressed | Status::Focused => base,
         Status::Hovered => Style {
             background: base.background,
             ..base
         },
         Status::Disabled => disabled(base),
+        _ => base,
     }
 }
 
@@ -175,12 +175,12 @@ pub fn dark(_theme: &Theme, status: Status) -> Style {
     let base = from_color(colors::DARK, colors::WHITE);
 
     match status {
-        Status::Active | Status::Pressed | Status::Focused => base,
         Status::Hovered => Style {
             background: base.background,
             ..base
         },
         Status::Disabled => disabled(base),
+        _ => base,
     }
 }
 
@@ -190,12 +190,12 @@ pub fn white(_theme: &Theme, status: Status) -> Style {
     let base = from_color(colors::WHITE, colors::BLACK);
 
     match status {
-        Status::Active | Status::Pressed | Status::Focused => base,
         Status::Hovered => Style {
             background: base.background,
             ..base
         },
         Status::Disabled => disabled(base),
+        _ => base,
     }
 }
 
diff --git a/src/style/date_picker.rs b/src/style/date_picker.rs
index 1b71d28f..87b05e58 100644
--- a/src/style/date_picker.rs
+++ b/src/style/date_picker.rs
@@ -1,14 +1,12 @@
 //! Use a date picker as an input element for picking dates.
 //!
 //! *This API requires the following crate features to be activated: `date_picker`*
-
-use std::rc::Rc;
-
+use super::{Status, StyleFn};
 use iced::{Background, Color, Theme};
 
 /// The appearance of a [`DatePicker`](crate::native::DatePicker).
 #[derive(Clone, Copy, Debug)]
-pub struct Appearance {
+pub struct Style {
     /// The background of the [`DatePicker`](crate::native::DatePicker).
     pub background: Background,
 
@@ -33,103 +31,64 @@ pub struct Appearance {
     pub day_background: Background,
 }
 
-/// The appearance of a [`DatePicker`](crate::native::DatePicker).
-pub trait StyleSheet {
-    /// The style type of this stylesheet
-    type Style: Default + Clone;
-    /// The normal appearance of a [`DatePicker`](crate::native::DatePicker).
-    fn active(&self, style: &Self::Style) -> Appearance;
-
-    /// The appearance when something is selected of the
-    /// [`DatePicker`](crate::native::DatePicker).
-    fn selected(&self, style: &Self::Style) -> Appearance;
+/// The Catalog of a [`DatePicker`](crate::native::DatePicker).
+pub trait Catalog {
+    ///Style for the trait to use.
+    type Class<'a>;
 
-    /// The appearance when something is hovered of the
-    /// [`DatePicker`](crate::native::DatePicker).
-    fn hovered(&self, style: &Self::Style) -> Appearance;
+    /// The default class produced by the [`Catalog`].
+    fn default<'a>() -> Self::Class<'a>;
 
-    /// The appearance when something is focused of the
-    /// [`DatePicker`](crate::native::DatePicker).
-    fn focused(&self, style: &Self::Style) -> Appearance;
+    /// The [`Style`] of a class with the given status.
+    fn style(&self, class: &Self::Class<'_>, status: Status) -> Style;
 }
 
-/// The default appearance of the [`DatePicker`](crate::native::DatePicker).
-#[derive(Clone, Default)]
-#[allow(missing_docs, clippy::missing_docs_in_private_items)]
-pub enum DatePickerStyle {
-    #[default]
-    Default,
-    Custom(Rc<dyn StyleSheet<Style = Theme>>),
-}
+impl Catalog for Theme {
+    type Class<'a> = StyleFn<'a, Self, Style>;
 
-impl DatePickerStyle {
-    /// Creates a custom [`DatePickerStyle`] style variant.
-    pub fn custom(style_sheet: impl StyleSheet<Style = Theme> + 'static) -> Self {
-        Self::Custom(Rc::new(style_sheet))
+    fn default<'a>() -> Self::Class<'a> {
+        Box::new(primary)
     }
-}
 
-impl StyleSheet for Theme {
-    type Style = DatePickerStyle;
-
-    fn active(&self, style: &Self::Style) -> Appearance {
-        if let DatePickerStyle::Custom(custom) = style {
-            return custom.active(self);
-        }
-
-        let palette = self.extended_palette();
-        let foreground = self.palette();
-
-        Appearance {
-            background: palette.background.base.color.into(),
-            border_radius: 15.0,
-            border_width: 1.0,
-            border_color: foreground.text,
-            text_color: foreground.text,
-            text_attenuated_color: Color {
-                a: foreground.text.a * 0.5,
-                ..foreground.text
-            },
-            day_background: palette.background.base.color.into(),
-        }
+    fn style(&self, class: &Self::Class<'_>, status: Status) -> Style {
+        class(self, status)
     }
+}
 
-    fn selected(&self, style: &Self::Style) -> Appearance {
-        if let DatePickerStyle::Custom(custom) = style {
-            return custom.selected(self);
-        }
-
-        let palette = self.extended_palette();
-
-        Appearance {
+/// The primary theme of a [`Badge`](crate::native::badge::Badge).
+#[must_use]
+pub fn primary(theme: &Theme, status: Status) -> Style {
+    let palette = theme.extended_palette();
+    let foreground = theme.palette();
+
+    let base = Style {
+        background: palette.background.base.color.into(),
+        border_radius: 15.0,
+        border_width: 1.0,
+        border_color: foreground.text,
+        text_color: foreground.text,
+        text_attenuated_color: Color {
+            a: foreground.text.a * 0.5,
+            ..foreground.text
+        },
+        day_background: palette.background.base.color.into(),
+    };
+
+    match status {
+        Status::Selected => Style {
             day_background: palette.primary.strong.color.into(),
             text_color: palette.primary.strong.text,
-            ..self.active(style)
-        }
-    }
-
-    fn hovered(&self, style: &Self::Style) -> Appearance {
-        if let DatePickerStyle::Custom(custom) = style {
-            return custom.hovered(self);
-        }
-
-        let palette = self.extended_palette();
-
-        Appearance {
+            ..base
+        },
+        Status::Hovered => Style {
             day_background: palette.primary.weak.color.into(),
             text_color: palette.primary.weak.text,
-            ..self.active(style)
-        }
-    }
-
-    fn focused(&self, style: &Self::Style) -> Appearance {
-        if let DatePickerStyle::Custom(custom) = style {
-            return custom.focused(self);
-        }
-
-        Appearance {
+            ..base
+        },
+        Status::Focused => Style {
             border_color: Color::from_rgb(0.5, 0.5, 0.5),
-            ..self.active(style)
-        }
+            ..base
+        },
+        _ => base,
     }
 }
diff --git a/src/style/number_input.rs b/src/style/number_input.rs
index 2cab403b..cae1aefa 100644
--- a/src/style/number_input.rs
+++ b/src/style/number_input.rs
@@ -77,7 +77,6 @@ pub fn primary(theme: &Theme, status: Status) -> Style {
     };
 
     match status {
-        Status::Active | Status::Pressed | Status::Focused | Status::Hovered => base,
         Status::Disabled => Style {
             button_background: base.button_background.map(|bg| match bg {
                 Background::Color(color) => Background::Color(Color {
@@ -91,5 +90,6 @@ pub fn primary(theme: &Theme, status: Status) -> Style {
                 ..base.icon_color
             },
         },
+        _ => base,
     }
 }
diff --git a/src/style/status.rs b/src/style/status.rs
index 24de00f7..c6a91d87 100644
--- a/src/style/status.rs
+++ b/src/style/status.rs
@@ -13,6 +13,8 @@ pub enum Status {
     Disabled,
     /// is focused.
     Focused,
+    /// is Selected.
+    Selected,
 }
 
 /// The style function of widgets.
diff --git a/src/widgets/date_picker.rs b/src/widgets/date_picker.rs
index 48aedbf1..d69c3fdb 100644
--- a/src/widgets/date_picker.rs
+++ b/src/widgets/date_picker.rs
@@ -18,7 +18,6 @@ use iced::{
     },
     event,
     mouse::{self, Cursor},
-    widget::button,
     Element,
     Event,
     Length,
@@ -32,7 +31,7 @@ use iced::{
 
 pub use crate::{
     core::date::Date,
-    style::date_picker::{Appearance, StyleSheet},
+    style::{date_picker::Style, Status, StyleFn},
 };
 
 //TODO: Remove ignore when Null is updated. Temp fix for Test runs
@@ -63,7 +62,7 @@ pub use crate::{
 pub struct DatePicker<'a, Message, Theme>
 where
     Message: Clone,
-    Theme: StyleSheet + button::StyleSheet,
+    Theme: crate::style::date_picker::Catalog + iced::widget::button::Catalog,
 {
     /// Show the picker.
     show_picker: bool,
@@ -76,7 +75,7 @@ where
     /// The function that produces a message when the submit button of the [`DatePickerOverlay`] is pressed.
     on_submit: Box<dyn Fn(Date) -> Message>,
     /// The style of the [`DatePickerOverlay`].
-    style: <Theme as StyleSheet>::Style,
+    class: <Theme as crate::style::date_picker::Catalog>::Class<'a>,
     /// The buttons of the overlay.
     overlay_state: Element<'a, Message, Theme, Renderer>,
     //button_style: <Renderer as button::Renderer>::Style, // clone not satisfied
@@ -88,10 +87,10 @@ impl<'a, Message, Theme> DatePicker<'a, Message, Theme>
 where
     Message: 'a + Clone,
     Theme: 'a
-        + StyleSheet
-        + button::StyleSheet
-        + iced::widget::text::StyleSheet
-        + iced::widget::container::StyleSheet,
+        + crate::style::date_picker::Catalog
+        + iced::widget::button::Catalog
+        + iced::widget::text::Catalog
+        + iced::widget::container::Catalog,
 {
     /// Creates a new [`DatePicker`] wrapping around the given underlay.
     ///
@@ -121,7 +120,7 @@ where
             underlay: underlay.into(),
             on_cancel,
             on_submit: Box::new(on_submit),
-            style: <Theme as StyleSheet>::Style::default(),
+            class: <Theme as crate::style::date_picker::Catalog>::default(),
             overlay_state: DatePickerOverlayButtons::default().into(),
             //button_style: <Renderer as button::Renderer>::Style::default(),
             font_size: None,
@@ -130,8 +129,11 @@ where
 
     /// Sets the style of the [`DatePicker`].
     #[must_use]
-    pub fn style(mut self, style: <Theme as StyleSheet>::Style) -> Self {
-        self.style = style;
+    pub fn style(mut self, style: impl Fn(&Theme, Status) -> Style + 'a) -> Self
+    where
+        <Theme as crate::style::date_picker::Catalog>::Class<'a>: From<StyleFn<'a, Theme, Style>>,
+    {
+        self.class = (Box::new(style) as StyleFn<'a, Theme, Style>).into();
         //self.button_style = style.into();
         self
     }
@@ -142,6 +144,16 @@ where
         self.font_size = Some(size.into());
         self
     }
+
+    /// Sets the class of the input of the [`DatePicker`].
+    #[must_use]
+    pub fn class(
+        mut self,
+        class: impl Into<<Theme as crate::style::date_picker::Catalog>::Class<'a>>,
+    ) -> Self {
+        self.class = class.into();
+        self
+    }
 }
 
 /// The state of the [`DatePicker`] / [`DatePickerOverlay`].
@@ -177,10 +189,10 @@ impl State {
 impl<'a, Message, Theme> Widget<Message, Theme, Renderer> for DatePicker<'a, Message, Theme>
 where
     Message: 'static + Clone,
-    Theme: StyleSheet
-        + button::StyleSheet
-        + iced::widget::text::StyleSheet
-        + iced::widget::container::StyleSheet,
+    Theme: crate::style::date_picker::Catalog
+        + iced::widget::button::Catalog
+        + iced::widget::text::Catalog
+        + iced::widget::container::Catalog,
 {
     fn tag(&self) -> Tag {
         Tag::of::<State>()
@@ -296,7 +308,7 @@ where
                 self.on_cancel.clone(),
                 &self.on_submit,
                 position,
-                self.style.clone(),
+                &self.class,
                 &mut state.children[1],
                 self.font_size.unwrap_or_else(|| renderer.default_size()),
             )
@@ -310,10 +322,10 @@ impl<'a, Message, Theme> From<DatePicker<'a, Message, Theme>>
 where
     Message: 'static + Clone,
     Theme: 'a
-        + StyleSheet
-        + button::StyleSheet
-        + iced::widget::text::StyleSheet
-        + iced::widget::container::StyleSheet,
+        + crate::style::date_picker::Catalog
+        + iced::widget::button::Catalog
+        + iced::widget::text::Catalog
+        + iced::widget::container::Catalog,
 {
     fn from(date_picker: DatePicker<'a, Message, Theme>) -> Self {
         Element::new(date_picker)
diff --git a/src/widgets/helpers.rs b/src/widgets/helpers.rs
index 737cce98..1f824e66 100644
--- a/src/widgets/helpers.rs
+++ b/src/widgets/helpers.rs
@@ -212,10 +212,10 @@ pub fn date_picker<'a, Message, Theme, F>(
 where
     Message: 'a + Clone,
     Theme: 'a
-        + crate::style::date_picker::StyleSheet
-        + iced::widget::button::StyleSheet
-        + iced::widget::text::StyleSheet
-        + iced::widget::container::StyleSheet,
+        + crate::style::date_picker::Catalog
+        + iced::widget::button::Catalog
+        + iced::widget::text::Catalog
+        + iced::widget::container::Catalog,
     F: 'static + Fn(crate::core::date::Date) -> Message,
 {
     crate::DatePicker::new(show_picker, date, underlay, on_cancel, on_submit)
diff --git a/src/widgets/overlay/date_picker.rs b/src/widgets/overlay/date_picker.rs
index 1eaecd6c..6767a12d 100644
--- a/src/widgets/overlay/date_picker.rs
+++ b/src/widgets/overlay/date_picker.rs
@@ -9,10 +9,7 @@ use crate::{
         overlay::Position,
     },
     date_picker,
-    style::{
-        date_picker::{Appearance, StyleSheet},
-        style_state::StyleState,
-    },
+    style::{date_picker::Style, style_state::StyleState, Status},
 };
 
 use chrono::{Datelike, Local, NaiveDate};
@@ -29,7 +26,7 @@ use iced::{
     keyboard,
     mouse::{self, Cursor},
     touch,
-    widget::{button, container, text, Button, Column, Container, Row, Text},
+    widget::{text, Button, Column, Container, Row, Text},
     Alignment,
     Border,
     Color,
@@ -57,10 +54,11 @@ const BUTTON_SPACING: f32 = 5.0;
 
 /// The overlay of the [`DatePicker`](crate::native::DatePicker).
 #[allow(missing_debug_implementations)]
-pub struct DatePickerOverlay<'a, Message, Theme>
+pub struct DatePickerOverlay<'a, 'b, Message, Theme>
 where
     Message: Clone,
-    Theme: StyleSheet + button::StyleSheet,
+    Theme: crate::style::date_picker::Catalog + iced::widget::button::Catalog,
+    'b: 'a,
 {
     /// The state of the [`DatePickerOverlay`].
     state: &'a mut State,
@@ -73,17 +71,22 @@ where
     /// The position of the [`DatePickerOverlay`].
     position: Point,
     /// The style of the [`DatePickerOverlay`].
-    style: <Theme as StyleSheet>::Style,
+    class: &'a <Theme as crate::style::date_picker::Catalog>::Class<'b>,
     /// The reference to the tree holding the state of this overlay.
     tree: &'a mut Tree,
     /// The font size of text and icons in the [`DatePickerOverlay`]
     font_size: Pixels,
 }
 
-impl<'a, Message, Theme> DatePickerOverlay<'a, Message, Theme>
+impl<'a, 'b, Message, Theme> DatePickerOverlay<'a, 'b, Message, Theme>
 where
     Message: 'static + Clone,
-    Theme: 'a + StyleSheet + button::StyleSheet + text::StyleSheet + container::StyleSheet,
+    Theme: 'a
+        + crate::style::date_picker::Catalog
+        + iced::widget::button::Catalog
+        + iced::widget::text::Catalog
+        + iced::widget::container::Catalog,
+    'b: 'a,
 {
     /// Creates a new [`DatePickerOverlay`] on the given position.
     pub fn new(
@@ -91,7 +94,7 @@ where
         on_cancel: Message,
         on_submit: &'a dyn Fn(Date) -> Message,
         position: Point,
-        style: <Theme as StyleSheet>::Style,
+        class: &'a <Theme as crate::style::date_picker::Catalog>::Class<'b>,
         tree: &'a mut Tree,
         //button_style: impl Clone +  Into<<Renderer as button::Renderer>::Style>, // clone not satisfied
         font_size: Pixels,
@@ -120,7 +123,7 @@ where
             .on_press(on_cancel), // Sending a fake message
             on_submit,
             position,
-            style,
+            class,
             tree,
             font_size,
         }
@@ -374,10 +377,16 @@ where
     }
 }
 
-impl<'a, Message, Theme> Overlay<Message, Theme, Renderer> for DatePickerOverlay<'a, Message, Theme>
+impl<'a, 'b, Message, Theme> Overlay<Message, Theme, Renderer>
+    for DatePickerOverlay<'a, 'b, Message, Theme>
 where
     Message: 'static + Clone,
-    Theme: 'a + StyleSheet + button::StyleSheet + text::StyleSheet + container::StyleSheet,
+    Theme: 'a
+        + crate::style::date_picker::Catalog
+        + iced::widget::button::Catalog
+        + iced::widget::text::Catalog
+        + iced::widget::container::Catalog,
+    'b: 'a,
 {
     #[allow(clippy::too_many_lines)]
     fn layout(&mut self, renderer: &Renderer, bounds: Size) -> Node {
@@ -484,7 +493,7 @@ where
         ))
         .width(Length::Shrink)
         .height(Length::Shrink)
-        .center_y();
+        .center_y(Length::Shrink);
 
         let col = Column::<Message, Theme, Renderer>::new()
             .spacing(SPACING)
@@ -759,14 +768,23 @@ where
             .expect("Graphics: Layout should have a date layout")
             .children();
 
-        let mut style_sheet: HashMap<StyleState, Appearance> = HashMap::new();
-        let _ = style_sheet.insert(StyleState::Active, StyleSheet::active(theme, &self.style));
+        let mut style_sheet: HashMap<StyleState, Style> = HashMap::new();
+        let _ = style_sheet.insert(
+            StyleState::Active,
+            crate::style::date_picker::Catalog::style(theme, self.class, Status::Active),
+        );
         let _ = style_sheet.insert(
             StyleState::Selected,
-            StyleSheet::selected(theme, &self.style),
+            crate::style::date_picker::Catalog::style(theme, self.class, Status::Selected),
+        );
+        let _ = style_sheet.insert(
+            StyleState::Hovered,
+            crate::style::date_picker::Catalog::style(theme, self.class, Status::Hovered),
+        );
+        let _ = style_sheet.insert(
+            StyleState::Focused,
+            crate::style::date_picker::Catalog::style(theme, self.class, Status::Focused),
         );
-        let _ = style_sheet.insert(StyleState::Hovered, StyleSheet::hovered(theme, &self.style));
-        let _ = style_sheet.insert(StyleState::Focused, StyleSheet::focused(theme, &self.style));
 
         let mut style_state = StyleState::Active;
         if self.state.focus == Focus::Overlay {
@@ -932,7 +950,7 @@ impl Default for State {
 pub struct DatePickerOverlayButtons<'a, Message, Theme>
 where
     Message: Clone,
-    Theme: StyleSheet + button::StyleSheet,
+    Theme: crate::style::date_picker::Catalog + iced::widget::button::Catalog,
 {
     /// The cancel button of the [`DatePickerOverlay`].
     cancel_button: Element<'a, Message, Theme, Renderer>,
@@ -943,7 +961,11 @@ where
 impl<'a, Message, Theme> Default for DatePickerOverlayButtons<'a, Message, Theme>
 where
     Message: 'a + Clone,
-    Theme: 'a + StyleSheet + button::StyleSheet + text::StyleSheet + container::StyleSheet,
+    Theme: 'a
+        + crate::style::date_picker::Catalog
+        + iced::widget::button::Catalog
+        + iced::widget::text::Catalog
+        + iced::widget::container::Catalog,
 {
     fn default() -> Self {
         Self {
@@ -970,7 +992,9 @@ impl<'a, Message, Theme> Widget<Message, Theme, Renderer>
     for DatePickerOverlayButtons<'a, Message, Theme>
 where
     Message: Clone,
-    Theme: StyleSheet + button::StyleSheet + container::StyleSheet,
+    Theme: crate::style::date_picker::Catalog
+        + iced::widget::button::Catalog
+        + iced::widget::container::Catalog,
 {
     fn children(&self) -> Vec<Tree> {
         vec![
@@ -1009,7 +1033,10 @@ impl<'a, Message, Theme> From<DatePickerOverlayButtons<'a, Message, Theme>>
     for Element<'a, Message, Theme, Renderer>
 where
     Message: 'a + Clone,
-    Theme: 'a + StyleSheet + button::StyleSheet + container::StyleSheet,
+    Theme: 'a
+        + crate::style::date_picker::Catalog
+        + iced::widget::button::Catalog
+        + iced::widget::container::Catalog,
 {
     fn from(overlay: DatePickerOverlayButtons<'a, Message, Theme>) -> Self {
         Self::new(overlay)
@@ -1083,7 +1110,7 @@ fn month_year(
     date: &str,
     cursor: Point,
     //style: &Style,
-    style: &HashMap<StyleState, Appearance>,
+    style: &HashMap<StyleState, Style>,
     focus: Focus,
     font_size: Pixels,
 ) {
@@ -1153,7 +1180,7 @@ fn month_year(
         // Left caret
         renderer.fill_text(
             iced::advanced::Text {
-                content: &icon_to_string(Bootstrap::CaretLeftFill),
+                content: icon_to_string(Bootstrap::CaretLeftFill),
                 bounds: Size::new(left_bounds.width, left_bounds.height),
                 size: Pixels(font_size.0 + if left_arrow_hovered { 1.0 } else { 0.0 }),
                 font: BOOTSTRAP_FONT,
@@ -1173,7 +1200,7 @@ fn month_year(
         // Text
         renderer.fill_text(
             iced::advanced::Text {
-                content: text,
+                content: text.to_owned(),
                 bounds: Size::new(center_bounds.width, center_bounds.height),
                 size: font_size,
                 font: renderer.default_font(),
@@ -1193,7 +1220,7 @@ fn month_year(
         // Right caret
         renderer.fill_text(
             iced::advanced::Text {
-                content: &icon_to_string(Bootstrap::CaretRightFill),
+                content: icon_to_string(Bootstrap::CaretRightFill),
                 bounds: Size::new(right_bounds.width, right_bounds.height),
                 size: Pixels(font_size.0 + if right_arrow_hovered { 1.0 } else { 0.0 }),
                 font: BOOTSTRAP_FONT,
@@ -1227,7 +1254,7 @@ fn days(
     date: chrono::NaiveDate,
     cursor: Point,
     //style: &Style,
-    style: &HashMap<StyleState, Appearance>,
+    style: &HashMap<StyleState, Style>,
     focus: Focus,
     font_size: Pixels,
 ) {
@@ -1253,7 +1280,7 @@ fn days(
 fn day_labels(
     renderer: &mut Renderer,
     layout: Layout<'_>,
-    style: &HashMap<StyleState, Appearance>,
+    style: &HashMap<StyleState, Style>,
     _focus: Focus,
     font_size: Pixels,
 ) {
@@ -1262,7 +1289,7 @@ fn day_labels(
 
         renderer.fill_text(
             iced::advanced::Text {
-                content: &crate::core::date::WEEKDAY_LABELS[i],
+                content: crate::core::date::WEEKDAY_LABELS[i].clone(),
                 bounds: Size::new(bounds.width, bounds.height),
                 size: font_size,
                 font: renderer.default_font(),
@@ -1287,7 +1314,7 @@ fn day_table(
     children: &mut dyn Iterator<Item = Layout<'_>>,
     date: chrono::NaiveDate,
     cursor: Point,
-    style: &HashMap<StyleState, Appearance>,
+    style: &HashMap<StyleState, Style>,
     focus: Focus,
     font_size: Pixels,
 ) {
@@ -1354,7 +1381,7 @@ fn day_table(
 
             renderer.fill_text(
                 iced::advanced::Text {
-                    content: &format!("{number:02}"), // Todo: is there some way of static format as this has a fixed size?
+                    content: format!("{number:02}"), // Todo: is there some way of static format as this has a fixed size?
                     bounds: Size::new(bounds.width, bounds.height),
                     size: font_size,
                     font: renderer.default_font(),