Migrating styles from 0.4 to 0.5

[flomang]

I'm looking for guidance on how to migrate our existing styles to the new hotness. We have styles that look like this in our code base:

pub struct NormalBackgroundContainer(pub Palette);
impl container::StyleSheet for NormalBackgroundContainer {
    fn style(&self) -> container::Style {
        container::Style {
            background: Some(Background::Color(self.0.base.background)),
            text_color: Some(self.0.normal.secondary),
            ..container::Style::default()
        }
    }
}

We then set styles such as these on containers via:

   Container::new(content)
            .width(Length::Fill)
            .height(Length::Fill)
            .style(style::NormalBackgroundContainer(color_palette))
            .into();

For 0.5 I updated our style to look like this:

pub struct NormalBackgroundContainer(pub Palette);
impl container::StyleSheet for NormalBackgroundContainer {
    type Style = iced_style::theme::Container;

    fn appearance(&self, style: &Self::Style) -> container::Appearance {
        container::Appearance {
            background: Some(Background::Color(self.0.base.foreground)),
            text_color: Some(self.0.normal.surface),
            ..container::Appearance::default()
        }
    }
}

I couldn't get this to work though due to:

the trait bound `iced::theme::Container: From<NormalBackgroundContainer>` is not satisfied
the trait `From<for<'r> fn(&'r iced::Theme) -> iced_style::container::Appearance>` is implemented for `iced::theme::Container`
required for `NormalBackgroundContainer` to implement `Into<iced::theme::Container>`

What should I be doing here for our custom container style?

Similarly, I tried to create a custom button style like so, but this seems wrong/incomplete as well? I'm not sure how to proceed as I've tried to dig out what examples I could from the ice_styles code base.

pub struct NormalTextButton(pub ColorPalette);
impl button::StyleSheet for NormalTextButton {
    type Style = iced_style::theme::Button;

    fn active(&self, style: &Self::Style) -> button::Appearance {
        button::Appearance {
            text_color: self.0.normal.surface,
            border_radius: 2.0,
            ..button::Appearance::default()
        }
    }

    fn hovered(&self, style: &Self::Style) -> button::Appearance {
        button::Appearance {
            background: Some(Background::Color(Color::TRANSPARENT)),
            text_color: self.0.bright.primary,
            ..self.active(style)
        }
    }
}

Sample implementations used to be included in the style example for 0.4. But sadly, there aren't any examples for these situations for 0.5.

Thanks!

[tarkah]

See my example here

https://github.com/tarkah/iced-snippets/blob/master/snippets/custom-theme/src/main.rs

[flomang]

Thank you so much! I will give this a shot.

[flomang]

Yep, that was it. Folks, this should be the styling example. Thanks again!