create-pixi-vn 2.1.4 → 2.1.6

package/template-nqtr-react-vite-muijoy-ink-tauri/src-tauri/Cargo.toml

@@ -39,6 +39,7 @@ tauri-plugin-process = "2"
 tauri-plugin-window-state = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+os_info = "3"
 steamworks = { version = "0.13", optional = true }
 
 [profile.release]

package/template-nqtr-react-vite-muijoy-ink-tauri/src-tauri/src/lib.rs

@@ -5,6 +5,7 @@ use tauri_plugin_window_state::{AppHandleExt, StateFlags};
 // Steam is only compiled on desktop targets when the "steam" feature is on.
 #[cfg(all(feature = "steam", not(target_os = "ios"), not(target_os = "android")))]
 mod steam;
+mod system_info;
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
@@ -24,36 +25,47 @@ pub fn run() {
     // is set in Cargo.toml). Steam is not supported on iOS / Android.
     #[cfg(all(feature = "steam", not(target_os = "ios"), not(target_os = "android")))]
     {
-        builder = builder
-            .manage(steam::SteamClient {
-                client: std::sync::Mutex::new(steam::try_init()),
-            })
-            .invoke_handler(tauri::generate_handler![
-                steam::steam_is_available,
-                steam::steam_get_player_name,
-                steam::steam_get_app_id,
-                steam::steam_unlock_achievement,
-                steam::steam_is_achievement_unlocked,
-                steam::steam_clear_achievement,
-                steam::steam_set_stat_int,
-                steam::steam_get_stat_int,
-                steam::steam_set_stat_float,
-                steam::steam_get_stat_float,
-                steam::steam_store_stats,
-                steam::steam_is_dlc_installed,
-                steam::steam_open_overlay,
-                steam::steam_open_store,
-            ]);
+        builder = builder.manage(steam::SteamClient {
+            client: std::sync::Mutex::new(steam::try_init()),
+        });
     }
 
+    // `generate_handler!` needs a static list, so the Steam commands can't be
+    // appended conditionally — the two variants below are kept in sync by hand.
+    #[cfg(all(feature = "steam", not(target_os = "ios"), not(target_os = "android")))]
+    let builder = builder.invoke_handler(tauri::generate_handler![
+        system_info::get_system_info,
+        system_info::get_webview_version,
+        steam::steam_is_available,
+        steam::steam_get_player_name,
+        steam::steam_get_app_id,
+        steam::steam_unlock_achievement,
+        steam::steam_is_achievement_unlocked,
+        steam::steam_clear_achievement,
+        steam::steam_set_stat_int,
+        steam::steam_get_stat_int,
+        steam::steam_set_stat_float,
+        steam::steam_get_stat_float,
+        steam::steam_store_stats,
+        steam::steam_is_dlc_installed,
+        steam::steam_open_overlay,
+        steam::steam_open_store,
+    ]);
+
+    #[cfg(not(all(feature = "steam", not(target_os = "ios"), not(target_os = "android"))))]
+    let builder = builder.invoke_handler(tauri::generate_handler![
+        system_info::get_system_info,
+        system_info::get_webview_version,
+    ]);
+
     builder
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
 
-fn on_page_load(window: &tauri::Webview, _: &tauri::webview::PageLoadPayload<'_>) {
+fn on_page_load(_window: &tauri::Webview, _: &tauri::webview::PageLoadPayload<'_>) {
     #[cfg(not(debug_assertions))]
-    let _ = window.eval("document.addEventListener('contextmenu', e => e.preventDefault())");
+    let _ = _window.eval("document.addEventListener('contextmenu', e => e.preventDefault())");
 }
 
 #[cfg(not(mobile))]

package/template-nqtr-react-vite-muijoy-ink-tauri/src-tauri/src/system_info.rs

@@ -0,0 +1,33 @@
+use serde::Serialize;
+
+#[derive(Serialize)]
+pub struct SystemInfo {
+    /// Specific OS/distro name (e.g. "Ubuntu", "Windows", "Mac OS"), not just the generic platform.
+    os_type: String,
+    os_version: String,
+    bitness: String,
+    architecture: String,
+}
+
+/// Native OS/distro details, unavailable to plain web JS (browsers deliberately
+/// don't expose this to limit fingerprinting).
+#[tauri::command]
+pub fn get_system_info() -> SystemInfo {
+    let info = os_info::get();
+    SystemInfo {
+        os_type: info.os_type().to_string(),
+        os_version: info.version().to_string(),
+        bitness: info.bitness().to_string(),
+        architecture: info
+            .architecture()
+            .map(str::to_string)
+            .unwrap_or_else(|| std::env::consts::ARCH.to_string()),
+    }
+}
+
+/// Underlying WebView engine version (WebView2 on Windows, WebKitGTK on Linux,
+/// WKWebView on macOS/iOS, Android System WebView on Android).
+#[tauri::command]
+pub fn get_webview_version() -> Result<String, String> {
+    tauri::webview_version().map_err(|e| e.to_string())
+}

package/template-nqtr-react-vite-muijoy-tauri/.vscode/launch.json

@@ -26,7 +26,7 @@
       "cwd": "${workspaceFolder}",
       "terminal": "console",
       "preLaunchTask": "Cargo Build (Desktop Dev)",
-      "postDebugTask": "Stop Vite Desktop Server"
+      "postDebugTask": "Stop Vite Dev Server"
     },
     {
       "name": "Debug Game Preview",

package/template-nqtr-react-vite-muijoy-tauri/.vscode/tasks.json

@@ -106,7 +106,7 @@
       "label": "Cargo Build (Desktop Dev)",
       "type": "shell",
       "command": "cargo build --manifest-path=./src-tauri/Cargo.toml --no-default-features",
-      "dependsOn": ["Start Vite Desktop Server"],
+      "dependsOn": ["Restart Vite Dev Server"],
       "presentation": {
         "reveal": "always",
         "panel": "dedicated",
@@ -114,40 +114,6 @@
         "close": true
       },
       "problemMatcher": ["$rustc"]
-    },
-    {
-      "label": "Start Vite Desktop Server",
-      "type": "shell",
-      "command": "npm run dev",
-      "isBackground": true,
-      "dependsOn": ["Install Dependencies"],
-      "problemMatcher": {
-        "owner": "vite",
-        "pattern": {
-          "regexp": "^(?!x)x"
-        },
-        "background": {
-          "activeOnStart": true,
-          "beginsPattern": ".",
-          "endsPattern": "localhost:5173"
-        }
-      },
-      "presentation": {
-        "reveal": "always",
-        "panel": "dedicated",
-        "clear": false,
-        "close": true
-      }
-    },
-    {
-      "label": "Stop Vite Desktop Server",
-      "type": "shell",
-      "command": "pkill -f 'vite' 2>/dev/null; pkill -f 'npm run dev' 2>/dev/null; exit 0",
-      "presentation": {
-        "reveal": "never",
-        "panel": "dedicated",
-        "close": true
-      }
     }
   ]
 }

