Merge branch 'master' of https://github.com/ChisomUma/rustcast

Author: ChisomUma

Cargo.lock

@@ -48,7 +48,7 @@
 ### Via Homebrew:
 
 ```
-brew install --cask RustCastLabs/tap/rustcast
+brew install --cask unsecretised/tap/rustcast
 ```
 
 ### Via github releases

README.md

@@ -359,7 +359,7 @@ <h2>Up and running<br />in 30 seconds</h2>
           </div>
           <div class="install-code" id="brew-code">
             <span class="comment"># Tap the cask and install</span><br>
-            <span class="cmd">brew tap</span> RustCastLabs/tap<br>
+            <span class="cmd">brew tap</span> unsecretised/tap<br>
             <span class="cmd">brew install --cask</span> rustcast<br>
           </div>
         </div>

docs/index.html

@@ -5,6 +5,7 @@ use crate::app::apps::{App, AppCommand, ICNS_ICON};
 use crate::commands::Function;
 use crate::config::{Config, MainPage, Shelly};
 use crate::debounce::DebouncePolicy;
+use crate::platform::macos::launching::Shortcut;
 use crate::utils::icns_data_to_handle;
 use crate::{app::tile::ExtSender, clipboard::ClipBoardContentType};
 use iced::time::Duration;
