update tauri

birdflop · Dec 18, 2023 · 1e706e2 · 1e706e2
1 parent 4ce8085
commit 1e706e2
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 35 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
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 = "simplymc"
-version = "0.3.5"
+version = "0.4.0"
 description = "SimplyMC but an app"
 authors = ["LuminescentDev"]
 license = "AGPL-3.0-or-later"

diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
@@ -1,38 +1,19 @@
-use tauri::{CustomMenuItem, Menu, Submenu};
+use tauri::menu::MenuBuilder;
 
 #[tauri::command]
 fn greet() -> &'static str { "Hello, Tauri!" }
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
-  let refresh: CustomMenuItem = CustomMenuItem::new("refresh".to_string(), "Refresh");
-  let quit: CustomMenuItem = CustomMenuItem::new("quit".to_string(), "Quit");
-  let simplymc: Submenu = Submenu::new("SimplyMC", Menu::new()
-    .add_item(refresh)
-    .add_item(quit)
-  );
-  let en_us: CustomMenuItem = CustomMenuItem::new("en-US".to_string(), "English (US)");
-  let es_es: CustomMenuItem = CustomMenuItem::new("es-ES".to_string(), "Español (Spanish - ES)");
-  let nl_nl: CustomMenuItem = CustomMenuItem::new("nl-NL".to_string(), "Nederlands (Dutch - NL)");
-  let pt_pt: CustomMenuItem = CustomMenuItem::new("pt-PT".to_string(), "Português (Portuguese - PT)");
-  let language: Submenu = Submenu::new("Language", Menu::new()
-    .add_item(en_us)
-    .add_item(es_es)
-    .add_item(nl_nl)
-    .add_item(pt_pt)
-  );
-  let menu: Menu = Menu::new().add_submenu(simplymc).add_submenu(language);
   tauri::Builder::default()
-    .menu(menu)
-    .on_menu_event(|event| {
-      match event.menu_item_id() {
-        "quit" => { std::process::exit(0); }
-        _ => {}
-      }
+    .setup(|app| {
+      let menu = MenuBuilder::new(app).copy().paste().undo().redo().build()?;
+      app.set_menu(menu)?;
+      Ok(())
     })
     .plugin(tauri_plugin_notification::init())
     .plugin(tauri_plugin_window_state::Builder::default().build())
     .invoke_handler(tauri::generate_handler![greet])
     .run(tauri::generate_context!())
     .expect("error while running tauri application");
-}
+}
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -10,6 +10,7 @@
     "productName": "SimplyMC",
     "version": "0.3.5"
   },
+  "plugins": {},
   "tauri": {
     "bundle": {
       "active": true,
@@ -58,4 +59,4 @@
       }
     ]
   }
-}
+}
diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx
@@ -16,7 +16,7 @@ import { version } from '~/../package.json';
 import Luminescent from './icons/Luminescent';
 import LoadingIcon from './icons/LoadingIcon';
 
-import { Window } from '@tauri-apps/plugin-window';
+import { Window } from '@tauri-apps/api/window';
 import { sendNotification, isPermissionGranted, requestPermission } from '@tauri-apps/plugin-notification';
 
 export default component$(({ tauriVersion }: any) => {
@@ -25,7 +25,7 @@ export default component$(({ tauriVersion }: any) => {
 
   return (
     <Nav>
-      <MainNav>
+      <MainNav tauriVersion={tauriVersion}>
         <Dropdown name={t('nav.gradients@@Gradients')} extraClass={{ 'hidden sm:flex': true }}>
           <NavButton href="/gradients">
             {t('nav.hexGradient@@Hex Gradients')}
@@ -106,7 +106,7 @@ export default component$(({ tauriVersion }: any) => {
         </button>
         {tauriVersion && <>
           <button title="Minimize" class="transition ease-in-out hover:bg-violet-900/20 hover:text-white p-1 rounded-lg text-3xl hidden sm:flex items-center" onClick$={() => {
-            Window.getCurrent().minimize();
+            Window.getzCurrent().minimize();
           }}>
             <RemoveOutline width="24" />
           </button>
@@ -203,10 +203,13 @@ export const Brand = component$(() => {
   );
 });
 
-export const MainNav = component$(() => {
+export const MainNav = component$(({ tauriVersion }: any) => {
   return (
     <div class="bg-violet-900/20 px-4 lg:px-6 py-1">
-      <div class="mx-auto max-w-7xl relative flex h-16 items-center justify-between">
+      <div class={{
+        'mx-auto relative flex h-10 items-center justify-between': true,
+        'max-w-7xl h-16': !tauriVersion,
+      }}>
         <Brand />
         <div class="flex flex-1 items-center justify-end">
           <div class="flex gap-1 text-gray-300 whitespace-nowrap">

diff --git a/src/routes/layout.tsx b/src/routes/layout.tsx
@@ -4,7 +4,7 @@ import { config } from '~/speak-config';
 
 import Nav from '../components/Nav';
 import { Button } from '~/components/elements/Button';
-import { getVersion } from '@tauri-apps/plugin-app';
+import { getVersion } from '@tauri-apps/api/app';
 
 export default component$(() => {
   const store = useStore({