package/template-nqtr-react-vite-muijoy-tauri/_github/workflows/mobile.yml

@@ -100,26 +100,89 @@ jobs:
           with open(manifest, 'w') as f:
               f.write(content)
 
-          # Tauri may generate styles.xml or themes.xml depending on the version
+          # Tauri may generate styles.xml or themes.xml, and both a light (values/)
+          # and dark (values-night/) variant — patch every variant we find so the
+          # fullscreen flag doesn't silently no-op when the device is in dark mode.
           styles_candidates = (
-              glob.glob('src-tauri/gen/android/app/src/main/res/values/styles.xml') +
-              glob.glob('src-tauri/gen/android/app/src/main/res/values/themes.xml')
+              glob.glob('src-tauri/gen/android/app/src/main/res/values*/styles.xml') +
+              glob.glob('src-tauri/gen/android/app/src/main/res/values*/themes.xml')
           )
           if not styles_candidates:
               print('Warning: no styles.xml/themes.xml found, skipping fullscreen patch')
           else:
-              styles = styles_candidates[0]
-              with open(styles) as f:
+              for styles in styles_candidates:
+                  with open(styles) as f:
+                      content = f.read()
+                  # Hide status bar (fullscreen) — kept as a best-effort theme hint,
+                  # but on targetSdk 35+ (edge-to-edge is enforced by the OS) this
+                  # alone has no effect; the real fix is the MainActivity.kt patch below.
+                  content = content.replace(
+                      '</style>',
+                      '    <item name="android:windowFullscreen">true</item>\n    </style>',
+                      1
+                  )
+                  with open(styles, 'w') as f:
+                      f.write(content)
+                  print(f'Patched {styles}')
+
+          # Since this project's Android template targets SDK 35+, edge-to-edge display
+          # is enforced by the OS and the theme-based windowFullscreen flag above no
+          # longer hides the status bar (it's always drawn, transparent, over the
+          # content). The only reliable way to hide it is to hide the system bars at
+          # runtime via WindowInsetsControllerCompat in MainActivity.kt.
+          activity_candidates = glob.glob(
+              'src-tauri/gen/android/app/src/main/**/MainActivity.kt', recursive=True
+          )
+          if not activity_candidates:
+              print('WARNING: MainActivity.kt not found — status bar hiding NOT patched')
+          else:
+              activity = activity_candidates[0]
+              with open(activity) as f:
                   content = f.read()
