chore: clean up page switching code

Author: invra

asteride/src/main.rs

@@ -11,7 +11,6 @@ use lucide_icons::LUCIDE_FONT_BYTES;
 
 struct AsterIDE {
     sidebar: sidebar::Sidebar,
-    page: pages::Page,
     home: pages::home::Home,
     search: pages::search::Search,
     workspace: pages::workspace::Workspace,
@@ -43,13 +42,7 @@ impl AsterIDE {
 
     fn update(&mut self, message: Message) -> Task<Message> {
         match message {
-            Message::Sidebar(msg) => {
-                let (task, event) = self.sidebar.update(msg);
-                if let sidebar::Event::OpenPage(id) = event {
-                    self.page = id;
-                }
-                task.map(Message::Sidebar)
-            }
+            Message::Sidebar(msg) => self.sidebar.update(msg).map(Message::Sidebar),
             Message::BottomArea(msg) => self.bottom_area.update(msg).map(Message::BottomArea),
             Message::Home(msg) => self.home.update(msg).map(Message::Home),
             Message::Search(msg) => self.search.update(msg).map(Message::Search),
@@ -59,7 +52,7 @@ impl AsterIDE {
     }
 
     fn view(&self) -> Element<'_, Message> {
-        let page: Element<'_, Message> = match self.page {
+        let page: Element<'_, Message> = match pages::current_page() {
             pages::Page::Home => self.home.view().map(Message::Home),
             pages::Page::Search => self.search.view().map(Message::Search),
             pages::Page::Workspace => self.workspace.view().map(Message::Workspace),
@@ -77,7 +70,6 @@ impl AsterIDE {
         Self {
             sidebar: sidebar::Sidebar::new(),
             bottom_area: bottom_area::BottomArea::new(),
-            page: pages::Page::Home,
             home: pages::home::Home::new(),
             search: pages::search::Search::new(),
             workspace: pages::workspace::Workspace::new(),
@@ -88,9 +80,8 @@ impl AsterIDE {
 
 pub fn main() -> iced::Result {
     let window_settings = window::Settings {
-        // TODO: Looking to create own titlebar stuff later
+        // TODO: Create own titlebar later
         decorations: true,
-        // INFO: will ready for cool looks
         transparent: true,
         icon: app_icon::APP_ICON.clone(),
         ..Default::default()

asteride/src/sidebar.rs

@@ -13,27 +13,17 @@ pub struct Sidebar {}
 pub enum Message {
     ContextButtonEnter(String, String),
     ContextButtonExit,
-    ItemSelected(Page),
-}
-
-pub enum Event {
-    None,
-    OpenPage(Page),
+    SwitchPage(Page),
 }
 
 impl Sidebar {
-    pub fn update(&mut self, message: Message) -> (Task<Message>, Event) {
+    pub fn update(&mut self, message: Message) -> Task<Message> {
         match message {
-            Message::ContextButtonEnter(t, d) => {
-                bottom_area::announce_ctx(t, d);
-                (Task::none(), Event::None)
-            }
-            Message::ContextButtonExit => {
-                bottom_area::clear_ctx();
-                (Task::none(), Event::None)
-            }
-            Message::ItemSelected(page) => (Task::none(), Event::OpenPage(page)),
+            Message::ContextButtonEnter(t, d) => bottom_area::announce_ctx(t, d),
+            Message::ContextButtonExit => bottom_area::clear_ctx(),
+            Message::SwitchPage(p) => pages::set_page(p),
         }
+        Task::none()
     }
 
     pub fn view(&self) -> Element<'_, Message> {
@@ -94,7 +84,7 @@ fn nav_button<'a>(
 ) -> Element<'a, Message> {
     mouse_area(
         button(icon.into())
-            .on_press(Message::ItemSelected(page))
+            .on_press(Message::SwitchPage(page))
             .width(Length::Fill)
             .height(40)
             .style(|theme: &Theme, state: button::Status| {

elements/src/bottom_area.rs

@@ -1,21 +1,7 @@
-use std::sync::{
-    Mutex,
-    OnceLock,
-};
-
-use iced::widget::{
-    Space,
-    container,
-    row,
-    text,
-};
-use iced::{
-    Element,
-    Length,
-    Padding,
-    Task,
-    Theme,
-};
+use std::sync::{Mutex, OnceLock};
+
+use iced::widget::{Space, container, row, text};
+use iced::{Element, Length, Padding, Task, Theme};
 
 #[derive(Default)]
 struct ContextState {

pages/src/lib.rs

@@ -1,12 +1,29 @@
+use std::sync::{Mutex, OnceLock};
+
 pub mod home;
 pub mod search;
 pub mod settings;
 pub mod workspace;
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Page {
     Home,
     Search,
     Workspace,
     Settings,
 }
+
+/// Owner of data on what page you are on
+fn current() -> &'static Mutex<Page> {
+    static CURRENT: OnceLock<Mutex<Page>> = OnceLock::new();
+    CURRENT.get_or_init(|| Mutex::new(Page::Home))
+}
+
+/// Sets page data for which page view to be on
+pub fn set_page(id: Page) {
+    *current().lock().unwrap() = id;
+}
+
+pub fn current_page() -> Page {
+    *current().lock().unwrap()
+}