diff --git a/komorebi-bar/src/widgets/date.rs b/komorebi-bar/src/widgets/date.rs index 43a33437..c51acebd 100644 --- a/komorebi-bar/src/widgets/date.rs +++ b/komorebi-bar/src/widgets/date.rs @@ -1,4 +1,5 @@ use crate::config::LabelPrefix; +use crate::platform::platform; use crate::render::RenderConfig; use crate::selected_frame::SelectableFrame; use crate::widgets::widget::BarWidget; @@ -202,7 +203,7 @@ impl BarWidget for Date { let mut layout_job = LayoutJob::simple( match self.label_prefix { LabelPrefix::Icon | LabelPrefix::IconAndText => { - egui_phosphor::regular::CALENDAR_DOTS.to_string() + platform().calendar_icon().to_string() } LabelPrefix::None | LabelPrefix::Text => String::new(), }, diff --git a/komorebi-bar/src/widgets/memory.rs b/komorebi-bar/src/widgets/memory.rs index 21b71429..53e4f931 100644 --- a/komorebi-bar/src/widgets/memory.rs +++ b/komorebi-bar/src/widgets/memory.rs @@ -1,4 +1,6 @@ use crate::config::LabelPrefix; +use crate::platform::SystemTool; +use crate::platform::platform; use crate::render::RenderConfig; use crate::selected_frame::SelectableFrame; use crate::widgets::widget::BarWidget; @@ -10,7 +12,6 @@ use eframe::egui::Ui; use eframe::egui::text::LayoutJob; use serde::Deserialize; use serde::Serialize; -use std::process::Command; use std::time::Duration; use std::time::Instant; use sysinfo::RefreshKind; @@ -126,8 +127,7 @@ impl BarWidget for Memory { if SelectableFrame::new_auto(output.selected, auto_focus_fill) .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false))) .clicked() - && let Err(error) = - Command::new("cmd.exe").args(["/C", "taskmgr.exe"]).spawn() + && let Err(error) = platform().open_system_tool(SystemTool::TaskManager) { eprintln!("{error}") } diff --git a/komorebi-bar/src/widgets/update.rs b/komorebi-bar/src/widgets/update.rs index 4d2f444b..04c068ea 100644 --- a/komorebi-bar/src/widgets/update.rs +++ b/komorebi-bar/src/widgets/update.rs @@ -1,4 +1,6 @@ use crate::config::LabelPrefix; +use crate::platform::SystemTool; +use crate::platform::platform; use crate::render::RenderConfig; use crate::selected_frame::SelectableFrame; use crate::widgets::widget::BarWidget; @@ -10,7 +12,6 @@ use eframe::egui::Ui; use eframe::egui::text::LayoutJob; use serde::Deserialize; use serde::Serialize; -use std::process::Command; use std::time::Duration; use std::time::Instant; @@ -35,7 +36,7 @@ impl From for Update { let client = reqwest::blocking::Client::new(); if let Ok(response) = client - .get("https://api.github.com/repos/LGUG2Z/komorebi/releases/latest") + .get(platform().latest_release_api_url()) .header("User-Agent", "komorebi-bar-version-checker") .send() { @@ -142,12 +143,10 @@ impl BarWidget for Update { if SelectableFrame::new(false) .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false))) .clicked() - && let Err(error) = Command::new("explorer.exe") - .args([format!( - "https://github.com/LGUG2Z/komorebi/releases/v{}", - self.latest_version - )]) - .spawn() + && let Err(error) = platform().open_system_tool(SystemTool::Url(format!( + "https://github.com/LGUG2Z/komorebi/releases/v{}", + self.latest_version + ))) { eprintln!("{error}") } diff --git a/komorebi-for-mac/komorebi-bar/src/widgets/date.rs b/komorebi-for-mac/komorebi-bar/src/widgets/date.rs index 1bab9fd1..c51acebd 100644 --- a/komorebi-for-mac/komorebi-bar/src/widgets/date.rs +++ b/komorebi-for-mac/komorebi-bar/src/widgets/date.rs @@ -1,4 +1,5 @@ use crate::config::LabelPrefix; +use crate::platform::platform; use crate::render::RenderConfig; use crate::selected_frame::SelectableFrame; use crate::widgets::widget::BarWidget; @@ -202,7 +203,7 @@ impl BarWidget for Date { let mut layout_job = LayoutJob::simple( match self.label_prefix { LabelPrefix::Icon | LabelPrefix::IconAndText => { - egui_phosphor::regular::CALENDAR.to_string() + platform().calendar_icon().to_string() } LabelPrefix::None | LabelPrefix::Text => String::new(), }, diff --git a/komorebi-for-mac/komorebi-bar/src/widgets/memory.rs b/komorebi-for-mac/komorebi-bar/src/widgets/memory.rs index 9e99cdcf..53e4f931 100644 --- a/komorebi-for-mac/komorebi-bar/src/widgets/memory.rs +++ b/komorebi-for-mac/komorebi-bar/src/widgets/memory.rs @@ -1,4 +1,6 @@ use crate::config::LabelPrefix; +use crate::platform::SystemTool; +use crate::platform::platform; use crate::render::RenderConfig; use crate::selected_frame::SelectableFrame; use crate::widgets::widget::BarWidget; @@ -10,7 +12,6 @@ use eframe::egui::Ui; use eframe::egui::text::LayoutJob; use serde::Deserialize; use serde::Serialize; -use std::process::Command; use std::time::Duration; use std::time::Instant; use sysinfo::RefreshKind; @@ -126,9 +127,7 @@ impl BarWidget for Memory { if SelectableFrame::new_auto(output.selected, auto_focus_fill) .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false))) .clicked() - && let Err(error) = Command::new("open") - .args(["-a", "Activity Monitor"]) - .spawn() + && let Err(error) = platform().open_system_tool(SystemTool::TaskManager) { eprintln!("{error}") } diff --git a/komorebi-for-mac/komorebi-bar/src/widgets/update.rs b/komorebi-for-mac/komorebi-bar/src/widgets/update.rs index 7c314f1b..04c068ea 100644 --- a/komorebi-for-mac/komorebi-bar/src/widgets/update.rs +++ b/komorebi-for-mac/komorebi-bar/src/widgets/update.rs @@ -1,4 +1,6 @@ use crate::config::LabelPrefix; +use crate::platform::SystemTool; +use crate::platform::platform; use crate::render::RenderConfig; use crate::selected_frame::SelectableFrame; use crate::widgets::widget::BarWidget; @@ -10,7 +12,6 @@ use eframe::egui::Ui; use eframe::egui::text::LayoutJob; use serde::Deserialize; use serde::Serialize; -use std::process::Command; use std::time::Duration; use std::time::Instant; @@ -35,7 +36,7 @@ impl From for Update { let client = reqwest::blocking::Client::new(); if let Ok(response) = client - .get("https://api.github.com/repos/LGUG2Z/komorebi-for-mac/releases/latest") + .get(platform().latest_release_api_url()) .header("User-Agent", "komorebi-bar-version-checker") .send() { @@ -142,12 +143,10 @@ impl BarWidget for Update { if SelectableFrame::new(false) .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false))) .clicked() - && let Err(error) = Command::new("explorer.exe") - .args([format!( - "https://github.com/LGUG2Z/komorebi/releases/v{}", - self.latest_version - )]) - .spawn() + && let Err(error) = platform().open_system_tool(SystemTool::Url(format!( + "https://github.com/LGUG2Z/komorebi/releases/v{}", + self.latest_version + ))) { eprintln!("{error}") }