chore: use the new iced::theme::Theme

instead of create a new Appearance

Author: Decodetalkers

iced_examples/bottom_panel/src/main.rs

@@ -60,9 +60,9 @@ impl Panel {
         container(row).into()
     }
 
-    fn style(&self, theme: &iced::Theme) -> iced_layershell::Appearance {
-        use iced_layershell::Appearance;
-        Appearance {
+    fn style(&self, theme: &iced::Theme) -> iced::theme::Style {
+        use iced::theme::Style;
+        Style {
             background_color: Color::TRANSPARENT,
             text_color: theme.palette().text,
         }

iced_examples/counter/src/main.rs

@@ -156,9 +156,9 @@ impl Application for Counter {
         .into()
     }
 
-    fn style(&self, theme: &Self::Theme) -> iced_layershell::Appearance {
-        use iced_layershell::Appearance;
-        Appearance {
+    fn style(&self, theme: &Self::Theme) -> iced::theme::Style {
+        use iced::theme::Style;
+        Style {
             background_color: Color::TRANSPARENT,
             text_color: theme.palette().text,
         }

iced_examples/counter_pattern/src/main.rs

@@ -145,9 +145,9 @@ fn view(counter: &Counter) -> Element<Message> {
     .into()
 }
 
-fn style(_counter: &Counter, theme: &iced::Theme) -> iced_layershell::Appearance {
-    use iced_layershell::Appearance;
-    Appearance {
+fn style(_counter: &Counter, theme: &iced::Theme) -> iced::theme::Style {
+    use iced::theme::Style;
+    Style {
         background_color: Color::TRANSPARENT,
         text_color: theme.palette().text,
     }

iced_examples/iced_virtualkeyboard/src/main.rs

@@ -3,11 +3,11 @@ use iced::widget::canvas;
 use iced::widget::canvas::{Cache, Event, Geometry, Path, Text};
 use iced::{Color, Task as Command};
 use iced::{Element, Length, Point, Rectangle, Renderer, Size, Theme};
+use iced_layershell::Application;
 use iced_layershell::actions::LayershellCustomActions;
 use iced_layershell::reexport::wl_keyboard::KeymapFormat;
 use iced_layershell::reexport::{Anchor, KeyboardInteractivity};
 use iced_layershell::settings::{LayerShellSettings, Settings, VirtualKeyboardSettings};
-use iced_layershell::{Appearance, Application};
 use std::collections::HashMap;
 use std::ffi::CString;
 use std::fs::File;
@@ -116,9 +116,9 @@ impl Application for KeyboardView {
         }
     }
 
-    fn style(&self, theme: &Self::Theme) -> Appearance {
-        use iced_layershell::Appearance;
-        Appearance {
+    fn style(&self, theme: &Self::Theme) -> iced::theme::Style {
+        use iced::theme::Style;
+        Style {
             background_color: Color::TRANSPARENT,
             text_color: theme.palette().text,
         }

iced_layershell/examples/input_regions.rs

@@ -70,9 +70,9 @@ impl Application for InputRegionExample {
         .into()
     }
 
-    fn style(&self, theme: &Self::Theme) -> iced_layershell::Appearance {
-        use iced_layershell::Appearance;
-        Appearance {
+    fn style(&self, theme: &Self::Theme) -> iced::theme::Style {
+        use iced::theme::Style;
+        Style {
             background_color: Color::from_rgba(0.3, 0.3, 0.3, 0.3),
             text_color: theme.palette().text,
         }

iced_layershell/src/application.rs

@@ -73,7 +73,7 @@ where
 
     /// Returns the `Style` variation of the `Theme`.
     fn style(&self, theme: &Self::Theme) -> Appearance {
-        theme.default_style()
+        theme.base()
     }
 
     /// Returns the event `Subscription` for the current state of the

iced_layershell/src/build_pattern/application.rs

@@ -80,7 +80,7 @@ pub trait Program: Sized {
     ///
     /// [`Theme`]: Self::Theme
     fn style(&self, _state: &Self::State, theme: &Self::Theme) -> crate::Appearance {
-        theme.default_style()
+        theme.base()
     }
 
     /// Returns the event [`Subscription`] for the current state of the

iced_layershell/src/build_pattern/daemon.rs

@@ -81,7 +81,7 @@ pub trait Program: Sized {
     ///
     /// [`Theme`]: Self::Theme
     fn style(&self, _state: &Self::State, theme: &Self::Theme) -> crate::Appearance {
-        theme.default_style()
+        theme.base()
     }
 
     /// Returns the event [`Subscription`] for the current state of the

iced_layershell/src/lib.rs

@@ -29,43 +29,15 @@ pub use iced_layershell_macros::to_layer_message;
 
 pub use error::Error;
 
-use iced::{Color, Element, Theme};
+use iced::Element;
 use iced_futures::Subscription;
 
 pub use sandbox::LayerShellSandbox;
 
 pub type Result = std::result::Result<(), error::Error>;
-/// The appearance of a program.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Appearance {
-    /// The background [`Color`] of the application.
-    pub background_color: Color,
-
-    /// The default text [`Color`] of the application.
-    pub text_color: Color,
-}
-
-/// The default style of a [`Application`].
-pub trait DefaultStyle {
-    /// Returns the default style of a [`Appearance`].
-    fn default_style(&self) -> Appearance;
-}
-
-impl DefaultStyle for Theme {
-    fn default_style(&self) -> Appearance {
-        default(self)
-    }
-}
+use iced::theme::Style as Appearance;
 
-/// The default [`Appearance`] of a [`Application`] with the built-in [`Theme`].
-pub fn default(theme: &Theme) -> Appearance {
-    let palette = theme.extended_palette();
-
-    Appearance {
-        background_color: palette.background.base.color,
-        text_color: palette.background.base.text,
-    }
-}
+use iced::theme::Base as DefaultStyle;
 
 // layershell application
 pub trait Application: Sized {
@@ -129,7 +101,7 @@ pub trait Application: Sized {
     ///
     /// [`Theme`]: Self::Theme
     fn style(&self, theme: &Self::Theme) -> Appearance {
-        theme.default_style()
+        theme.base()
     }
 
     /// Returns the event [`Subscription`] for the current state of the
@@ -308,7 +280,7 @@ pub trait MultiApplication: Sized {
     ///
     /// [`Theme`]: Self::Theme
     fn style(&self, theme: &Self::Theme) -> Appearance {
-        theme.default_style()
+        theme.base()
     }
 
     /// Returns the event [`Subscription`] for the current state of the
@@ -447,7 +419,7 @@ mod tests {
     impl Application for TestApp {
         type Executor = iced::executor::Default;
         type Message = TestMessage;
-        type Theme = Theme;
+        type Theme = iced::Theme;
         type Flags = (i32, f64, String);
 
         fn new(flags: Self::Flags) -> (Self, Task<Self::Message>) {
@@ -483,15 +455,6 @@ mod tests {
         }
     }
 
-    // Test default appearance
-    #[test]
-    fn test_default_appearance() {
-        let theme = Theme::default();
-        let appearance = theme.default_style();
-        assert_eq!(appearance.background_color, Color::WHITE);
-        assert_eq!(appearance.text_color, Color::BLACK);
-    }
-
     // Test namespace
     #[test]
     fn test_namespace() {

iced_layershell/src/multi_window.rs

@@ -91,7 +91,7 @@ where
 
     /// Returns the `Style` variation of the `Theme`.
     fn style(&self, theme: &Self::Theme) -> Appearance {
-        theme.default_style()
+        theme.base()
     }
 
     /// Returns the event `Subscription` for the current state of the