Move list view row and toggler to libcosmic

src/widget/button.rs

@@ -0,0 +1,13 @@
+#[macro_export]
+macro_rules! button {
+    ($($x:expr),+ $(,)?) => (
+        $crate::iced::widget::Button::new(
+            $crate::iced::widget::Row::with_children(
+                vec![$($crate::iced::Element::from($x)),+]
+            )
+            .spacing(8)
+        )
+        .padding([8, 16])
+    );
+}
+pub use button;

src/widget/list.rs

@@ -5,15 +5,32 @@ use iced::{
     widget,
 };
 
+#[macro_export]
+macro_rules! list_item {
+    ($($x:expr),+ $(,)?) => (
+        $crate::iced::widget::Row::with_children(vec![$($crate::iced::Element::from($x)),+])
+        .padding([0, 8])
+        .spacing(12)
+    );
+}
+pub use list_item;
+
 #[macro_export]
 macro_rules! list_view {
     ($($x:expr),+ $(,)?) => (
-        $crate::iced::widget::Container::new(
-            $crate::iced::widget::Column::with_children(
-                vec![$($crate::iced::Element::from($x)),+]
-            )
+        $crate::iced::widget::Container::new({
+            let mut children = vec![$($crate::iced::Element::from($x)),+];
+
+            //TODO: more efficient method for adding separators
+            let mut i = 1;
+            while i < children.len() {
+                children.insert(i, $crate::iced::widget::horizontal_rule(12).into());
+                i += 2;
+            }
+
+            $crate::iced::widget::Column::with_children(children)
             .spacing(12)
-        )
+        })
         .padding([12, 16])
         .style(theme::Container::Custom(
             $crate::widget::list_view_style

src/widget/mod.rs

@@ -1,22 +1,14 @@
-#[macro_export]
-macro_rules! button {
-    ($($x:expr),+ $(,)?) => (
-        $crate::iced::widget::Button::new(
-            $crate::iced::widget::Row::with_children(
-                vec![$($crate::iced::Element::from($x)),+]
-            )
-            .spacing(8)
-        )
-        .padding([8, 16])
-    );
-}
-pub use button;
+mod button;
+pub use button::*;
 
 mod icon;
-pub use self::icon::icon;
+pub use self::icon::*;
 
-mod list_view;
-pub use list_view::{list_view, list_view_style};
+mod list;
+pub use list::*;
 
 mod nav_bar;
-pub use nav_bar::{nav_bar, nav_bar_style};
+pub use nav_bar::*;
+
+mod toggler;
+pub use toggler::*;

src/widget/toggler.rs

@@ -0,0 +1,19 @@
+use iced::{
+    Length,
+    widget,
+};
+
+pub fn toggler<'a, Message, Renderer>(
+    label: impl Into<Option<String>>,
+    is_checked: bool,
+    f: impl Fn(bool) -> Message + 'a,
+) -> widget::Toggler<'a, Message, Renderer>
+where
+    Renderer: iced_native::text::Renderer,
+    Renderer::Theme: widget::toggler::StyleSheet,
+{
+    widget::Toggler::new(is_checked, label, f)
+        .size(24)
+        .spacing(12)
+        .width(Length::Shrink)
+}