-              # Hide status bar (fullscreen)
-              content = content.replace(
-                  '</style>',
-                  '    <item name="android:windowFullscreen">true</item>\n    </style>',
-                  1
-              )
-              with open(styles, 'w') as f:
+
+              new_imports = [
+                  'androidx.core.view.WindowCompat',
+                  'androidx.core.view.WindowInsetsCompat',
+                  'androidx.core.view.WindowInsetsControllerCompat',
+              ]
+              import_lines = list(re.finditer(r'^import .+$', content, re.MULTILINE))
+              if import_lines:
+                  insert_at = import_lines[-1].end()
+                  addition = ''.join(
+                      f'\nimport {imp}' for imp in new_imports if imp not in content
+                  )
+                  content = content[:insert_at] + addition + content[insert_at:]
+
+              if 'hideSystemBars' not in content:
+                  content = content.replace(
+                      'super.onCreate(savedInstanceState)',
+                      'super.onCreate(savedInstanceState)\n    hideSystemBars()',
+                      1
+                  )
+                  content = re.sub(
+                      r'\n}\s*$',
+                      '\n\n'
+                      '  override fun onWindowFocusChanged(hasFocus: Boolean) {\n'
+                      '    super.onWindowFocusChanged(hasFocus)\n'
+                      '    if (hasFocus) {\n'
+                      '      hideSystemBars()\n'
+                      '    }\n'
+                      '  }\n'
+                      '\n'
+                      '  private fun hideSystemBars() {\n'
+                      '    WindowCompat.setDecorFitsSystemWindows(window, false)\n'
+                      '    val controller = WindowInsetsControllerCompat(window, window.decorView)\n'
+                      '    controller.hide(WindowInsetsCompat.Type.systemBars())\n'
+                      '    controller.systemBarsBehavior =\n'
+                      '      WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE\n'
+                      '  }\n'
+                      '}\n',
+                      content,
+                      count=1
+                  )
+              with open(activity, 'w') as f:
                   f.write(content)
-              print(f'Patched {styles}')
+              print(f'Patched {activity} (hide system bars at runtime)')
           PYEOF
 
       - name: build Android app

package/template-nqtr-react-vite-muijoy-tauri/package.json

@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@base-ui/react": "^1.6.0",
-    "@drincs/nqtr": "^1.0.2",
-    "@drincs/pixi-vn": "^1.8.21",
+    "@drincs/nqtr": "^1.0.3",
+    "@drincs/pixi-vn": "^1.8.25",
     "@tailwindcss/vite": "^4.3.0",
     "@tanstack/hotkeys": "^0.8.0",
     "@tanstack/react-hotkeys": "^0.10.0",

package/template-nqtr-react-vite-muijoy-tauri/src/assets/index.ts

