Dev app icon

package.json

@@ -4,13 +4,14 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "tauri-dev": "RUST_LOG=warn YAAK_ENV=development tauri dev",
+    "tauri-dev": "YAAK_ENV=development tauri dev --no-watch --config src-tauri/tauri-dev.conf.json",
     "tauri-build": "tauri build",
     "tauri": "tauri",
     "build": "npm run build:frontend",
     "dev": "vite dev",
     "lint": "tsc && eslint . --ext .ts,.tsx",
-    "build:icon": "tauri icon src-tauri/icons/icon.png",
+    "build:icon:release": "tauri icon design/icon.png --output src-tauri/icons/release",
+    "build:icon:dev": "tauri icon design/icon-dev.png --output src-tauri/icons/dev",
     "build:frontend": "vite build",
     "test": "vitest",
     "coverage": "vitest run --coverage",

src-tauri/Cargo.lock

@@ -2310,46 +2310,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
-[[package]]
-name = "libappindicator"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8"
-dependencies = [
- "glib",
- "gtk",
- "gtk-sys",
- "libappindicator-sys",
- "log",
-]
-
-[[package]]
-name = "libappindicator-sys"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa"
-dependencies = [
- "gtk-sys",
- "libloading",
- "once_cell",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
 
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
 [[package]]
 name = "libm"
 version = "0.2.8"
@@ -4469,7 +4435,6 @@ dependencies = [
  "core-foundation",
  "core-graphics 0.22.3",
  "crossbeam-channel",
- "dirs-next",
  "dispatch",
  "gdk",
  "gdk-pixbuf",
@@ -4484,7 +4449,6 @@ dependencies = [
  "instant",
  "jni",
  "lazy_static",
- "libappindicator",
  "libc",
  "log",
  "ndk",

src-tauri/Cargo.toml

@@ -37,7 +37,6 @@ tauri = { version = "1.3", features = [
     "os-all",
     "protocol-asset",
     "shell-open",
-    "system-tray",
     "updater",
     "window-start-dragging",
     "dialog-open",

src-tauri/src/analytics.rs

@@ -74,14 +74,14 @@ pub fn track_event(
             .query(&params);
 
         if is_dev() {
-            debug!("Ignore dev analytics event: {} {:?}", event, params);
+            debug!("Send event (dev): {}", event);
         } else if let Err(e) = req.send().await {
             warn!(
                 "Error sending analytics event: {} {} {:?}",
                 e, event, params
             );
         } else {
-            debug!("Sent analytics event: {}: {:?}", event, params);
+            debug!("Send event: {}: {:?}", event, params);
         }
     });
 }

src-tauri/src/main.rs

@@ -795,6 +795,9 @@ fn main() {
                 .targets([LogTarget::LogDir, LogTarget::Stdout, LogTarget::Webview])
                 .level_for("tao", log::LevelFilter::Info)
                 .level_for("sqlx", log::LevelFilter::Warn)
+                .level_for("hyper", log::LevelFilter::Info)
+                .level_for("tracing", log::LevelFilter::Info)
+                .level_for("reqwest", log::LevelFilter::Debug)
                 .with_colors(ColoredLevelConfig::default())
                 .level(log::LevelFilter::Trace)
                 .build(),
@@ -920,10 +923,7 @@ fn create_window(handle: &AppHandle<Wry>, url: Option<&str>) -> Window<Wry> {
         100.0 + random::<f64>() * 30.0,
         100.0 + random::<f64>() * 30.0,
     )
-    .title(match is_dev() {
+    .title(handle.package_info().name.to_string());
-        true => "Yaak Dev",
-        false => "Yaak",
-    });
 
     // Add macOS-only things
     #[cfg(target_os = "macos")]

src-tauri/tauri-dev.conf.json

@@ -0,0 +1,17 @@
+{
+  "package": {
+    "productName": "Daak"
+  },
+  "tauri": {
+    "bundle": {
+      "icon": [
+        "icons/dev/32x32.png",
+        "icons/dev/128x128.png",
+        "icons/dev/128x128@2x.png",
+        "icons/dev/icon.icns",
+        "icons/dev/icon.ico"
+      ],
+      "identifier": "app.yaak.desktop.dev"
+    }
+  }
+}

src-tauri/tauri.conf.json

@@ -65,11 +65,11 @@
       "copyright": "",
       "externalBin": [],
       "icon": [
-        "icons/32x32.png",
+        "icons/release/32x32.png",
-        "icons/128x128.png",
+        "icons/release/128x128.png",
-        "icons/128x128@2x.png",
+        "icons/release/128x128@2x.png",
-        "icons/icon.icns",
+        "icons/release/icon.icns",
-        "icons/icon.ico"
+        "icons/release/icon.ico"
       ],
       "identifier": "co.schier.yaak",
       "longDescription": "The best cross-platform visual API client",
@@ -100,10 +100,6 @@
       }
     },
     "security": {},
-    "systemTray": {
-      "iconAsTemplate": true,
-      "iconPath": "icons/icon.png"
-    },
     "updater": {
       "active": true,
       "dialog": true,