Reimplemented NavigationBar

- Navigation Bar was reimplemented to support sections and pages.
- Created new widget called separator, a horizontal rule with the COSMIC
  theme.

src/widget/list/list_box.rs

@@ -1,3 +1,4 @@
+use crate::separator;
 use derive_setters::Setters;
 use iced::mouse::Interaction;
 use iced::{overlay, Alignment, Length, Padding, Point, Rectangle};
@@ -6,7 +7,7 @@ use iced_native::layout::flex::{resolve, Axis};
 use iced_native::layout::{Limits, Node};
 use iced_native::overlay::from_children;
 use iced_native::renderer::Style;
-use iced_native::widget::{column, horizontal_rule, Operation, Tree};
+use iced_native::widget::{column, Operation, Tree};
 use iced_native::{
     renderer, row, Background, Clipboard, Color, Element, Event, Layout, Shell, Widget,
 };
@@ -15,6 +16,7 @@ use iced_style::theme;
 use iced_style::theme::Container;
 
 #[derive(Setters)]
+#[allow(dead_code)]
 pub struct ListBox<'a, Message, Renderer>
 where
     Renderer: iced_native::Renderer,
@@ -22,6 +24,7 @@ where
     <Renderer as iced_native::Renderer>::Theme: iced_style::rule::StyleSheet,
 {
     spacing: u16,
+    #[setters(into)]
     padding: Padding,
     width: Length,
     height: Length,
@@ -31,6 +34,7 @@ where
     children: Vec<Element<'a, Message, Renderer>>,
     #[setters(strip_option)]
     placeholder: Option<Element<'a, Message, Renderer>>,
+    show_separators: bool,
     on_item_selected: Option<Box<dyn Fn(usize) -> Message + 'a>>,
 }
 
@@ -57,51 +61,54 @@ where
 
     /// Creates an empty [`ListBox`].
     pub fn new() -> Self {
-        Self::with_children(Vec::<Element<Message, Renderer>>::new(), true)
+        Self::with_children(Vec::<Element<Message, Renderer>>::new()).render()
     }
 
     /// Creates a new [`ListBox`].
     ///
     /// [`ListBox`]: struct.ListBox.html
-    pub fn with_children(
-        children: Vec<Element<'a, Message, Renderer>>,
-        show_separators: bool,
-    ) -> Self {
-        let children_size = children.len();
-        let children: Vec<Element<Message, Renderer>> = children
-            .into_iter()
-            .enumerate()
-            .map(|(index, child)| {
-                let row_items = if show_separators && index != children_size - 1 {
-                    vec![
-                        row![child].align_items(Alignment::Center).into(),
-                        horizontal_rule(1)
-                            .style(theme::Rule::Custom(separator_style))
-                            .into(),
-                    ]
-                } else {
-                    vec![row![child].align_items(Alignment::Center).into()]
-                };
-                column(row_items).into()
-            })
-            .collect();
-        Self {
+    pub fn with_children(children: Vec<Element<'a, Message, Renderer>>) -> Self {
+        let list_box = Self {
             spacing: 0,
             padding: Padding::from(Self::DEFAULT_PADDING),
             width: Length::Shrink,
             height: Length::Shrink,
             max_width: u32::MAX,
-            align_items: Alignment::Start,
+            align_items: Alignment::Center,
             style: Default::default(),
             children,
             placeholder: None,
+            show_separators: true,
             on_item_selected: None,
-        }
+        };
+        list_box.render()
+    }
+
+    pub fn render(mut self) -> Self {
+        let children_size = self.children.len();
+        self.children = self
+            .children
+            .into_iter()
+            .enumerate()
+            .map(|(index, child)| {
+                let row_items = if self.show_separators && index != children_size - 1 {
+                    vec![
+                        row![child].align_items(self.align_items).into(),
+                        separator!(1).into(),
+                    ]
+                } else {
+                    vec![row![child].align_items(self.align_items).into()]
+                };
+                column(row_items).spacing(self.spacing).into()
+            })
+            .collect();
+        self
     }
 
     /// Adds an element to the [`ListBox`].
     pub fn push(mut self, child: impl Into<Element<'a, Message, Renderer>>) -> Self {
         self.children.push(child.into());
+        self = self.render();
         self
     }
 }
@@ -444,5 +451,3 @@ macro_rules! list_box_heading {
     };
 }
 pub use list_box_heading;
-
-use crate::widget::separator_style;

src/widget/list/macros.rs

@@ -14,7 +14,7 @@ pub mod list_view {
     }
 
     #[macro_export]
-    macro_rules! list_row {
+    macro_rules! list_view_row {
         ($($x:expr),+ $(,)?) => (
             $crate::iced::widget::Row::with_children(vec![
                 $($crate::iced::Element::from($x)),+
@@ -26,7 +26,7 @@ pub mod list_view {
     }
 
     #[macro_export]
-    macro_rules! list_section {
+    macro_rules! list_view_section {
         ($title:expr, $($x:expr),+ $(,)?) => (
             $crate::iced::widget::Column::with_children(vec![
                 $crate::iced::widget::Text::new($title)
@@ -39,7 +39,7 @@ pub mod list_view {
                     //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());
+                        children.insert(i, $crate::separator!(12).into());
                         i += 2;
                     }
 
@@ -57,9 +57,9 @@ pub mod list_view {
     }
 
     #[macro_export]
-    macro_rules! list_item {
+    macro_rules! list_view_item {
         ($title:expr, $($x:expr),+ $(,)?) => (
-            $crate::list_row!(
+            $crate::list_view_row!(
                 $crate::iced::widget::Text::new($title),
                 $crate::iced::widget::horizontal_space(
                     $crate::iced::Length::Fill
@@ -84,10 +84,10 @@ pub mod list_view {
     use iced::widget;
     use iced_style::Theme;
 
-    pub use list_item;
-    pub use list_row;
-    pub use list_section;
     pub use list_view;
+    pub use list_view_item;
+    pub use list_view_row;
+    pub use list_view_section;
 }
 
 pub mod list_box {