feat: Add Refresh Bookmarks Menu Item

vkhitrin · Oct 24, 2024 · 9644d5a · 9644d5a
1 parent e6a8b3b
commit 9644d5a
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 17 deletions.
diff --git a/i18n/en/cosmicding.ftl b/i18n/en/cosmicding.ftl
@@ -36,6 +36,7 @@ open-accounts-page = Open Accounts Page
 provided-url-is-not-valid = Provided URL is not valid
 quit = Quit
 refresh = Refresh
+refresh-bookmarks = Refresh Bookmarks
 refreshed-all-bookmarks = Refreshed all bookmarks
 refreshed-bookmarks-for-account = Refreshed bookmarks for account {$acc}
 remove = Remove

diff --git a/src/app.rs b/src/app.rs
@@ -192,6 +192,7 @@ impl Application for Cosmicding {
         vec![crate::menu::menu_bar(
             &self.key_binds,
             !self.accounts_view.accounts.is_empty(),
+            !self.bookmarks_view.bookmarks.is_empty(),
         )]
     }
 
@@ -517,21 +518,23 @@ impl Application for Cosmicding {
                     .map(cosmic::app::Message::App),
             ),
             Message::StartRefreshBookmarksForAllAccounts => {
-                let message = |x: Vec<Bookmark>| {
-                    cosmic::app::Message::App(Message::DoneRefreshBookmarksForAllAccounts(x))
-                };
-                if !self.accounts_view.accounts.is_empty() {
-                    commands.push(Command::perform(
-                        http::fetch_all_bookmarks_from_accounts(
-                            self.accounts_view.accounts.clone(),
-                        ),
-                        message,
-                    ));
-                    commands.push(
-                        self.toasts
-                            .push(widget::toaster::Toast::new(fl!("refreshed-all-bookmarks")))
-                            .map(cosmic::app::Message::App),
-                    );
+                if !self.bookmarks_view.bookmarks.is_empty() {
+                    let message = |x: Vec<Bookmark>| {
+                        cosmic::app::Message::App(Message::DoneRefreshBookmarksForAllAccounts(x))
+                    };
+                    if !self.accounts_view.accounts.is_empty() {
+                        commands.push(Command::perform(
+                            http::fetch_all_bookmarks_from_accounts(
+                                self.accounts_view.accounts.clone(),
+                            ),
+                            message,
+                        ));
+                        commands.push(
+                            self.toasts
+                                .push(widget::toaster::Toast::new(fl!("refreshed-all-bookmarks")))
+                                .map(cosmic::app::Message::App),
+                        );
+                    }
                 }
             }
             Message::DoneRefreshBookmarksForAllAccounts(remote_bookmarks) => {
@@ -977,6 +980,8 @@ pub enum MenuAction {
     About,
     AddAccount,
     AddBookmark,
+    Empty,
+    RefreshBookmarks,
     Settings,
 }
 
@@ -986,9 +991,11 @@ impl _MenuAction for MenuAction {
     fn message(&self) -> Self::Message {
         match self {
             MenuAction::About => Message::ToggleContextPage(ContextPage::About),
+            MenuAction::Empty => Message::EmpptyMessage,
             MenuAction::AddAccount => Message::AddAccount,
             MenuAction::Settings => Message::ToggleContextPage(ContextPage::Settings),
             MenuAction::AddBookmark => Message::AddBookmarkForm,
+            MenuAction::RefreshBookmarks => Message::StartRefreshBookmarksForAllAccounts,
         }
     }
 }
diff --git a/src/key_binds.rs b/src/key_binds.rs
@@ -25,6 +25,7 @@ pub fn key_binds() -> HashMap<KeyBind, MenuAction> {
     bind!([Ctrl], Key::Character("i".into()), About);
     bind!([Ctrl, Shift], Key::Character("n".into()), AddAccount);
     bind!([Ctrl], Key::Character("n".into()), AddBookmark);
+    bind!([Ctrl], Key::Character("r".into()), RefreshBookmarks);
 
     key_binds
 }
diff --git a/src/menu.rs b/src/menu.rs
@@ -13,7 +13,8 @@ use crate::{
 
 pub fn menu_bar<'a>(
     key_binds: &HashMap<KeyBind, MenuAction>,
-    accounts_enabled: bool,
+    accounts_present: bool,
+    bookmarks_present: bool,
 ) -> Element<'a, Message> {
     MenuBar::new(vec![
         Tree::with_children(
@@ -22,11 +23,17 @@ pub fn menu_bar<'a>(
                 key_binds,
                 vec![
                     Item::Button(fl!("add-account"), MenuAction::AddAccount),
-                    if accounts_enabled {
+                    if accounts_present {
                         Item::Button(fl!("add-bookmark"), MenuAction::AddBookmark)
                     } else {
                         Item::ButtonDisabled(fl!("add-bookmark"), MenuAction::AddBookmark)
                     },
+                    Item::Divider,
+                    if bookmarks_present {
+                        Item::Button(fl!("refresh-bookmarks"), MenuAction::RefreshBookmarks)
+                    } else {
+                        Item::ButtonDisabled(fl!("refresh-bookmarks"), MenuAction::Empty)
+                    },
                 ],
             ),
         ),