Delete .env.example

package.json

@@ -1,6 +1,6 @@
 {
   "name": "friendolls-desktop",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "",
   "type": "module",
   "scripts": {

src-tauri/.env.example

@@ -1 +0,0 @@
-API_BASE_URL=http://127.0.0.1:3000

src-tauri/Cargo.lock

@@ -1240,7 +1240,7 @@ dependencies = [
 
 [[package]]
 name = "friendolls-desktop"
-version = "0.1.0"
+version = "0.1.4"
 dependencies = [
  "base64 0.22.1",
  "device_query",
@@ -1269,6 +1269,7 @@ dependencies = [
  "strum",
  "tauri",
  "tauri-build",
+ "tauri-macros",
  "tauri-plugin-dialog",
  "tauri-plugin-global-shortcut",
  "tauri-plugin-opener",
@@ -1948,9 +1949,9 @@ dependencies = [
 
 [[package]]
 name = "ico"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98"
+checksum = "3e795dff5605e0f04bff85ca41b51a96b83e80b281e96231bcaaf1ac35103371"
 dependencies = [
  "byteorder",
  "png",
@@ -4734,9 +4735,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.5.1"
+version = "2.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7ef707148f0755110ca54377560ab891d722de4d53297595380a748026f139f"
+checksum = "d4a24476afd977c5d5d169f72425868613d82747916dd29e0a357c84c4bd6d29"
 dependencies = [
  "base64 0.22.1",
  "brotli",
@@ -4761,9 +4762,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.5.1"
+version = "2.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71664fd715ee6e382c05345ad258d6d1d50f90cf1b58c0aa726638b33c2a075d"
+checksum = "d39b349a98dadaffebb73f0a40dcd1f23c999211e5a2e744403db384d0c33de7"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -5006,9 +5007,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.8.0"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b8bbe426abdbf52d050e52ed693130dbd68375b9ad82a3fb17efb4c8d85673"
+checksum = "219a1f983a2af3653f75b5747f76733b0da7ff03069c7a41901a5eb3ace4557d"
 dependencies = [
  "anyhow",
  "brotli",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "friendolls-desktop"
-version = "0.1.0"
+version = "0.1.4"
 description = "A Tauri App"
 authors = ["you"]
 edition = "2021"
@@ -50,6 +50,7 @@ enigo = { version = "0.6.1", features = ["wayland"] }
 lazy_static = "1.5.0"
 mlua = { version = "0.11", default-features = false, features = ["lua54", "vendored", "serde", "async"] }
 petpet = "2.4.3"
+tauri-macros = "2.5.5"
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-global-shortcut = "2"
 tauri-plugin-positioner = "2"

src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <background android:drawable="@color/ic_launcher_background"/>
+</adaptive-icon>

src-tauri/icons/android/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="ic_launcher_background">#fff</color>
+</resources>

src-tauri/src/services/scene/windows.rs

@@ -69,8 +69,12 @@ fn harden_scene_window_on_macos(window: &tauri::Window) {
 pub fn open_splash_window() {
     info!("Starting splash window creation...");
 
-    let mut config =
+    let url = if cfg!(debug_assertions) {
-        WindowConfig::accessory(SPLASH_WINDOW_LABEL, "/splash.html", "Friendolls Splash");
+        "/splash.html?debug=Y"
+    } else {
+        "/splash.html"
+    };
+    let mut config = WindowConfig::accessory(SPLASH_WINDOW_LABEL, url, "Friendolls Splash");
     config.width = 800.0;
     config.height = 400.0;
     config.visible = false;

src-tauri/src/state/network.rs

@@ -16,7 +16,7 @@ pub fn init_network_state() -> NetworkState {
     let http_client = reqwest::ClientBuilder::new()
         .timeout(std::time::Duration::from_secs(30))
         .connect_timeout(std::time::Duration::from_secs(10))
-        .user_agent("friendolls-desktop/0.1.0")
+        .user_agent("friendolls-desktop/0.1.4")
         .build()
         .expect("Client should build");
 

src-tauri/src/system_tray.rs

@@ -2,11 +2,15 @@ use crate::{
     get_app_handle, lock_r, lock_w, services::app_menu::open_app_menu_window, state::FDOLL,
 };
 use tauri::{
+    image::Image,
+    include_image,
     menu::{Menu, MenuItem},
     tray::TrayIconBuilder,
 };
 use tracing::error;
 
+const TRAY_ICON: Image<'_> = include_image!("./icons/icon.tray.png");
+
 /// Constructs app system tray.
 /// Uses Tauri.
 pub fn init_system_tray() {
@@ -34,7 +38,7 @@ pub fn init_system_tray() {
                 error!("menu item {:?} not handled", event.id);
             }
         })
-        .icon(app.default_window_icon().unwrap().clone())
+        .icon(TRAY_ICON)
         .build(app)
         .unwrap_or_else(|err| panic!("Failed to build tray: {}", err));
     {

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "friendolls-desktop",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "identifier": "com.adamcv.friendolls-desktop",
   "build": {
     "beforeDevCommand": "pnpm dev",

src/app.css

@@ -27,9 +27,9 @@
   --color-warning-content: oklch(100% 0 0);
   --color-error: oklch(70% 0.191 22.216);
   --color-error-content: oklch(100% 0 0);
-  --radius-selector: 0.25rem;
+  --radius-selector: 0rem;
-  --radius-field: 0.25rem;
+  --radius-field: 0rem;
-  --radius-box: 0.25rem;
+  --radius-box: 0rem;
   --size-selector: 0.1875rem;
   --size-field: 0.1875rem;
   --border: 1px;
@@ -63,9 +63,9 @@
   --color-warning-content: oklch(0% 0 0);
   --color-error: oklch(63% 0.237 25.331);
   --color-error-content: oklch(100% 0 0);
-  --radius-selector: 0.25rem;
+  --radius-selector: 0rem;
-  --radius-field: 0.25rem;
+  --radius-field: 0rem;
-  --radius-box: 0.25rem;
+  --radius-box: 0rem;
   --size-selector: 0.1875rem;
   --size-field: 0.1875rem;
   --border: 1px;
@@ -73,6 +73,17 @@
   --noise: 1;
 }
 
+@font-face {
+  font-family: "DepartureFontMono";
+  src: url("/DepartureMono-Regular.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+}
+
+@theme {
+  --font-custom: "DepartureFontMono", sans-serif;
+}
+
 :root {
   background-color: transparent;
 }

src/routes/+layout.svelte

@@ -55,6 +55,6 @@
   }
 </script>
 
-<div class="w-screen h-screen bg-transparent">
+<div class="w-screen h-screen bg-transparent font-custom">
   {@render children?.()}
 </div>

src/routes/app-menu/+page.svelte

@@ -50,7 +50,7 @@
   <div class="flex flex-col gap-2 h-full max-h-full">
     <div class="size-full flex flex-col max-h-full gap-2 h-full relative">
       <div class="absolute top-2 right-2">
-        <p class="text-xs font-mono opacity-50">v{appVersion}</p>
+        <p class="text-xs opacity-50">v{appVersion}</p>
       </div>
       <div class="tabs tabs-lift h-full flex-1">
         <label class="tab">

src/routes/app-menu/tabs/scene/neko-reposition.svelte

@@ -38,17 +38,11 @@
           </p>
         </div>
         <div>
-          <input
+          <p class="text-sm">
-            type="checkbox"
+            {$appState.sceneSetup.nekosPosition
-            checked={$appState.sceneSetup.nekosPosition !== null}
+              ? selectedLabel
-            onclick={() =>
+              : "Click a corner to enable"}
-              selectPosition(
+          </p>
-                $appState.sceneSetup.nekosPosition ? null : "bottom-left",
-              )}
-            class="toggle toggle-xl {$appState.sceneSetup.nekosPosition
-              ? 'bg-primary/10 toggle-primary'
-              : 'bg-base-200'}"
-          />
         </div>
       </div>
       <div class="card bg-base-200/50 p-1 w-max border border-base-300">

src/routes/app-menu/tabs/scene/neko-view.svelte

@@ -24,7 +24,7 @@
           <div class="size-full absolute bg-gridded opacity-25"></div>
           <div class="size-full absolute">
             <div
-              class="flex flex-row size-full items-end justify-between text-[8px] text-primary p-1 font-mono"
+              class="flex flex-row size-full items-end justify-between text-[8px] text-primary p-1"
             >
               <div class="text-start flex flex-col">
                 <p>Scale</p>

src/routes/app-menu/tabs/scene/scene.svelte

@@ -4,7 +4,7 @@
 </script>
 
 <div class="flex flex-col gap-4 w-full h-full">
-  <p class="text-lg font-bold">Scene Configuration</p>
+  <p class="text-lg">Scene Configuration</p>
   <NekoView />
   <NekoReposition />
 </div>

src/routes/app-menu/tabs/your-dolls/index.svelte

@@ -48,7 +48,7 @@
 
 <div class="dolls-page flex flex-col gap-4 max-h-full h-full">
   <div class="flex justify-between items-center">
-    <h2 class="text-lg font-bold">Your Nekos</h2>
+    <h2 class="text-lg">Your Nekos</h2>
     <button class="btn btn-primary btn-sm" on:click={openCreateModal}>
       Add a Neko
     </button>

src/routes/client-config/+page.svelte

@@ -84,7 +84,7 @@
 <div class="p-6 flex flex-col gap-4 w-full h-full justify-between">
   <div class="flex flex-col gap-4 w-full">
     <div class="flex flex-col gap-1">
-      <p class="text-xl font-semibold">Client Configuration</p>
+      <p class="text-xl">Client Configuration</p>
       <p class="opacity-70 text-sm">Set a custom API endpoint.</p>
     </div>
 

src/routes/health-manager/+page.svelte

@@ -27,13 +27,13 @@
   <div class="flex flex-col gap-4 size-full justify-between">
     <div class="flex flex-col gap-4">
       <div class="flex flex-col gap-2">
-        <p class="text-md font-light">Something is not right...</p>
+        <p class="text-md">Something is not right...</p>
-        <p class="opacity-70 text-3xl font-bold">
+        <p class="opacity-70 text-3xl">
           Seems like the server is inaccessible. Check your network?
         </p>
       </div>
       {#if errorMessage}
-        <p class="text-xs opacity-70 wrap-break-word font-mono">
+        <p class="text-xs opacity-70 wrap-break-word">
           {errorMessage}
         </p>
       {/if}

src/routes/scene/components/debug-bar.svelte

@@ -52,7 +52,7 @@
 </script>
 
 <div
-  class="size-max mx-auto bg-base-100 border-base-200 border p-1 rounded-lg shadow-md"
+  class="size-max mx-auto bg-base-100 border-base-200 border p-1 rounded-box shadow-md"
 >
   <div class="flex flex-row gap-1 items-center text-center">
     <div>
@@ -90,7 +90,7 @@
             {@const status = getFriendStatus(userId)}
             <div class="badge py-3 text-xs text-left flex flex-row gap-2">
               <span class="font-bold">{getFriendById(userId)?.name}</span>
-              <div class="flex flex-row font-mono gap-2">
+              <div class="flex flex-row gap-2">
                 <span>
                   {position.cursor.mapped.x.toFixed(3)},
                   {position.cursor.mapped.y.toFixed(3)}

src/routes/scene/components/pet-menu/pet-menu.svelte

@@ -119,7 +119,7 @@
         handleActionClick(action);
       }}
     >
-      <span class="text-[11px] font-semibold leading-none">{action.icon}</span>
+      <span class="text-[11px] leading-none">{action.icon}</span>
     </button>
   {/each}
 
@@ -129,7 +129,7 @@
 
   <button
     type="button"
-    class={`absolute inset-0 z-30 rounded-full transition-all duration-200 ease-out focus:outline-none ${
+    class={`absolute inset-0 z-30 transition-all duration-200 ease-out focus:outline-none ${
       $sceneInteractive
         ? "cursor-pointer"
         : "pointer-events-none cursor-default"

src/routes/scene/components/pet-menu/pet-name.svelte

@@ -9,7 +9,7 @@
 
 {#if name}
   <div
-    class={`absolute left-1/2 top-full z-10 mt-3 w-max max-w-32 -translate-x-1/2 rounded-md border border-base-300/80 bg-base-100/90 px-2 py-1 text-center text-[10px] font-medium leading-tight text-base-content/80 shadow-sm backdrop-blur-sm transition-all duration-200 ease-out ${
+    class={`absolute left-1/2 top-full z-10 mt-3 w-max max-w-32 -translate-x-1/2 rounded-field border border-base-300/80 bg-base-100/90 px-2 py-1 text-center text-[10px] font-medium leading-tight text-base-content/80 shadow-sm backdrop-blur-sm transition-all duration-200 ease-out ${
       visible
         ? "translate-y-0 opacity-100"
         : "pointer-events-none -translate-y-1 opacity-0"

src/routes/welcome/+page.svelte

@@ -100,11 +100,9 @@
         <div class="flex flex-col gap-6">
           <div class="flex flex-col gap-2">
             <div class="flex flex-row gap-2">
-              <p class="text-xl font-light">meow? nyaaa!!</p>
+              <p class="text-xl opacity-70">meow? nyaaa!!</p>
             </div>
-            <p class="opacity-70 text-3xl font-bold">
+            <p class="text-2xl">a cute passive socialization layer!</p>
-              a cute passive socialization layer!
-            </p>
           </div>
           <div class="flex flex-col gap-3">
             <span>Sign in with</span>
@@ -118,15 +116,13 @@
                   class="flex flex-row justify-start items-center z-1 h-full p-1 pr-0"
                 >
                   <div
-                    class="bg-linear-to-t from-base-100/50 to-base-100 rounded-sm"
+                    class="bg-linear-to-t from-base-100/50 to-base-100 rounded-selector"
                   >
                     <div class="scale-70">
                       <Google />
                     </div>
                   </div>
-                  <span class="text-xl font-semibold px-3 text-primary-content"
+                  <span class="text-xl px-3 text-primary-content">Google</span>
-                    >Google</span
-                  >
                 </div>
               </button>
               <button
@@ -138,15 +134,13 @@
                   class="flex flex-row justify-start items-center z-1 h-full p-1 pr-0"
                 >
                   <div
-                    class="bg-linear-to-t from-base-100/50 to-base-100 rounded-sm"
+                    class="bg-linear-to-t from-base-100/50 to-base-100 rounded-selector"
                   >
                     <div class="scale-70">
                       <Discord />
                     </div>
                   </div>
-                  <span class="text-xl font-semibold px-3 text-primary-content"
+                  <span class="text-xl px-3 text-primary-content">Discord</span>
-                    >Discord</span
-                  >
                 </div>
               </button>
             </div>

static/splash.html

@@ -2,22 +2,29 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>Friendolls</title>
+    <title>Friendolls Splash</title>
     <script>
       document.addEventListener("contextmenu", function (e) {
         e.preventDefault();
       });
+
+      const urlParams = new URLSearchParams(window.location.search);
+      const debug = urlParams.get("debug") === "Y";
     </script>
   </head>
   <body style="width: 100%; height: 100%">
     <div id="splash"></div>
+    <script>
+      document.getElementById("splash").style.backgroundImage = debug
+        ? 'url("/splash-dev.jpeg")'
+        : 'url("/splash.jpg")';
+    </script>
 
     <style>
       * {
         margin: 0;
       }
       #splash {
-        background-image: url("/splash-dev.jpeg");
         background-size: cover;
         background-position: center;
         width: 800px;