Add anim!() macro

Simplifies the animation code in the `view()`

Author: 13r0ck

examples/pokedex/src/main.rs

@@ -6,8 +6,8 @@ use iced::{
 };
 
 use cosmic_time::{
-    self, chain, keyframes, Back, Bounce, Circular, Ease, Elastic, Exponential, Linear, Quadratic,
-    Quartic, Quintic, Sinusoidal, Timeline,
+    self, anim, chain, keyframes, Back, Bounce, Circular, Ease, Elastic, Exponential, Linear,
+    Quadratic, Quartic, Quintic, Sinusoidal, Timeline,
 };
 use once_cell::sync::Lazy;
 
@@ -165,7 +165,7 @@ impl Pokemon {
     fn view(&self) -> Element<Message> {
         row![
             column![
-                keyframes::Space::as_widget(SPACE.clone(), &self.timeline),
+                anim!(SPACE, &self.timeline),
                 image::viewer(self.image.clone())
             ],
             column![

examples/pong/src/main.rs

@@ -5,7 +5,7 @@ use iced::widget::{column, container, row, Space};
 use iced::{executor, Application, Command, Event, Length, Settings, Subscription};
 use iced_native::window;
 
-use cosmic_time::{self, chain, keyframes, Duration, Instant, Speed, Timeline};
+use cosmic_time::{self, anim, chain, keyframes, Duration, Instant, Speed, Timeline};
 
 use once_cell::sync::Lazy;
 use rand::prelude::*;
@@ -167,21 +167,15 @@ impl Application for Pong {
         let paddle_right = container(Space::new(width, height)).style(theme::Container::Paddle);
 
         let content = row![
-            column![
-                keyframes::Space::as_widget(PADDLE_LEFT.clone(), &self.timeline),
-                paddle_left
-            ],
+            column![anim!(PADDLE_LEFT, &self.timeline), paddle_left],
             Space::new(Length::Fill, Length::Fill),
-            column![
-                keyframes::Space::as_widget(PADDLE_RIGHT.clone(), &self.timeline),
-                paddle_right
-            ],
+            column![anim!(PADDLE_RIGHT, &self.timeline), paddle_right],
         ];
 
         let ball = column![
-            keyframes::Space::as_widget(BALL_Y.clone(), &self.timeline),
+            anim!(BALL_Y, &self.timeline),
             row![
-                keyframes::Space::as_widget(BALL_X.clone(), &self.timeline),
+                anim!(BALL_X, &self.timeline),
                 container(Space::new(width, width)).style(theme::Container::Ball)
             ]
         ];

examples/stopwatch/src/main.rs

@@ -8,7 +8,7 @@ use self::widget::Element;
 use theme::Theme;
 
 use cosmic_time::{
-    self, chain,
+    self, anim, chain,
     style_button::{self, StyleButton},
     style_container::{self, StyleContainer},
     Sinusoidal, Timeline,
@@ -145,8 +145,8 @@ impl Application for Stopwatch {
                 State::Ticking { .. } => "Stop",
             };
 
-            StyleButton::as_widget(
-                BUTTON.clone(),
+            anim!(
+                BUTTON,
                 buttons,
                 &self.timeline,
                 text(label).horizontal_alignment(alignment::Horizontal::Center),
@@ -166,8 +166,8 @@ impl Application for Stopwatch {
             .align_items(Alignment::Center)
             .spacing(20);
 
-        StyleContainer::as_widget(
-            CONTAINER.clone(),
+        anim!(
+            CONTAINER,
             // Cool! Because we implemented the function on our custom, theme's type, adding
             // the map argument is easy!
             theme::Container::map(),

src/keyframes.rs

@@ -26,6 +26,13 @@ macro_rules! chain{
   };
 }
 
+#[macro_export]
+macro_rules! anim{
+  ($id:expr, $($x:expr),+ $(,)?) => {
+    $id.clone().as_widget($($x),+)
+  };
+}
+
 #[derive(Debug, Copy, Clone, PartialEq, Default)]
 pub enum Repeat {
     #[default]

src/keyframes/button.rs

@@ -28,6 +28,18 @@ impl Id {
     pub fn to_chain_with_children(self, children: Vec<Button>) -> Chain {
         Chain::with_children(self, children)
     }
+
+    pub fn as_widget<'a, Message, Renderer>(
+        self,
+        timeline: &crate::Timeline,
+        content: impl Into<Element<'a, Message, Renderer>>,
+    ) -> widget::Button<'a, Message, Renderer>
+    where
+        Renderer: iced_native::Renderer,
+        Renderer::Theme: widget::button::StyleSheet,
+    {
+        Button::as_widget(self, timeline, content)
+    }
 }
 
 impl From<Id> for widget::Id {

src/keyframes/container.rs

@@ -28,6 +28,18 @@ impl Id {
     pub fn to_chain_with_children(self, children: Vec<Container>) -> Chain {
         Chain::with_children(self, children)
     }
+
+    pub fn as_widget<'a, Message, Renderer>(
+        self,
+        timeline: &crate::Timeline,
+        content: impl Into<Element<'a, Message, Renderer>>,
+    ) -> widget::Container<'a, Message, Renderer>
+    where
+        Renderer: iced_native::Renderer,
+        Renderer::Theme: widget::container::StyleSheet,
+    {
+        Container::as_widget(self, timeline, content)
+    }
 }
 
 impl From<Id> for widget::Id {

src/keyframes/space.rs

@@ -28,6 +28,10 @@ impl Id {
     pub fn to_chain_with_children(self, children: Vec<Space>) -> Chain {
         Chain::with_children(self, children)
     }
+
+    pub fn as_widget(self, timeline: &crate::Timeline) -> widget::Space {
+        Space::as_widget(self, timeline)
+    }
 }
 
 impl From<Id> for widget::Id {

src/keyframes/style_button.rs

@@ -29,6 +29,19 @@ impl Id {
     pub fn to_chain_with_children(self, children: Vec<StyleButton>) -> Chain {
         Chain::with_children(self, children)
     }
+
+    pub fn as_widget<'a, Message, Renderer>(
+        self,
+        style: fn(u8) -> <Renderer::Theme as StyleSheet>::Style,
+        timeline: &crate::Timeline,
+        content: impl Into<Element<'a, Message, Renderer>>,
+    ) -> crate::widget::Button<'a, Message, Renderer>
+    where
+        Renderer: iced_native::Renderer,
+        Renderer::Theme: widget::button::StyleSheet,
+    {
+        StyleButton::as_widget(self, style, timeline, content)
+    }
 }
 
 impl From<Id> for widget::Id {

src/keyframes/style_container.rs

@@ -29,6 +29,19 @@ impl Id {
     pub fn to_chain_with_children(self, children: Vec<StyleContainer>) -> Chain {
         Chain::with_children(self, children)
     }
+
+    pub fn as_widget<'a, Message, Renderer>(
+        self,
+        style: fn(u8) -> <Renderer::Theme as StyleSheet>::Style,
+        timeline: &crate::Timeline,
+        content: impl Into<Element<'a, Message, Renderer>>,
+    ) -> crate::widget::Container<'a, Message, Renderer>
+    where
+        Renderer: iced_native::Renderer,
+        Renderer::Theme: widget::container::StyleSheet,
+    {
+        StyleContainer::as_widget(self, style, timeline, content)
+    }
 }
 
 impl From<Id> for widget::Id {