@@ -14,16 +14,7 @@ export const manifest: AssetsManifest = {
         ...generatedManifestJson.bundles,
         {
             name: AUDIO_BUNDLE_NAME,
-            assets: [
-                {
-                    alias: "bgm_cheerful",
-                    src: "https://raw.githubusercontent.com/DRincs-Productions/pixi-vn-bucket/refs/heads/main/audio/bgm_cheerful.wav",
-                },
-                {
-                    alias: "sfx_whoosh",
-                    src: "https://raw.githubusercontent.com/DRincs-Productions/pixi-vn-bucket/refs/heads/main/audio/sfx_whoosh.wav",
-                },
-            ],
+            assets: [],
         },
         // screens
         {
@@ -31,7 +22,7 @@ export const manifest: AssetsManifest = {
             assets: [
                 {
                     alias: "background_main_menu",
-                    src: "https://raw.githubusercontent.com/DRincs-Productions/pixi-vn-bucket/refs/heads/main/main-menu.png",
+                    src: "https://pub-72ff059a2c6642fb9eab15df80fb3b45.r2.dev/main-menu.png",
                 },
             ],
         },

package/template-nqtr-react-vite-muijoy-tauri/src/assets/manifest.gen.json

@@ -1,8 +1,3 @@
 {
-  "bundles": [
-    {
-      "name": "default",
-      "assets": []
-    }
-  ]
-}
+  "bundles": []
+}

package/template-nqtr-react-vite-muijoy-tauri/src/components/menus/settings/index.tsx

@@ -1,6 +1,7 @@
 import { About } from "@/components/menus/settings/about";
 import { DialoguesControls } from "@/components/menus/settings/dialogues-controls";
 import { ControlsListSettingsPage } from "@/components/menus/settings/menus/controls";
+import { DiagnosticsSettingsPage } from "@/components/menus/settings/menus/diagnostics";
 import { HistoryListSettingsPage } from "@/components/menus/settings/menus/history";
 import { SaveLoadSettingsPage } from "@/components/menus/settings/menus/save-load";
 import { QuickMenus } from "@/components/menus/settings/quick-menus";
@@ -23,7 +24,7 @@ import { ArrowLeftIcon } from "lucide-react";
 import { Fragment } from "react";
 import { useTranslation } from "react-i18next";
 
-type SettingsTabPath = "menus/controls" | "menus/history" | "menus/save-load";
+type SettingsTabPath = "menus/controls" | "menus/history" | "menus/save-load" | "menus/diagnostics";
 
 type BreadcrumbEntry = {
     id: string;
@@ -38,7 +39,8 @@ export function Settings() {
     const normalizedTab: SettingsTabPath | undefined =
         currentTab === "menus/controls" ||
         currentTab === "menus/history" ||
-        currentTab === "menus/save-load"
+        currentTab === "menus/save-load" ||
+        currentTab === "menus/diagnostics"
             ? (currentTab as SettingsTabPath)
             : undefined;
 
@@ -55,7 +57,8 @@ export function Settings() {
         if (
             normalizedTab === "menus/controls" ||
             normalizedTab === "menus/history" ||
-            normalizedTab === "menus/save-load"
+            normalizedTab === "menus/save-load" ||
+            normalizedTab === "menus/diagnostics"
         ) {
             trail.push({ id: "menus", label: t("menus") });
             trail.push({
@@ -64,13 +67,17 @@ export function Settings() {
                         ? "menus-controls"
                         : normalizedTab === "menus/history"
                           ? "menus-history"
-                          : "menus-save-load",
+                          : normalizedTab === "menus/save-load"
+                            ? "menus-save-load"
+                            : "menus-diagnostics",
                 label:
                     normalizedTab === "menus/controls"
                         ? t("hotkeys_menu")
                         : normalizedTab === "menus/history"
                           ? t("history")
-                          : `${t("save")}/${t("load")}`,
+                          : normalizedTab === "menus/save-load"
+                            ? `${t("save")}/${t("load")}`
+                            : t("diagnostics"),
             });
         }
         return trail;
@@ -112,7 +119,8 @@ export function Settings() {
     if (
         normalizedTab === "menus/controls" ||
         normalizedTab === "menus/history" ||
-        normalizedTab === "menus/save-load"
+        normalizedTab === "menus/save-load" ||
+        normalizedTab === "menus/diagnostics"
     ) {
         return (
             <>
@@ -130,6 +138,7 @@ export function Settings() {
                 {normalizedTab === "menus/controls" ? <ControlsListSettingsPage /> : null}
                 {normalizedTab === "menus/history" ? <HistoryListSettingsPage /> : null}
                 {normalizedTab === "menus/save-load" ? <SaveLoadSettingsPage /> : null}
+                {normalizedTab === "menus/diagnostics" ? <DiagnosticsSettingsPage /> : null}
             </>
         );
     }