Merge branch 'refactor' into develop

src-tauri/tauri.conf.json

@@ -1,89 +1,83 @@
 {
-  "build": {
+    "build": {
-    "beforeDevCommand": "",
+        "beforeDevCommand": "",
-    "beforeBuildCommand": "",
+        "beforeBuildCommand": "",
-    "devPath": "http://localhost:1420",
+        "devPath": "http://localhost:1420",
-    "distDir": "../dist"
+        "distDir": "../dist"
-  },
-  "package": {
-    "productName": "VRCT",
-    "version": "3.0.0"
-  },
-  "tauri": {
-    "allowlist": {
-      "all": false,
-      "window": {
-        "all": false,
-        "setAlwaysOnTop": true,
-        "setFocus": true,
-        "setDecorations": true,
-        "close": true,
-        "hide": true,
-        "setPosition": true,
-        "setSize": true,
-        "maximize": true,
-        "minimize": true,
-        "unmaximize": true,
-        "unminimize": true,
-        "startDragging": true
-      },
-      "globalShortcut": {
-        "all": true
-      },
-    "shell": {
-        "all": false,
-        "open": true,
-        "sidecar": true,
-        "scope": [
-            {
-                "name": "bin/VRCT-sidecar", "sidecar": true,"args": true
-            }
-        ]
-    }
-},
-"windows": [
-    {
-        "title": "VRCT",
-        "center": true,
-        "width": 450,
-        "height": 220,
-        "minWidth": 400,
-        "minHeight": 200,
-        "transparent": true,
-        "decorations": false
-    }
-    ],
-    "security": {
-      "csp": null
     },
-    "bundle": {
+    "package": {
-      "active": true,
+        "productName": "VRCT",
-      "targets": "nsis",
+        "version": "3.0.0"
-      "identifier": "com.vrct.dev",
+    },
-      "publisher": "m's software",
+    "tauri": {
-      "copyright": "Copyright m's software",
+        "allowlist": {
-      "shortDescription": "VRCT",
+            "all": false,
-      "icon": [
+            "window": {
-        "icons/32x32.png",
+                "all": false,
-        "icons/128x128.png",
+                "setAlwaysOnTop": true,
-        "icons/128x128@2x.png",
+                "setFocus": true,
-        "icons/icon.icns",
+                "setDecorations": true,
-        "icons/icon.ico"
+                "close": true,
-      ],
+                "hide": true,
-      "externalBin": [
+                "setPosition": true,
-        "bin/VRCT-sidecar"
+                "setSize": true,
-      ],
+                "maximize": true,
-      "resources":{
+                "minimize": true,
-        "bin/_internal": "_internal"
+                "unmaximize": true,
-      },
+                "unminimize": true,
-      "windows": {
+                "startDragging": true
-        "nsis": {
+            },
-          "template": "nsis/template.nsi",
+            "globalShortcut": {
-          "license": "../LICENSE",
+                "all": true
-          "installMode": "currentUser",
+            },
-          "displayLanguageSelector": true
+            "shell": {
+                "all": false,
+                "open": true,
+                "sidecar": true,
+                "scope": [
+                    { "name": "bin/VRCT-sidecar", "sidecar": true, "args": true }
+                ]
+            }
+        },
+        "windows": [{
+            "title": "VRCT",
+            "center": true,
+            "width": 450,
+            "height": 220,
+            "minWidth": 400,
+            "minHeight": 200,
+            "transparent": true,
+            "decorations": false
+        }],
+        "security": { "csp": null },
+        "bundle": {
+            "active": true,
+            "targets": "nsis",
+            "identifier": "com.vrct.dev",
+            "publisher": "m's software",
+            "copyright": "Copyright m's software",
+            "shortDescription": "VRCT",
+            "icon": [
+                "icons/32x32.png",
+                "icons/128x128.png",
+                "icons/128x128@2x.png",
+                "icons/icon.icns",
+                "icons/icon.ico"
+            ],
+            "externalBin": [
+                "bin/VRCT-sidecar"
+            ],
+            "resources": {
+                "bin/_internal": "_internal"
+            },
+            "windows": {
+                "nsis": {
+                    "template": "nsis/template.nsi",
+                    "license": "../LICENSE",
+                    "installMode": "currentUser",
+                    "displayLanguageSelector": true
+                }
+            }
         }
-      }
     }
-  }
 }

src-ui/store.js

@@ -126,37 +126,38 @@ export const { atomInstance: Atom_NotificationStatus, useHook: useStore_Notifica
 }, "NotificationStatus");
 
 // Main Page
-// Functions
+// Common
+export const { atomInstance: Atom_IsMainPageCompactMode, useHook: useStore_IsMainPageCompactMode } = createAtomWithHook(false, "IsMainPageCompactMode");
+
+// Sidebar Section
 export const { atomInstance: Atom_TranslationStatus, useHook: useStore_TranslationStatus } = createAtomWithHook(false, "TranslationStatus", {is_state_ok: true});
 export const { atomInstance: Atom_TranscriptionSendStatus, useHook: useStore_TranscriptionSendStatus } = createAtomWithHook(false, "TranscriptionSendStatus", {is_state_ok: true});
 export const { atomInstance: Atom_TranscriptionReceiveStatus, useHook: useStore_TranscriptionReceiveStatus } = createAtomWithHook(false, "TranscriptionReceiveStatus", {is_state_ok: true});
 export const { atomInstance: Atom_ForegroundStatus, useHook: useStore_ForegroundStatus } = createAtomWithHook(false, "ForegroundStatus", {is_state_ok: true});
 
-export const { atomInstance: Atom_MessageLogs, useHook: useStore_MessageLogs } = createAtomWithHook([], "MessageLogs");
-// export const { atomInstance: Atom_MessageLogs, useHook: useStore_MessageLogs } = createAtomWithHook(generateTestData(20), "MessageLogs"); // For testing
-export const { atomInstance: Atom_MessageInputValue, useHook: useStore_MessageInputValue } = createAtomWithHook("", "MessageInputValue");
-export const { atomInstance: Atom_IsVisibleResendButton, useHook: useStore_IsVisibleResendButton } = createAtomWithHook(false, "IsVisibleResendButton", {is_state_ok: true});
-export const { atomInstance: Atom_IsAppliedInitMessageBoxHeight, useHook: useStore_IsAppliedInitMessageBoxHeight } = createAtomWithHook(false, "IsAppliedInitMessageBoxHeight");
-
-export const { atomInstance: Atom_SelectableLanguageList, useHook: useStore_SelectableLanguageList } = createAtomWithHook([], "SelectableLanguageList");
-
 export const { atomInstance: Atom_SelectedPresetTabNumber, useHook: useStore_SelectedPresetTabNumber } = createAtomWithHook("1", "SelectedPresetTabNumber");
 export const { atomInstance: Atom_EnableMultiTranslation, useHook: useStore_EnableMultiTranslation } = createAtomWithHook(false, "EnableMultiTranslation");
 export const { atomInstance: Atom_SelectedYourLanguages, useHook: useStore_SelectedYourLanguages } = createAtomWithHook({}, "SelectedYourLanguages");
 export const { atomInstance: Atom_SelectedTargetLanguages, useHook: useStore_SelectedTargetLanguages } = createAtomWithHook({}, "SelectedTargetLanguages");
 
-
 export const { atomInstance: Atom_TranslationEngines, useHook: useStore_TranslationEngines } = createAtomWithHook(translator_status, "TranslationEngines");
 export const { atomInstance: Atom_SelectedTranslationEngines, useHook: useStore_SelectedTranslationEngines } = createAtomWithHook({1:"", 2:"", 3:""}, "SelectedTranslationEngines");
+export const { atomInstance: Atom_IsOpenedTranslatorSelector, useHook: useStore_IsOpenedTranslatorSelector } = createAtomWithHook(false, "IsOpenedTranslatorSelector");
 
-
+// Language Selector
-// Designs
-export const { atomInstance: Atom_IsMainPageCompactMode, useHook: useStore_IsMainPageCompactMode } = createAtomWithHook(false, "IsMainPageCompactMode");
-export const { atomInstance: Atom_MessageInputBoxRatio, useHook: useStore_MessageInputBoxRatio } = createAtomWithHook(20, "MessageInputBoxRatio");
 export const { atomInstance: Atom_IsOpenedLanguageSelector, useHook: useStore_IsOpenedLanguageSelector } = createAtomWithHook(
     { your_language: false, target_language: false, target_key: "1" },
     "IsOpenedLanguageSelector"
 );
+export const { atomInstance: Atom_SelectableLanguageList, useHook: useStore_SelectableLanguageList } = createAtomWithHook([], "SelectableLanguageList");
+
+// Message Container
+export const { atomInstance: Atom_MessageLogs, useHook: useStore_MessageLogs } = createAtomWithHook([], "MessageLogs");
+// export const { atomInstance: Atom_MessageLogs, useHook: useStore_MessageLogs } = createAtomWithHook(generateTestData(20), "MessageLogs"); // For testing
+export const { atomInstance: Atom_MessageInputBoxRatio, useHook: useStore_MessageInputBoxRatio } = createAtomWithHook(20, "MessageInputBoxRatio");
+export const { atomInstance: Atom_MessageInputValue, useHook: useStore_MessageInputValue } = createAtomWithHook("", "MessageInputValue");
+export const { atomInstance: Atom_IsVisibleResendButton, useHook: useStore_IsVisibleResendButton } = createAtomWithHook(false, "IsVisibleResendButton", {is_state_ok: true});
+
 
 
 // Config Page
@@ -164,8 +165,6 @@ export const { atomInstance: Atom_IsOpenedLanguageSelector, useHook: useStore_Is
 export const { atomInstance: Atom_SoftwareVersion, useHook: useStore_SoftwareVersion } = createAtomWithHook("-", "SoftwareVersion");
 export const { atomInstance: Atom_SelectedConfigTabId, useHook: useStore_SelectedConfigTabId } = createAtomWithHook("device", "SelectedConfigTabId");
 export const { atomInstance: Atom_SettingBoxScrollPosition, useHook: useStore_SettingBoxScrollPosition } = createAtomWithHook(0, "SettingBoxScrollPosition");
-
-// Designs
 export const { atomInstance: Atom_IsOpenedDropdownMenu, useHook: useStore_IsOpenedDropdownMenu } = createAtomWithHook("", "IsOpenedDropdownMenu");
 
 // Device
@@ -280,9 +279,9 @@ export const { atomInstance: Atom_OscPort, useHook: useStore_OscPort } = createA
 
 
 
-export const { atomInstance: Atom_IsOpenedTranslatorSelector, useHook: useStore_IsOpenedTranslatorSelector } = createAtomWithHook(false, "IsOpenedTranslatorSelector");
+// Supporters
-
 export const { atomInstance: Atom_SupportersData, useHook: useStore_SupportersData } = createAtomWithHook(null, "SupportersData", {is_state_ok: true});
 
+// About VRCT
 export const { atomInstance: Atom_VrctPosterIndex, useHook: useStore_VrctPosterIndex } = createAtomWithHook(0, "VrctPosterIndex");
 export const { atomInstance: Atom_PosterShowcaseWorldPageIndex, useHook: useStore_PosterShowcaseWorldPageIndex } = createAtomWithHook(0, "PosterShowcaseWorldPageIndex");