Add Sonner for notifications and implement window management features

akash2061 · Nov 3, 2024 · ea3a52a · ea3a52a
1 parent 17dc69b
commit ea3a52a
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,7 +13,8 @@
     "@tauri-apps/api": "^2.0.3",
     "@tauri-apps/plugin-updater": "^2.0.0",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "sonner": "^1.6.1"
   },
   "devDependencies": {
     "@tauri-apps/cli": "^2",
@@ -23,4 +24,4 @@
     "tailwindcss": "^3.4.14",
     "vite": "^5.3.1"
   }
-}
+}
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -23,3 +23,4 @@ tauri-plugin-shell = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 rodio = "0.19.0"
+tokio = "1.41.0"
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
@@ -1,6 +1,6 @@
 use rodio::{Decoder, OutputStream, Sink};
 use std::io::Cursor;
-use tauri::{AppHandle, Builder};
+use tauri::{AppHandle, Builder, Manager};
 
 #[tauri::command]
 async fn play_bell_sound(_app_handle: AppHandle) {
@@ -14,11 +14,36 @@ async fn play_bell_sound(_app_handle: AppHandle) {
     sink.append(source);
     sink.sleep_until_end();
 }
+#[tauri::command]
+async fn bring_window_to_front(app: AppHandle) {
+    if let Some(window) = app.get_window("main") {
+        // Unminimize the window if it's minimized
+        if let Ok(is_minimized) = window.is_minimized() {
+            if is_minimized {
+                window.unminimize().unwrap();
+                window.set_always_on_top(true).unwrap();
+                window.set_focus().unwrap();
+            }
+        }
+
+        // Set window to always on top and focus it
+        window.set_always_on_top(true).unwrap();
+        window.set_focus().unwrap();
 
+        // Optionally, remove the always-on-top after a short delay
+        tauri::async_runtime::spawn(async move {
+            tokio::time::sleep(std::time::Duration::from_secs(5)).await;
+            window.set_always_on_top(false).unwrap();
+        });
+    }
+}
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     Builder::default()
-        .invoke_handler(tauri::generate_handler![play_bell_sound,])
+        .invoke_handler(tauri::generate_handler![
+            play_bell_sound,
+            bring_window_to_front
+        ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -21,6 +21,8 @@
         "shadow": false,
         "decorations": false,
         "center": true,
+        "focus": true,
+        "alwaysOnTop": false,
         "windowEffects": {
           "effects": [
             "blur"

diff --git a/src/App.jsx b/src/App.jsx
@@ -1,6 +1,7 @@
 import "./App.css";
 import Timer from "./components/Timer";
 import { getCurrentWindow } from "@tauri-apps/api/window";
+import { Toaster } from 'sonner';
 
 function App() {
   const minimizeWebview = async () => {
@@ -27,6 +28,7 @@ function App() {
         </div>
       </div>
       <Timer />
+      <Toaster richColors position="top-center" />
     </div>
   );
 }

diff --git a/src/components/Timer.jsx b/src/components/Timer.jsx
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { invoke } from '@tauri-apps/api/core';
+import { toast } from 'sonner';
 
 const Timer = () => {
     const [timeLeft, setTimeLeft] = useState(5); // Testing == 5seconds
@@ -15,6 +16,16 @@ const Timer = () => {
             }, 1000);
             return () => clearInterval(timer);
         } else {
+            if (timerName !== 'Pomodoro Timer') {
+                toast.success(`${timerName} is done!`, {
+                    duration: 3000
+                });
+            } else {
+                toast.success('Time to take a break!', {
+                    duration: 3000
+                });
+            }
+            invoke('bring_window_to_front');
             invoke('play_bell_sound');
         }
     }, [timeLeft]);

diff --git a/src/components/win.html b/src/components/win.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    Foo
+</body>
+</html>