upgrade to tauri 2.0 beta

src-tauri/src/tray.rs

@@ -1,45 +1,46 @@
 use tauri::{
+    App,
     AppHandle,
-    CustomMenuItem,
     Manager,
-    SystemTray,
-    SystemTrayEvent,
-    SystemTrayMenu,
     async_runtime as rt,
 };
+use tauri::menu::{
+    MenuBuilder,
+    MenuEvent,
+    MenuItemBuilder,
+};
 
 use crate::app;
 use crate::state::AppState;
 
 
-pub fn create() -> SystemTray {
-    let show = CustomMenuItem::new("show_hide".to_string(), "Show");
-    let quit = CustomMenuItem::new("exit".to_string(), "Exit");
+pub fn setup(app: &App) -> tauri::Result<()> {
+    let show_hide = MenuItemBuilder::with_id("show_hide", "Show/Hide").build(app)?;
+    let exit = MenuItemBuilder::with_id("exit", "Exit").build(app)?;
 
-    let menu = SystemTrayMenu::new()
-        .add_item(show)
-        .add_item(quit);
+    let menu = MenuBuilder::new(app)
+        .items(&[&show_hide, &exit])
+        .build()?;
 
-    SystemTray::new().with_menu(menu)
+    let tray = app.tray_by_id("main").unwrap();
+    tray.set_menu(Some(menu))?;
+    tray.on_menu_event(handle_event);
+
+    Ok(())
 }
 
 
-pub fn handle_event(app_handle: &AppHandle, event: SystemTrayEvent) {
-    match event {
-        SystemTrayEvent::MenuItemClick{ id, .. } => {
-            match id.as_str() {
-                "exit" => app_handle.exit(0),
-                "show_hide" => {
-                    let _ = app::toggle_main_window(app_handle);
-                    let new_handle = app_handle.app_handle();
-                    rt::spawn(async move {
-                        let state = new_handle.state::<AppState>();
-                        state.signal_activity().await;
-                    });
-                }
-                _ => (),
-            }
-        }
+fn handle_event(app_handle: &AppHandle, event: MenuEvent) {
+    match event.id.0.as_str() {
+        "exit" => app_handle.exit(0),
+        "show_hide" => {
+            let _ = app::toggle_main_window(app_handle);
+            let new_handle = app_handle.clone();
+            rt::spawn(async move {
+                let state = new_handle.state::<AppState>();
+                state.signal_activity().await;
+            });
+        },
         _ => (),
     }
 }