refactor(tauri): split system_tray to another file

app/renderer/package.json

@@ -35,6 +35,7 @@
     "@pomatez/shareables": "*",
     "@tauri-apps/api": "2.0.0-alpha.8",
     "@tauri-apps/plugin-autostart": "^2.0.0-alpha.1",
+    "@tauri-apps/plugin-global-shortcut": "^2.0.0-alpha.1",
     "@tauri-apps/plugin-window": "^2.0.0-alpha.1",
     "@types/autosize": "^3.0.7",
     "@types/jest": "^26.0.24",

app/tauri/Cargo.toml

@@ -24,6 +24,9 @@ tauri-plugin-window = "2.0.0-alpha"
 tauri-plugin-autostart = "2.0.0-alpha"
 base64 = { version = "0.21.4", features = [] }
 
+[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
+tauri-plugin-global-shortcut = "2.0.0-alpha"
+
 [features]
 # by default Tauri runs in production mode
 # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL

app/tauri/src/commands.rs

@@ -193,52 +193,14 @@ fn tray_icon_update<R: Runtime>(data_url: String, window: tauri::Window<R>) {
  * Switch to a function that takes and returns tauri::Builder<Wry> or uses a reference if we need to
  * switch it.
  */
-pub trait PomatezExtras {
+pub trait PomatezCommands {
     fn register_pomatez_commands(self) -> tauri::Builder<Wry>;
-    fn set_pomatez_system_tray(self) -> tauri::Builder<Wry>;
 }
 
-impl PomatezExtras for Builder<Wry> {
+impl PomatezCommands for Builder<Wry> {
     fn register_pomatez_commands(self) -> tauri::Builder<Wry> {
         self.invoke_handler(tauri::generate_handler![set_show, set_always_on_top,
             set_fullscreen_break, set_compact_mode, set_ui_theme, set_native_titlebar,
             tray_icon_update, set_close, set_minimize])
     }
-
-    fn set_pomatez_system_tray(self) -> tauri::Builder<Wry> {
-        println!("Setting system tray");
-        self.setup(|app| {
-            // Was defined in tauri.config.json to start in v1
-            // That was created with an id of 1 though this gives more control
-
-            let show = MenuItemBuilder::with_id("show", "Show").build(app);
-            let quit = MenuItemBuilder::with_id("quit", "Quit").build(app);
-            let menu = MenuBuilder::new(app).items(&[&show, &quit]).build()?;
-            let tray = TrayIconBuilder::new()
-                .menu(&menu)
-                .tooltip("Pomatez")
-                .on_menu_event(move |app, event| match event.id().as_ref() {
-                    "show" => {
-                        let window = app.get_window("main").unwrap();
-                        window.show().unwrap();
-                        window.set_focus().unwrap();
-                    }
-                    "quit" => {
-                        app.exit(0);
-                    }
-                    _ => {}
-                })
-                .on_tray_event(|tray, event| {
-                    if event.click_type == ClickType::Left {
-                        let app = tray.app_handle();
-                        let window = app.get_window("main").unwrap();
-                        window.show().unwrap();
-                        window.set_focus().unwrap();
-                    }
-                })
-                .icon(Icon::File("./icons/icon.png".into()))
-                .build(app)?;
-            Ok(())
-        })
-    }
 }

app/tauri/src/main.rs

@@ -8,8 +8,10 @@ use tauri_plugin_window;
 
 #[macro_use]
 mod commands;
+mod system_tray;
 
-use commands::PomatezExtras;
+use commands::PomatezCommands;
+use system_tray::PomatezTray;
 
 fn main() {
     tauri::Builder::default()

app/tauri/src/system_tray.rs

@@ -0,0 +1,68 @@
+use std::path::PathBuf;
+use tauri::{Builder, Icon, Manager, Wry};
+use tauri::{
+    menu::{MenuBuilder, MenuItemBuilder},
+    tray::{ClickType, TrayIconBuilder},
+};
+use tauri::path::BaseDirectory;
+
+/**
+* We could do this by passing the object into a custom function that adds the commands but I wanted
+* to practice more with rust. Plus it makes the setup cleaner.
+
+* Switch to a function that takes and returns tauri::Builder<Wry> or uses a reference if we need to
+* switch it.
+ */
+pub trait PomatezTray {
+    fn set_pomatez_system_tray(self) -> tauri::Builder<Wry>;
+}
+
+impl PomatezTray for Builder<Wry> {
+
+    /*
+     * The icon is updated after rendering on the frontend so that is handled in the commands file.
+     * However the initial setup and behavior is handled here.
+    */
+    fn set_pomatez_system_tray(self) -> tauri::Builder<Wry> {
+        println!("Setting system tray");
+        self.setup(|app| {
+            // Was defined in tauri.config.json to start in v1
+            // That was created with an id of 1 though this gives more control
+
+            let show = MenuItemBuilder::with_id("show", "Show").build(app);
+            let quit = MenuItemBuilder::with_id("quit", "Quit").build(app);
+            let menu = MenuBuilder::new(app).items(&[&show, &quit]).build()?;
+
+            let icon_path = app.path().resolve::<PathBuf>("icons/icon.png".into(), BaseDirectory::Resource)
+                .expect("failed to resolve icon path, this should not happen as it is an internal file");
+
+            println!("Icon path: {:?}", icon_path);
+
+            let _ = TrayIconBuilder::new()
+                .menu(&menu)
+                .tooltip("Pomatez")
+                .on_menu_event(move |app, event| match event.id().as_ref() {
+                    "show" => {
+                        let window = app.get_window("main").unwrap();
+                        window.show().unwrap();
+                        window.set_focus().unwrap();
+                    }
+                    "quit" => {
+                        app.exit(0);
+                    }
+                    _ => {}
+                })
+                .on_tray_event(|tray, event| {
+                    if event.click_type == ClickType::Left {
+                        let app = tray.app_handle();
+                        let window = app.get_window("main").unwrap();
+                        window.show().unwrap();
+                        window.set_focus().unwrap();
+                    }
+                })
+                .icon(Icon::File(icon_path))
+                .build(app)?;
+            Ok(())
+        })
+    }
+}

app/tauri/tauri.conf.json

@@ -37,9 +37,9 @@
         "signingIdentity": null
       },
       "publisher": "Roldan Montilla Jr",
-      "resources": [],
+      "resources": ["icons/icon.png"],
       "shortDescription": "",
-      "targets": "all",
+      "targets": ["deb", "appimage", "msi", "dmg", "updater"],
       "windows": {
         "certificateThumbprint": null,
         "digestAlgorithm": "sha256",

tsconfig.json

@@ -9,6 +9,7 @@
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
     "suppressImplicitAnyIndexErrors": true,
+    "ignoreDeprecations": "5.0",
     "module": "esnext",
     "moduleResolution": "node",
     "resolveJsonModule": true,

yarn.lock

@@ -3732,6 +3732,13 @@
   dependencies:
     "@tauri-apps/api" "2.0.0-alpha.6"
 
+"@tauri-apps/plugin-global-shortcut@^2.0.0-alpha.1":
+  version "2.0.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.0.0-alpha.1.tgz#d5abec71d7b731b3530712fb21c05bf6d11fd9c4"
+  integrity sha512-86pqnvoylSZV7R/SjK1WlLhTWydIhRS5qjHl6IqIcY4sYRuBMovMNj8fMLhFt2Ppq4dRiSx5jbrlQDY82HJtaQ==
+  dependencies:
+    "@tauri-apps/api" "2.0.0-alpha.6"
+
 "@tauri-apps/plugin-window@^2.0.0-alpha.1":
   version "2.0.0-alpha.1"
   resolved "https://registry.yarnpkg.com/@tauri-apps/plugin-window/-/plugin-window-2.0.0-alpha.1.tgz#28a0217100fc5a34fb2a6d76103ba056b2348286"