Improve settings page

Cargo.toml

@@ -30,6 +30,7 @@ objc2-foundation = { version = "0.3.2", features = ["NSString"] }
 once_cell = "1.21.3"
 rand = "0.9.2"
 rayon = "1.11.0"
+rfd = "0.17.2"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 tokio = { version = "1.48.0", features = ["full"] }

src/app.rs

@@ -91,6 +91,7 @@ pub enum Message {
     RunFunction(Function),
     OpenFocused,
     SetConfig(SetConfigFields),
+    OpenFileDialogue(String),
     ReturnFocus,
     EscKeyPressed(Id),
     ClearSearchResults,
@@ -111,6 +112,7 @@ pub enum Message {
 }
 
 #[derive(Debug, Clone)]
+#[allow(unused)]
 pub enum SetConfigFields {
     ToDefault,
     ToggleHotkey(String),
@@ -119,9 +121,9 @@ pub enum SetConfigFields {
     SearchUrl(String),
     HapticFeedback(bool),
     ShowMenubarIcon(bool),
-    //    Modes(HashMap<String, String>),
-    //    Aliases(HashMap<String, String>),
-    //    SearchDirs(Vec<String>),
+    Modes(Editable<(String, String)>),
+    Aliases(Editable<(String, String)>),
+    SearchDirs(Editable<Vec<String>>),
     DebounceDelay(u64),
     SetThemeFields(SetConfigThemeFields),
     SetBufferFields(SetConfigBufferFields),

src/app/pages/settings.rs

@@ -1,11 +1,17 @@
 //! The settings page UI
 
+use std::collections::HashMap;
+
 use iced::widget::Slider;
+use iced::widget::TextInput;
 use iced::widget::checkbox;
 use iced::widget::text_input;
 
+use crate::app::Editable;
 use crate::app::SetConfigBufferFields;
 use crate::app::SetConfigThemeFields;
+use crate::styles::delete_button_style;
+use crate::styles::settings_add_button_style;
 use crate::styles::settings_checkbox_style;
 use crate::styles::settings_save_button_style;
 use crate::styles::settings_slider_style;
@@ -351,6 +357,10 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
         font_family.into(),
         text_clr.into(),
         bg_clr.into(),
+        settings_hint_text(theme.clone(), "Aliases"),
+        aliases_item(config.aliases, &theme),
+        settings_hint_text(theme.clone(), "Rustcast modes"),
+        modes_item(config.modes, &theme),
         Row::from_iter([
             savebutton(theme.clone()),
             default_button(theme.clone()),
@@ -451,3 +461,138 @@ fn notice_item(theme: Theme, notice: impl ToString) -> Element<'static, Message>
         .align_x(Alignment::End)
         .into()
 }
+
+fn aliases_item(aliases: HashMap<String, String>, theme: &Theme) -> Element<'static, Message> {
+    let theme_clone = theme.clone();
+    let mut aliases = aliases
+        .iter()
+        .map(|(k, v)| (k.to_owned(), v.to_owned()))
+        .collect::<Vec<(String, String)>>();
+    aliases.sort_by_key(|x| x.0.len());
+    Column::from_iter([
+        container(
+            Column::from_iter(aliases.iter().map(|(key, value)| {
+                let key_clone = key.clone();
+                let val_clone = value.clone();
+                let key_clone_2 = key.clone();
+                let val_clone_2 = value.clone();
+                let theme_clone_2 = theme.clone();
+                Row::from_iter([
+                    text_input_cell(key.to_owned(), &theme_clone, "Shorthand")
+                        .on_input(move |input| {
+                            Message::SetConfig(SetConfigFields::Aliases(Editable::Update {
+                                old: (key_clone.clone(), val_clone.clone()),
+                                new: (input.clone(), val_clone.clone()),
+                            }))
+                        })
+                        .into(),
+                    text_input_cell(value.to_owned(), &theme_clone, "Term")
+                        .on_input(move |input| {
+                            Message::SetConfig(SetConfigFields::Aliases(Editable::Update {
+                                old: (key_clone_2.clone(), val_clone_2.clone()),
+                                new: (key_clone_2.clone(), input.clone()),
+                            }))
+                        })
+                        .into(),
+                    Button::new("Delete")
+                        .on_press(Message::SetConfig(SetConfigFields::Aliases(
+                            Editable::Delete((key.clone(), value.clone())),
+                        )))
+                        .style(move |_, _| delete_button_style(&theme_clone_2))
+                        .into(),
+                ])
+                .spacing(10)
+                .into()
+            }))
+            .spacing(10),
+        )
+        .height(Length::Fill)
+        .width(Length::Fill)
+        .into(),
+        Button::new(
+            Text::new("+")
+                .align_x(Alignment::Center)
+                .align_y(Alignment::Center),
+        )
+        .style(move |_, _| settings_add_button_style(&theme_clone.clone()))
+        .on_press(Message::SetConfig(SetConfigFields::Aliases(
+            Editable::Create((String::new(), String::new())),
+        )))
+        .into(),
+    ])
+    .spacing(10)
+    .width(Length::Fill)
+    .align_x(Alignment::Center)
+    .into()
+}
+
+fn text_input_cell(text: String, theme: &Theme, placeholder: &str) -> TextInput<'static, Message> {
+    text_input(placeholder, &text)
+        .font(theme.font())
+        .padding(5)
+        .on_submit(Message::WriteConfig(false))
+}
+
+fn modes_item(modes: HashMap<String, String>, theme: &Theme) -> Element<'static, Message> {
+    let theme_clone = theme.clone();
+    let mut modes = modes
+        .iter()
+        .map(|(k, v)| (k.to_owned(), v.to_owned()))
+        .collect::<Vec<(String, String)>>();
+    modes.sort_by_key(|x| x.0.len());
+    Column::from_iter([
+        container(
+            Column::from_iter(modes.iter().map(|(key, value)| {
+                let theme_clone_1 = theme_clone.clone();
+                let display_val = if value.is_empty() {
+                    "Pick a file".to_string()
+                } else {
+                    value.replace(&std::env::var("HOME").unwrap_or("".to_string()), "~")
+                };
+                let key_clone = key.clone();
+                let val_clone = value.clone();
+                let theme_clone_2 = theme.clone();
+                Row::from_iter([
+                    text_input_cell(key.to_owned(), &theme_clone, "Shorthand")
+                        .on_input(move |input| {
+                            Message::SetConfig(SetConfigFields::Modes(Editable::Update {
+                                old: (key_clone.clone(), val_clone.clone()),
+                                new: (input.clone(), val_clone.clone()),
+                            }))
+                        })
+                        .into(),
+                    Button::new(Text::new(display_val))
+                        .on_press(Message::OpenFileDialogue(key.to_owned()))
+                        .style(move |_, _| settings_add_button_style(&theme_clone_1.clone()))
+                        .into(),
+                    Button::new("Delete")
+                        .on_press(Message::SetConfig(SetConfigFields::Modes(
+                            Editable::Delete((key.clone(), value.clone())),
+                        )))
+                        .style(move |_, _| delete_button_style(&theme_clone_2))
+                        .into(),
+                ])
+                .spacing(10)
+                .into()
+            }))
+            .spacing(10),
+        )
+        .height(Length::Fill)
+        .width(Length::Fill)
+        .into(),
+        Button::new(
+            Text::new("+")
+                .align_x(Alignment::Center)
+                .align_y(Alignment::Center),
+        )
+        .on_press(Message::SetConfig(SetConfigFields::Modes(
+            Editable::Create((String::new(), String::new())),
+        )))
+        .style(move |_, _| settings_add_button_style(&theme_clone.clone()))
+        .into(),
+    ])
+    .spacing(10)
+    .width(Length::Fill)
+    .align_x(Alignment::Center)
+    .into()
+}

src/app/tile/update.rs

@@ -66,7 +66,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             } else {
                 info!("Switching to default mode");
                 tile.current_mode = "default".to_string();
-                window::latest().map(|x| Message::HideWindow(x.unwrap()))
+                Task::none()
             }
         }
 
