remove extra getters

src/app/browser/window/tab/item/page/navigation.rs

@@ -24,14 +24,14 @@ use sqlite::Transaction;
 use std::rc::Rc;
 
 pub struct Navigation {
-    bookmark: Rc<Bookmark>,
-    history: Rc<History>,
-    home: Rc<Home>,
-    identity: Rc<Identity>,
-    profile: Rc<Profile>,
-    reload: Rc<Reload>,
-    request: Rc<Request>,
-    widget: Rc<Widget>,
+    pub bookmark: Rc<Bookmark>,
+    pub history: Rc<History>,
+    pub home: Rc<Home>,
+    pub identity: Rc<Identity>,
+    pub profile: Rc<Profile>,
+    pub reload: Rc<Reload>,
+    pub request: Rc<Request>,
+    pub widget: Rc<Widget>,
 }
 
 impl Navigation {
@@ -53,7 +53,7 @@ impl Navigation {
             home.widget().gobject(),
             history.widget().gobject(),
             reload.widget().gobject(),
-            request.widget().gobject(),
+            &request.widget.entry, // @TODO remove extra getters from other components
             bookmark.widget().gobject(),
         ));
 
@@ -73,7 +73,7 @@ impl Navigation {
     // Actions
 
     pub fn update(&self, progress_fraction: Option<f64>) {
-        let request_text = self.request.widget().gobject().text();
+        let request_text = self.request.widget.entry.text();
 
         self.identity.update(
             self.profile
@@ -151,34 +151,6 @@ impl Navigation {
 
         Ok(())
     }
-
-    // Getters
-
-    pub fn home(&self) -> &Rc<Home> {
-        &self.home
-    }
-
-    pub fn history(&self) -> &Rc<History> {
-        &self.history
-    }
-
-    /*
-    pub fn reload(&self) -> &Rc<Reload> {
-        &self.reload
-    } */
-
-    pub fn request(&self) -> &Rc<Request> {
-        &self.request
-    }
-
-    /*
-    pub fn bookmark(&self) -> &Rc<Bookmark> {
-        &self.bookmark
-    } */
-
-    pub fn widget(&self) -> &Rc<Widget> {
-        &self.widget
-    }
 }
 
 // Tools

src/app/browser/window/tab/item/page/navigation/request.rs

@@ -13,7 +13,7 @@ use std::rc::Rc;
 
 // Main
 pub struct Request {
-    widget: Rc<Widget>,
+    pub widget: Rc<Widget>,
 }
 
 impl Request {
@@ -90,12 +90,8 @@ impl Request {
 
     // Getters
 
-    pub fn widget(&self) -> &Rc<Widget> {
-        &self.widget
-    }
-
     pub fn uri(&self) -> Option<Uri> {
-        match Uri::parse(&self.widget.gobject().text(), UriFlags::NONE) {
+        match Uri::parse(&self.widget.entry.text(), UriFlags::NONE) {
             Ok(uri) => Some(uri),
             _ => None,
         }

src/app/browser/window/tab/item/page/navigation/request/widget.rs

@@ -21,7 +21,7 @@ struct Progress {
 }
 
 pub struct Widget {
-    gobject: Entry,
+    pub entry: Entry,
     progress: Rc<Progress>,
 }
 
@@ -35,21 +35,21 @@ impl Widget {
         });
 
         // Init widget
-        let gobject = Entry::builder()
+        let entry = Entry::builder()
             .placeholder_text(PLACEHOLDER_TEXT)
             .hexpand(true)
             .build();
 
         // Connect events
-        gobject.connect_changed(move |_| {
+        entry.connect_changed(move |_| {
             action.0.update().activate(None);
         });
 
-        gobject.connect_activate(move |this| {
+        entry.connect_activate(move |this| {
             action.1.load().activate(Some(&this.text()), true);
         });
 
-        gobject.connect_state_flags_changed({
+        entry.connect_state_flags_changed({
             // Define last focus state container
             let has_focus = RefCell::new(false);
             move |this, state| {
@@ -71,7 +71,7 @@ impl Widget {
         });
 
         // Return activated `Self`
-        Self { gobject, progress }
+        Self { entry, progress }
     }
 
     // Actions
@@ -113,7 +113,7 @@ impl Widget {
             Ok(records) => {
                 for record in records {
                     if let Some(text) = record.text {
-                        self.gobject.set_text(&text);
+                        self.entry.set_text(&text);
                     }
 
                     // Delegate restore action to the item childs
@@ -132,7 +132,7 @@ impl Widget {
         app_browser_window_tab_item_page_navigation_request_id: &i64,
     ) -> Result<(), String> {
         // Keep value in memory until operation complete
-        let text = self.gobject.text();
+        let text = self.entry.text();
 
         match database::insert(
             transaction,
@@ -167,16 +167,16 @@ impl Widget {
                         Duration::from_millis(PROGRESS_ANIMATION_TIME),
                         {
                             // Clone async pointers dependency
-                            let gobject = self.gobject.clone();
+                            let entry = self.entry.clone();
                             let progress = self.progress.clone();
 
                             // Frame
                             move || {
                                 // Animate
-                                if *progress.fraction.borrow() > gobject.progress_fraction() {
-                                    gobject.set_progress_fraction(
+                                if *progress.fraction.borrow() > entry.progress_fraction() {
+                                    entry.set_progress_fraction(
                                         // Currently, here is no outrange validation, seems that wrapper make this work @TODO
-                                        gobject.progress_fraction() + PROGRESS_ANIMATION_STEP,
+                                        entry.progress_fraction() + PROGRESS_ANIMATION_STEP,
                                     );
                                     return ControlFlow::Continue;
                                 }
@@ -185,8 +185,8 @@ impl Widget {
 
                                 // Reset on 100% (to hide progress bar)
                                 // or, just await for new value request
-                                if gobject.progress_fraction() == 1.0 {
-                                    gobject.set_progress_fraction(0.0);
+                                if entry.progress_fraction() == 1.0 {
+                                    entry.set_progress_fraction(0.0);
                                 }
 
                                 // Stop iteration
@@ -198,12 +198,6 @@ impl Widget {
             }
         }
     }
-
-    // Getters
-
-    pub fn gobject(&self) -> &Entry {
-        &self.gobject
-    }
 }
 
 // Tools

src/app/browser/window/tab/item/page/navigation/widget.rs

@@ -7,7 +7,7 @@ const MARGIN: i32 = 6;
 const SPACING: i32 = 6;
 
 pub struct Widget {
-    gobject: Box,
+    pub gobject: Box,
 }
 
 impl Widget {
@@ -37,9 +37,4 @@ impl Widget {
 
         Self { gobject }
     }
-
-    // Getters
-    pub fn gobject(&self) -> &Box {
-        &self.gobject
-    }
 }