@@ -81,6 +82,7 @@ pub enum Editable<T> {
 pub enum Message {
     WriteConfig(bool),
     SaveRanking,
+    ToggleAutoStartup(bool),
     LoadRanking,
     ToggleFavouriteApp(String),
     UpdateAvailable,
@@ -89,7 +91,7 @@ pub enum Message {
     OpenResult(u32),
     OpenToSettings,
     SearchQueryChanged(String, Id),
-    KeyPressed(u32),
+    KeyPressed(Shortcut),
     FocusTextInput(Move),
     HideWindow(Id),
     RunFunction(Function),
@@ -124,6 +126,7 @@ pub enum SetConfigFields {
     ClipboardHotkey(String),
     PlaceHolder(String),
     SearchUrl(String),
+    ClipboardHistory(bool),
     HapticFeedback(bool),
     ShowMenubarIcon(bool),
     SetPage(MainPage),

src/app.rs

@@ -6,7 +6,7 @@ use std::io::Cursor;
 
 use iced::{
     Alignment,
-    Length::Fill,
+    Length::{self, Fill},
     widget::{
         Button, Row, Text, container,
         image::{Handle, Viewer},
@@ -18,7 +18,7 @@ use crate::{
     app::{Message, Page, RUSTCAST_DESC_NAME},
     clipboard::ClipBoardContentType,
     commands::Function,
-    styles::{result_button_style, result_row_container_style},
+    styles::{favourite_button_style, result_button_style, result_row_container_style},
     utils::icns_data_to_handle,
 };
 
@@ -214,9 +214,10 @@ impl App {
         let name = self.search_name.clone();
         let theme_clone = theme.clone();
         row = row.push(
-            Button::new("♥️")
+            Button::new(Text::new("♥️").width(Length::Fill).align_x(Alignment::End))
                 .on_press_with(move || Message::ToggleFavouriteApp(name.clone()))
-                .style(move |_, _| result_button_style(&theme_clone)),
+                .width(Length::Fill)
+                .style(move |_, status| favourite_button_style(&theme_clone, status)),
         );
 
         let msg = on_press.or(match self.open_command.clone() {

src/app/apps.rs

@@ -2,7 +2,7 @@
 
 use std::{collections::HashMap, io::Cursor};
 
-use global_hotkey::hotkey::{Code, HotKey, Modifiers};
+use global_hotkey::hotkey::{Code, Modifiers};
 use image::{DynamicImage, ImageReader};
 use log::info;
 use tray_icon::{
@@ -16,6 +16,7 @@ use tray_icon::{
 use crate::{
     app::{Message, tile::ExtSender},
     config::Config,
+    platform::macos::launching::Shortcut,
     utils::open_url,
 };
 
@@ -39,14 +40,15 @@ pub fn menu_icon(config: Config, sender: ExtSender) -> TrayIcon {
 }
 
 pub fn menu_builder(config: Config, sender: ExtSender, update_item: bool) -> Menu {
-    let hotkey = config.toggle_hotkey.parse::<HotKey>().ok();
+    let shortcut =
+        Shortcut::parse(&config.toggle_hotkey).unwrap_or(Shortcut::parse("opt+space").unwrap());
 
     let mut modes = config.modes;
     if !modes.contains_key("default") {
         modes.insert("Default".to_string(), "default".to_string());
     }
 
-    init_event_handler(sender, hotkey.map(|x| x.id));
+    init_event_handler(sender, shortcut);
 
     Menu::with_items(&[
         &MenuItem::with_id(
@@ -64,7 +66,7 @@ pub fn menu_builder(config: Config, sender: ExtSender, update_item: bool) -> Men
         &open_github_item(),
         &PredefinedMenuItem::separator(),
         &refresh_item(),
-        &open_item(hotkey),
+        &open_item(),
         &mode_item(modes),
         &PredefinedMenuItem::separator(),
         &open_issue_item(),
@@ -86,10 +88,12 @@ fn get_image() -> DynamicImage {
         .unwrap()
 }
 
-fn init_event_handler(sender: ExtSender, hotkey_id: Option<u32>) {
+fn init_event_handler(sender: ExtSender, shortcut: Shortcut) {
     let runtime = Runtime::new().unwrap();
+    let shortcut = shortcut.clone();
 
     MenuEvent::set_event_handler(Some(move |x: MenuEvent| {
+        let shortcut = shortcut.clone();
         let sender = sender.clone();
         let sender = sender.0.clone();
         info!("Menubar event called: {}", x.id.0);
@@ -107,11 +111,12 @@ fn init_event_handler(sender: ExtSender, hotkey_id: Option<u32>) {
                 open_url("https://github.com/RustCastLabs/rustcast/issues/new");
             }
             "show_rustcast" => {
-                if let Some(hk) = hotkey_id {
-                    runtime.spawn(async move {
-                        sender.clone().try_send(Message::KeyPressed(hk)).unwrap();
-                    });
-                }
+                runtime.spawn(async move {
+                    sender
+                        .clone()
+                        .try_send(Message::KeyPressed(shortcut.clone()))
+                        .unwrap();
+                });
             }
             "update" => {
                 open_url("https://github.com/RustCastLabs/rustcast/releases/latest");
@@ -178,13 +183,8 @@ fn mode_item(modes: HashMap<String, String>) -> Submenu {
     Submenu::with_items("Modes", true, &items).unwrap()
 }
 
-fn open_item(hotkey: Option<HotKey>) -> MenuItem {
-    MenuItem::with_id(
-        "show_rustcast",
-        "Toggle View",
-        true,
-        hotkey.map(|hk| Accelerator::new(Some(hk.mods), hk.key)),
-    )
+fn open_item() -> MenuItem {
+    MenuItem::with_id("show_rustcast", "Toggle View", true, None)
 }
 
 fn open_github_item() -> MenuItem {

src/app/menubar.rs

@@ -44,7 +44,7 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
             .width(Length::Fill)
             .style(move |_, _| settings_text_input_item_style(&hotkey_theme))
             .into(),
-        notice_item(theme.clone(), "Requires a restart"),
+        notice_item(theme.clone(), "Use \"+\" as a seperator"),
     ]);
 
     let cb_theme = theme.clone();
@@ -56,7 +56,7 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
             .width(Length::Fill)
             .style(move |_, _| settings_text_input_item_style(&cb_theme))
             .into(),
-        notice_item(theme.clone(), "Requires a restart"),
+        notice_item(theme.clone(), "Use \"+\" as a seperator"),
     ]);
 
     let placeholder_theme = theme.clone();
@@ -83,6 +83,23 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
         notice_item(theme.clone(), "Which search engine to use (%s = query)"),
     ]);
 
+    let theme_clone = theme.clone();
+    let clipboard_history = Row::from_iter([
+        settings_hint_text(theme.clone(), "Enable Clipboard history"),
+        checkbox(config.clone().cbhist)
+            .style(move |_, _| settings_checkbox_style(&theme_clone))
+            .on_toggle(|input| Message::SetConfig(SetConfigFields::ClipboardHistory(input)))
+            .into(),
+        notice_item(
+            theme.clone(),
+            "If you want your clipboard history to be stored",
+        ),
+    ])
+    .align_y(Alignment::Center)
+    .spacing(SETTINGS_ITEM_COL_SPACING * 2)
+    .padding(SETTINGS_ITEM_PADDING)
+    .height(SETTINGS_ITEM_HEIGHT);
+
     let theme_clone = theme.clone();
     let current_delay = config.debounce_delay;
     let debounce = settings_item_column([
@@ -102,6 +119,16 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
         ),
     ]);
 
+    let theme_clone = theme.clone();
+    let start_at_login = settings_item_row([
+        settings_hint_text(theme.clone(), "Start at login"),
+        checkbox(config.clone().start_at_login)
+            .style(move |_, _| settings_checkbox_style(&theme_clone))
+            .on_toggle(Message::ToggleAutoStartup)
+            .into(),
+        notice_item(theme.clone(), "If you want rustcast to start on login"),
+    ]);
+
     let theme_clone = theme.clone();
     let haptic = Row::from_iter([
         settings_hint_text(theme.clone(), "Haptic feedback"),
@@ -394,8 +421,10 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
         placeholder_setting.into(),
         search.into(),
         debounce.into(),
+        start_at_login.into(),
         haptic.into(),
         tray_icon.into(),
+        clipboard_history.into(),
         auto_suggest.into(),
         show_scrollbar.into(),
         clear_on_hide.into(),

src/app/pages/settings.rs

@@ -5,12 +5,11 @@ pub mod update;
 use crate::app::apps::App;
 use crate::app::{ArrowKey, Message, Move, Page};
 use crate::clipboard::ClipBoardContentType;
-use crate::config::Config;
+use crate::config::{Config, Shelly};
 use crate::debounce::Debouncer;
 use crate::platform::default_app_paths;
+use crate::platform::macos::launching::Shortcut;
 
-use global_hotkey::hotkey::HotKey;
-use global_hotkey::{GlobalHotKeyEvent, HotKeyState};
 
 use iced::futures::SinkExt;
 use iced::futures::channel::mpsc::{Sender, channel};
@@ -191,9 +190,9 @@ pub struct Tile {
 /// Stores the toggle [`HotKey`] and the Clipboard [`HotKey`]
 #[derive(Clone, Debug)]
 pub struct Hotkeys {
-    pub toggle: HotKey,
-    pub clipboard_hotkey: HotKey,
-    pub shells: HashMap<u32, String>,
+    pub toggle: Shortcut,
+    pub clipboard_hotkey: Shortcut,
+    pub shells: HashMap<Shortcut, Shelly>,
 }
 
 impl Tile {
@@ -230,7 +229,6 @@ impl Tile {
             _ => None,
         });
         Subscription::batch([
-            Subscription::run(handle_hotkeys),
             Subscription::run(handle_hot_reloading),
             keyboard,
             Subscription::run(handle_recipient),
@@ -242,37 +240,34 @@ impl Tile {
                 if let keyboard::Event::KeyPressed { key, modifiers, .. } = event {
                     match key {
                         keyboard::Key::Named(Named::ArrowUp) => {
-                            return Some(Message::ChangeFocus(ArrowKey::Up, 1));
+                            Some(Message::ChangeFocus(ArrowKey::Up, 1))
                         }
                         keyboard::Key::Named(Named::ArrowLeft) => {
-                            return Some(Message::ChangeFocus(ArrowKey::Left, 1));
+                            Some(Message::ChangeFocus(ArrowKey::Left, 1))
                         }
                         keyboard::Key::Named(Named::ArrowRight) => {
-                            return Some(Message::ChangeFocus(ArrowKey::Right, 1));
+                            Some(Message::ChangeFocus(ArrowKey::Right, 1))
                         }
                         keyboard::Key::Named(Named::ArrowDown) => {
-                            return Some(Message::ChangeFocus(ArrowKey::Down, 1));
+                            Some(Message::ChangeFocus(ArrowKey::Down, 1))
                         }
                         keyboard::Key::Character(chr) => {
                             if modifiers.command() && chr.to_string() == "r" {
-                                return Some(Message::ReloadConfig);
+                                Some(Message::ReloadConfig)
                             } else if chr.to_string() == "p" && modifiers.control() {
-                                return Some(Message::ChangeFocus(ArrowKey::Up, 1));
+                                Some(Message::ChangeFocus(ArrowKey::Up, 1))
                             } else if chr.to_string() == "n" && modifiers.control() {
-                                return Some(Message::ChangeFocus(ArrowKey::Down, 1));
+                                Some(Message::ChangeFocus(ArrowKey::Down, 1))
                             } else {
-                                return Some(Message::FocusTextInput(Move::Forwards(
-                                    chr.to_string(),
-                                )));
+                                Some(Message::FocusTextInput(Move::Forwards(chr.to_string())))
                             }
                         }
-                        keyboard::Key::Named(Named::Enter) => return Some(Message::OpenFocused),
+                        keyboard::Key::Named(Named::Enter) => Some(Message::OpenFocused),
                         keyboard::Key::Named(Named::Backspace) => {
-                            return Some(Message::FocusTextInput(Move::Back));
+                            Some(Message::FocusTextInput(Move::Back))
                         }
-                        _ => {}
+                        _ => None,
                     }
-                    None
                 } else {
                     None
                 }
@@ -338,22 +333,6 @@ impl Tile {
     }
 }
 
-/// This is the subscription function that handles hotkeys, e.g. for hiding / showing the window
-fn handle_hotkeys() -> impl futures::Stream<Item = Message> {
-    stream::channel(100, async |mut output| {
-        let receiver = GlobalHotKeyEvent::receiver();
-        loop {
-            info!("Hotkey received");
-            if let Ok(event) = receiver.recv()
-                && event.state == HotKeyState::Pressed
-            {
-                output.try_send(Message::KeyPressed(event.id)).unwrap();
-            }
-            tokio::time::sleep(Duration::from_millis(100)).await;
-        }
-    })
-}
-
 /// This is the subscription function that handles the change in clipboard history
 fn handle_clipboard_history() -> impl futures::Stream<Item = Message> {
     stream::channel(100, async |mut output| {
@@ -629,7 +608,6 @@ fn handle_recipient() -> impl futures::Stream<Item = Message> {
             let abcd = recipient
                 .try_recv()
                 .map(async |msg| {
-                    info!("Sending a message");
                     output.send(msg).await.unwrap();
                 })
                 .ok();