@@ -549,14 +549,69 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             }
         }
 
+        Message::OpenFileDialogue(mode_name) => rfd::FileDialog::new()
+            .add_filter("shell", &["sh", "bash", "zsh"])
+            .set_directory(
+                std::env::var("HOME").unwrap_or("".to_string()) + "/.config/rustcast/config.toml",
+            )
+            .pick_file()
+            .and_then(|x| {
+                x.to_str().map(|x| {
+                    Task::batch([
+                        Task::done(Message::SetConfig(SetConfigFields::Modes(
+                            Editable::Create((mode_name, x.to_string())),
+                        ))),
+                        Task::done(Message::WriteConfig(false)),
+                    ])
+                })
+            })
+            .unwrap_or(Task::none()),
+
         Message::SetConfig(config) => {
             let mut final_config = tile.config.clone();
             match config {
                 SetConfigFields::ToggleHotkey(hk) => final_config.toggle_hotkey = hk,
                 SetConfigFields::ClipboardHotkey(hk) => final_config.toggle_hotkey = hk,
-                //                SetConfigFields::Modes(modes) => final_config.modes = modes,
-                //                SetConfigFields::Aliases(aliases) => final_config.aliases = aliases,
-                //                SetConfigFields::SearchDirs(dirs) => final_config.search_dirs = dirs,
+                SetConfigFields::Modes(Editable::Create((key, value))) => {
+                    final_config.modes.entry(key).or_insert(value);
+                }
+                SetConfigFields::Modes(Editable::Delete((key, _))) => {
+                    final_config.modes.remove(&key);
+                }
+                SetConfigFields::Modes(Editable::Update { old, new }) => {
+                    final_config.modes.remove(&old.0);
+                    final_config.modes.insert(new.0, new.1);
+                }
+                SetConfigFields::Aliases(Editable::Create((key, value))) => {
+                    final_config.aliases.entry(key).or_insert(value);
+                }
+                SetConfigFields::Aliases(Editable::Delete((key, _))) => {
+                    final_config.aliases.remove(&key);
+                }
+                SetConfigFields::Aliases(Editable::Update { old, new }) => {
+                    final_config.aliases.remove(&old.0);
+                    final_config.aliases.insert(new.0, new.1);
+                }
+                SetConfigFields::SearchDirs(Editable::Create(dir)) => {
+                    final_config.search_dirs = dir
+                }
+                SetConfigFields::SearchDirs(Editable::Delete(dirs)) => {
+                    final_config.search_dirs = final_config
+                        .search_dirs
+                        .iter()
+                        .filter_map(|dir| {
+                            if !dirs.contains(dir) {
+                                Some(dir.to_owned())
+                            } else {
+                                None
+                            }
+                        })
+                        .collect();
+                }
+                SetConfigFields::SearchDirs(Editable::Update { old, new }) => {
+                    let _ = old;
+                    let _ = new;
+                }
                 SetConfigFields::SearchUrl(url) => final_config.search_url = url,
                 SetConfigFields::PlaceHolder(placeholder) => final_config.placeholder = placeholder,
                 SetConfigFields::DebounceDelay(delay) => final_config.debounce_delay = delay,
@@ -588,9 +643,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 SetConfigFields::ToDefault => {
                     final_config = Config::default();
                     final_config.shells = tile.config.shells.clone();
-                    final_config.aliases = tile.config.aliases.clone();
                     final_config.search_dirs = tile.config.search_dirs.clone();
-                    final_config.modes = tile.config.modes.clone();
                 }
             };
 

src/styles.rs

@@ -198,6 +198,19 @@ pub fn settings_save_button_style(theme: &ConfigTheme) -> button::Style {
     }
 }
 
+pub fn settings_add_button_style(theme: &ConfigTheme) -> button::Style {
+    button::Style {
+        background: None,
+        text_color: theme.text_color(1.),
+        border: Border {
+            color: theme.text_color(0.7),
+            width: 0.7,
+            radius: Radius::new(10),
+        },
+        ..Default::default()
+    }
+}
+
 pub fn settings_checkbox_style(theme: &ConfigTheme) -> checkbox::Style {
     checkbox::Style {
         background: Background::Color(Color::TRANSPARENT),