implemented trait-interface for builders

src/view/components/pages.rs

@@ -1,26 +1,71 @@
+use std::ops::Deref;
 use gtk4 as gtk;
 
-use gtk::{Stack, StackSidebar, Box};
-use gtk4::{Orientation, StackSwitcher, StackTransitionType, Widget};
-use gtk4::prelude::{BoxExt, IsA};
+use gtk::{
+    Box,
+    Stack,
+    Widget,
+    Orientation,
+    StackSidebar,
+    StackSwitcher,
+    StackTransitionType,
+    prelude::{BoxExt, IsA},
+};
+
+use crate::view::components::builder_pattern_traits::{Builder, Product};
+
+pub type Page<'a> = (&'a str, &'a str, &'a Box);
 
 pub struct Pages{
-    all_pages: Box
+    wrapper: Box
 }
 
 pub struct PagesBuilder{
     pages_content: Stack,
 }
 
-impl Pages {
-    pub fn builder() -> PagesBuilder{
+impl Product<PagesBuilder, Box> for Pages {
+    fn builder() -> PagesBuilder {
         PagesBuilder {
             pages_content: Stack::new(),
         }
     }
 
-    pub fn get(self) -> Box {
-        self.all_pages
+    fn get(self) -> Box {
+        self.wrapper
+    }
+}
+
+impl Builder<Pages, Page<'_>, i32> for PagesBuilder{
+    fn build(&self, build_param: i32) -> Pages {
+        let stack_sidebar = StackSidebar::new();
+        let stack_switcher = StackSwitcher::new();
+
+        stack_sidebar.set_stack(&self.pages_content);
+        stack_switcher.set_stack(Some(&self.pages_content));
+
+        let wrapper = Box::new(Orientation::Horizontal, build_param);
+
+        wrapper.append(&stack_sidebar);
+        wrapper.append(&self.pages_content);
+
+        Pages{
+            wrapper
+        }
+    }
+
+    fn append_item(self, item: Page) -> Self {
+        self.append_page_private(item);
+        self
+    }
+
+    fn append_items(self, items: Vec<Page>) -> Self {
+        items.iter()
+            .for_each(|&item| {
+                self.append_page_private(item);
+            });
+
+        self
     }
 }
 
@@ -28,11 +73,9 @@ impl PagesBuilder {
 
     fn append_page_private(
         &self,
-        page_name: &str,
-        page_title: &str,
-        content: &impl IsA<Widget>
+        item: Page
     ) {
-        self.pages_content.add_titled(content, Some(page_name), page_title);
+        self.pages_content.add_titled(item.2, Some(item.1), item.0);
     }
 
     pub fn set_transition(
@@ -46,43 +89,4 @@ impl PagesBuilder {
         self
     }
 
-    pub fn add_page(
-        self,
-        page_name: &str,
-        page_title: &str,
-        content: &impl IsA<Widget>
-    ) -> Self {
-        self.append_page_private(page_name, page_title, content);
-        self
-    }
-
-    pub fn add_pages(
-        self,
-        pages: Vec<(&str, &str, &impl IsA<Widget>)>,
-    ) -> Self {
-        pages.iter()
-            .for_each(|(name, title, content)| {
-                self.append_page_private(*name, *title, *content);
-            });
-
-        self
-    }
-
-    pub fn build(&self, spacing: i32) -> Pages {
-        let stack_sidebar = StackSidebar::new();
-        let stack_switcher = StackSwitcher::new();
-
-        stack_sidebar.set_stack(&self.pages_content);
-        stack_switcher.set_stack(Some(&self.pages_content));
-
-        let wrapper = Box::new(Orientation::Horizontal, spacing);
-
-        wrapper.append(&stack_sidebar);
-        wrapper.append(&self.pages_content);
-
-        Pages{
-            all_pages: wrapper
-        }
-    }
-
 }