MacOS MVP Requirements

README.md

@@ -13,3 +13,7 @@ Allen Wrench is a desktop tool to aid [Hexcorp](https://hexcorp.net) Drones in t
 * [ ] Auto-send `return` on paste completion for pre-determined phrases
 * [ ] Ability to add custom types / phrases
 * [ ] [Unicode "font" options](https://lingojam.com/DiscordFonts)
+
+### Misc notes
+
+[Use this as a guide for building for MacOS](https://thinkgo.io/post/2023/02/publish_tauri_to_apples_app_store/)

entitlements.plist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+
+    <key>com.apple.security.app-sandbox</key><true/>
+    <key>com.apple.security.network.client</key><true/>
+
+    <key>com.apple.application-identifier</key>
+    <string>W9ASV855X5.lgbt.cray.allenwrench</string>
+    
+    <key>com.apple.developer.team-identifier</key>
+    <string>W9ASV855X5</string>
+    
+    <key>com.apple.security.files.user-selected.read-only</key>
+    <true/>
+  </dict>
+</plist>
+ 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "allenwrench-app",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.1.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -27,8 +27,8 @@ dependencies = [
 ]
 
 [[package]]
-name = "allenwrench-app"
+name = "allenwrench"
-version = "0.0.0"
+version = "0.1.1"
 dependencies = [
  "arboard",
  "enigo",

src-tauri/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
-name = "allenwrench-app"
+name = "allenwrench"
-version = "0.0.0"
+version = "0.1.1"
-description = "A Tauri App"
+description = "Hexcorp Drone Input Tool"
-authors = ["you"]
+authors = ["Liz Cray", "4661"]
-license = ""
+license = "Apache-2.0"
-repository = ""
+repository = "git@git.corrupt.link:liz/AllenWrench.git"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src-tauri/src/main.rs

@@ -1,6 +1,7 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+use tauri::{Manager, Size, LogicalSize};
 use enigo::{Enigo, Key, KeyboardControllable, MouseControllable};
 use std::thread;
 use std::time::Duration;
@@ -73,8 +74,18 @@ fn type_str(input: String) {
 
 fn main() {
     tauri::Builder::default()
+        .setup(|app| {
+            let main_window = app.get_window("main").unwrap();
+
+            #[cfg(target_os = "macos")] {
+                let _ = main_window.set_size(Size::Logical(LogicalSize {width: 400.0, height: 352.0}));
+            }
+            
+            Ok(())
+        })
         .plugin(tauri_plugin_positioner::init())
         .invoke_handler(tauri::generate_handler![type_str, get_mouse_pos])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
+    
 }

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
     "withGlobalTauri": false
   },
   "package": {
-    "productName": "allenwrench-app",
+    "productName": "allenwrench",
     "version": "0.1.1"
   },
   "tauri": {
@@ -48,7 +48,9 @@
       }
     },
     "bundle": {
+      "category": "Utility",
       "active": true,
+      "copyright": "Copyright 2023 Elizabeth Cray",
       "targets": "all",
       "identifier": "lgbt.cray.allenwrench",
       "icon": [
@@ -59,7 +61,12 @@
       ],
       "resources": [
         "resources/*"
-      ]
+      ],
+      "macOS": {
+        "minimumSystemVersion": "10.11",
+        "license": "../LICENSE.txt",
+        "entitlements": "../entitlements.plist"
+      }
     },
     "security": {
       "csp": null
@@ -67,7 +74,7 @@
     "windows": [
       {
         "fullscreen": false,
-        "resizable": false,
+        "resizable": true,
         "maximizable": false,
         "minimizable": false,
         "alwaysOnTop": true,

src/App.tsx

@@ -23,6 +23,7 @@ type Code = {
 };
 
 // Set window to above the mouse cursor
+// TODO: Fix for MacOS
 invoke('get_mouse_pos', {}).then((posJson: any) => {
   let pos = JSON.parse(posJson);
   appWindow.innerSize().then((size: any) => {
@@ -44,11 +45,13 @@ function App() {
     return (storedId ? storedId : "0000");
   });
 
-  resolveResource("resources/codes.json").then((path: string) => {
+  if (!codes){
-    readTextFile(path).then((codesJson: string) => {
+    resolveResource("resources/codes.json").then((path: string) => {
-      setCodes(JSON.parse(codesJson));
+      readTextFile(path).then((codesJson: string) => {
+        setCodes(JSON.parse(codesJson));
+      });
     });
-  });
+  }
 
   const getSubjects = (input: Array<Code>) => {
     // TODO: Put all single-level elements at bottom