Merge pull request #19 from greeenboi/new-changes

added splashscreen with animated svg and threaded the splashscreen to…
greeenboi · Sep 27, 2023 · 3c5cc66 · 3c5cc66
2 parents 47fb11d + 0c7a866
commit 3c5cc66
Show file tree

Hide file tree

Showing 8 changed files with 182 additions and 14 deletions.
diff --git a/public/bg.svg b/public/bg.svg
diff --git a/public/splashscreen.webp b/public/splashscreen.webp
diff --git a/splashscreen.html b/splashscreen.html
@@ -0,0 +1,12 @@
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body data-tauri-drag-region style="background-image: url('/splashscreen.webp'); background-size: contain; display: flex; flex-direction: column; justify-content: center; align-items: center; overflow: hidden;">
+    <div data-tauri-drag-region style="display: flex; flex-direction: row;justify-content: center;align-items: center;">
+        <object type="image/svg+xml" data="/bg.svg"></object>    
+    </div>
+</body>
+</html>
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "_Glassy_Notes"
-version = "0.1.1"
+name = "glassy_notes"
+version = "0.1.3"
 description = "Better Notes"
 authors = ["you"]
 license = ""

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -1,16 +1,44 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+use tauri::{Manager, Window};
+
 // Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
 #[tauri::command]
 fn greet(name: &str) -> String {
     format!("Hello, {}! You've been greeted from Rust and SuvanGS the creator!", name)
 }
 
+#[tauri::command]
+async fn close_splashscreen(window: Window) {
+    if let Some(splashscreen) = window.get_window("splashscreen") {
+      splashscreen.close().unwrap();
+    }
+    // window.get_window("splashscreen").expect("no window labeled 'splashscreen' found").close().unwrap();
+
+    window.get_window("main").expect("no window labeled 'main' found").show().unwrap();
+  }
+
 
 fn main() {
     tauri::Builder::default()
-        .invoke_handler(tauri::generate_handler![greet])
+        .invoke_handler(tauri::generate_handler![greet, close_splashscreen])
+        .setup(|app| {
+          let splashscreen_window = app.get_window("splashscreen").unwrap();
+          let main_window = app.get_window("main").unwrap();
+
+          tauri::async_runtime::spawn(async move {
+
+            println!("Initializing...");
+            std::thread::sleep(std::time::Duration::from_secs(2));
+            println!("Done initializing.");
+
+
+            splashscreen_window.close().unwrap();
+            main_window.show().unwrap();
+          });
+          Ok(())
+        })
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -50,7 +50,16 @@
         "resizable": true,
         "title": "Glassy Notes",
         "width": 1080,
-        "height": 720
+        "height": 720,
+        "visible": false
+      },
+      {
+        "width": 800,
+        "height": 600,
+        "resizable": false,
+        "decorations": false,
+        "url": "/splashscreen.html",
+        "label": "splashscreen"
       }
     ]
   }

diff --git a/src/main.jsx b/src/main.jsx
@@ -2,7 +2,13 @@ import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App";
 import "./styles.css";
+import { invoke } from "@tauri-apps/api/tauri";
+import { appWindow } from "@tauri-apps/api/window";
 
+document.addEventListener('DOMContentLoaded', () => {
+  invoke('close_splashscreen')
+})
+
 ReactDOM.createRoot(document.getElementById("root")).render(
   <React.StrictMode>
     <App />