diff --git a/src-ui/app/App.jsx b/src-ui/app/App.jsx
index 64e56bd7..38bb14b2 100644
--- a/src-ui/app/App.jsx
+++ b/src-ui/app/App.jsx
@@ -25,30 +25,34 @@ export const App = () => {
};
-import { useSoftwareVersion } from "@logics_configs/useSoftwareVersion";
-import { useEnableAutoMicSelect } from "@logics_configs/useEnableAutoMicSelect";
-import { useEnableAutoSpeakerSelect } from "@logics_configs/useEnableAutoSpeakerSelect";
-import { useSelectedMicHost } from "@logics_configs/useSelectedMicHost";
-import { useSelectedMicDevice } from "@logics_configs/useSelectedMicDevice";
-import { useSelectedSpeakerDevice } from "@logics_configs/useSelectedSpeakerDevice";
-import { useMicThreshold } from "@logics_configs/useMicThreshold";
-import { useSpeakerThreshold } from "@logics_configs/useSpeakerThreshold";
-import { useEnableAutoClearMessageBox } from "@logics_configs/useEnableAutoClearMessageBox";
-import { useSendMessageButtonType } from "@logics_configs/useSendMessageButtonType";
-import { useUiLanguage } from "@logics_configs/useUiLanguage";
-import { useUiScaling } from "@logics_configs/useUiScaling";
-import { useMessageLogUiScaling } from "@logics_configs/useMessageLogUiScaling";
-import { useSelectedFontFamily } from "@logics_configs/useSelectedFontFamily";
-import { useTransparency } from "@logics_configs/useTransparency";
+import {
+ useSoftwareVersion,
+ useEnableAutoMicSelect,
+ useEnableAutoSpeakerSelect,
+ useSelectedMicHost,
+ useSelectedMicDevice,
+ useSelectedSpeakerDevice,
+ useMicThreshold,
+ useSpeakerThreshold,
+ useEnableAutoClearMessageBox,
+ useSendMessageButtonType,
+ useUiLanguage,
+ useUiScaling,
+ useMessageLogUiScaling,
+ useSelectedFontFamily,
+ useTransparency,
+ useMicHostList,
+ useMicDeviceList,
+ useSpeakerDeviceList,
+} from "@logics_configs";
-import { useIsMainPageCompactMode } from "@logics_main/useIsMainPageCompactMode";
-import { useLanguageSettings } from "@logics_main/useLanguageSettings";
-import { useSelectableLanguageList } from "@logics_main/useSelectableLanguageList";
-import { useMessageInputBoxRatio } from "@logics_main/useMessageInputBoxRatio";
-
-import { useMicHostList } from "@logics_configs/useMicHostList";
-import { useMicDeviceList } from "@logics_configs/useMicDeviceList";
-import { useSpeakerDeviceList } from "@logics_configs/useSpeakerDeviceList";
+import {
+ useMainFunction,
+ useIsMainPageCompactMode,
+ useLanguageSettings,
+ useSelectableLanguageList,
+ useMessageInputBoxRatio,
+} from "@logics_main";
const StartPythonFacadeComponent = () => {
const { asyncStartPython } = useStartPython();
@@ -90,7 +94,7 @@ const StartPythonFacadeComponent = () => {
useEffect(() => {
if (!hasRunRef.current) {
- asyncStartPython().then((result) => {
+ asyncStartPython().then(() => {
startFeedingToWatchDog();
getUiLanguage();
@@ -152,9 +156,11 @@ const UiLanguageController = () => {
};
import { useStore_MainFunctionsStateMemory } from "@store";
-import { useVolume } from "@logics_common/useVolume";
-import { useIsOpenedConfigPage } from "@logics_common/useIsOpenedConfigPage";
-import { useMainFunction } from "@logics_main/useMainFunction";
+import {
+ useVolume,
+ useIsOpenedConfigPage,
+} from "@logics_common";
+
const ConfigPageCloseTrigger = () => {
const { currentIsOpenedConfigPage } = useIsOpenedConfigPage();
const { currentMainFunctionsStateMemory, updateMainFunctionsStateMemory} = useStore_MainFunctionsStateMemory();
diff --git a/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx b/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx
index 69fa94f3..fb10feee 100644
--- a/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx
+++ b/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx
@@ -2,11 +2,17 @@ import clsx from "clsx";
import { useTranslation } from "react-i18next";
import styles from "./Appearance.module.scss";
import { useSettingBox } from "../components/useSettingBox";
-import { useStore_SelectedMicDevice, useStore_MicDeviceList } from "@store";
+
+import {
+ useUiLanguage,
+ useUiScaling,
+ useMessageLogUiScaling,
+ useSelectedFontFamily,
+ useTransparency,
+} from "@logics_configs";
+
export const Appearance = () => {
const { t } = useTranslation();
- // const { currentSelectedMicDevice, updateSelectedMicDevice } = useStore_SelectedMicDevice();
- // const { currentMicDeviceList } = useStore_MicDeviceList();
const {
DropdownMenuContainer,
// SliderContainer,
@@ -53,7 +59,6 @@ export const Appearance = () => {
};
import { LabelComponent } from "../components/label_component/LabelComponent";
-import { useUiLanguage } from "@logics_configs/useUiLanguage";
const UiLanguageContainer = () => {
const { t } = useTranslation();
@@ -100,7 +105,6 @@ const UiLanguageContainer = () => {
};
-import { useUiScaling } from "@logics_configs/useUiScaling";
import { SliderContainer } from "../components/useSettingBox";
import { useEffect, useState } from "react";
@@ -145,7 +149,6 @@ const UiScalingContainer = () => {
);
};
-import { useMessageLogUiScaling } from "@logics_configs/useMessageLogUiScaling";
const MessageLogUiScalingContainer = () => {
const { t } = useTranslation();
@@ -189,7 +192,6 @@ const MessageLogUiScalingContainer = () => {
};
import { useStore_SelectableFontFamilyList } from "@store";
import { DropdownMenuContainer } from "../components/useSettingBox";
-import { useSelectedFontFamily } from "@logics_configs/useSelectedFontFamily";
const FontFamilyContainer = () => {
const { t } = useTranslation();
const { currentSelectedFontFamily, setSelectedFontFamily } = useSelectedFontFamily();
@@ -212,7 +214,6 @@ const FontFamilyContainer = () => {
);
};
-import { useTransparency } from "@logics_configs/useTransparency";
const TransparencyContainer = () => {
const { t } = useTranslation();
diff --git a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/ThresholdComponent.jsx b/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/ThresholdComponent.jsx
index 7178f9ee..018f3845 100644
--- a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/ThresholdComponent.jsx
+++ b/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/ThresholdComponent.jsx
@@ -3,7 +3,14 @@ import styles from "./ThresholdComponent.module.scss";
import { SliderAndMeter } from "./slider_and_meter/SliderAndMeter";
import { ThresholdEntry } from "./threshold_entry/ThresholdEntry";
import { VolumeCheckButton } from "./volume_check_button/VolumeCheckButton";
-import { useVolume } from "@logics_common/useVolume";
+import { useVolume } from "@logics_common";
+import MicSvg from "@images/mic.svg?react";
+import HeadphonesSvg from "@images/headphones.svg?react";
+import {
+ useMicThreshold,
+ useSpeakerThreshold,
+} from "@logics_configs";
+
export const ThresholdComponent = (props) => {
return (
@@ -14,8 +21,7 @@ export const ThresholdComponent = (props) => {
);
};
-import MicSvg from "@images/mic.svg?react";
-import { useMicThreshold } from "@logics_configs/useMicThreshold";
+
const MicComponent = (props) => {
const {
currentMicThreshold,
@@ -72,8 +78,7 @@ const MicComponent = (props) => {
>
);
};
-import HeadphonesSvg from "@images/headphones.svg?react";
-import { useSpeakerThreshold } from "@logics_configs/useSpeakerThreshold";
+
const SpeakerComponent = (props) => {
const {
currentSpeakerThreshold,
diff --git a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/slider_and_meter/SliderAndMeter.jsx b/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/slider_and_meter/SliderAndMeter.jsx
index 6fbe0c1b..8c67637c 100644
--- a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/slider_and_meter/SliderAndMeter.jsx
+++ b/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/slider_and_meter/SliderAndMeter.jsx
@@ -3,6 +3,10 @@ import {
useStore_MicVolume,
useStore_SpeakerVolume,
} from "@store";
+import {
+ useMicThreshold,
+ useSpeakerThreshold,
+} from "@logics_configs";
export const SliderAndMeter = (props) => {
return (
@@ -17,7 +21,6 @@ export const SliderAndMeter = (props) => {
);
};
-import { useMicThreshold } from "@logics_configs/useMicThreshold";
const ThresholdVolumeMeter_Mic = (props) => {
const { currentMicVolume } = useStore_MicVolume();
@@ -44,7 +47,6 @@ const ThresholdVolumeMeter_Mic = (props) => {
);
};
-import { useSpeakerThreshold } from "@logics_configs/useSpeakerThreshold";
const ThresholdVolumeMeter_Speaker = (props) => {
const { currentSpeakerVolume } = useStore_SpeakerVolume();
diff --git a/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx b/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx
index e1cd7259..f26a34c8 100644
--- a/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx
+++ b/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx
@@ -13,14 +13,18 @@ export const Device = () => {
);
};
-import { useEnableAutoMicSelect } from "@logics_configs/useEnableAutoMicSelect";
-
-import { useMicHostList } from "@logics_configs/useMicHostList";
-import { useSelectedMicHost } from "@logics_configs/useSelectedMicHost";
-
-import { useMicDeviceList } from "@logics_configs/useMicDeviceList";
-import { useSelectedMicDevice } from "@logics_configs/useSelectedMicDevice";
-import { useMicThreshold } from "@logics_configs/useMicThreshold";
+import {
+ useEnableAutoMicSelect,
+ useMicHostList,
+ useSelectedMicHost,
+ useMicDeviceList,
+ useSelectedMicDevice,
+ useMicThreshold,
+ useEnableAutoSpeakerSelect,
+ useSpeakerDeviceList,
+ useSelectedSpeakerDevice,
+ useSpeakerThreshold,
+} from "@logics_configs";
import { LabelComponent } from "../components/label_component/LabelComponent";
import { DropdownMenu } from "../components/dropdown_menu/DropdownMenu";
@@ -126,11 +130,6 @@ const Mic_Container = () => {
);
};
-import { useEnableAutoSpeakerSelect } from "@logics_configs/useEnableAutoSpeakerSelect";
-
-import { useSpeakerDeviceList } from "@logics_configs/useSpeakerDeviceList";
-import { useSelectedSpeakerDevice } from "@logics_configs/useSelectedSpeakerDevice";
-import { useSpeakerThreshold } from "@logics_configs/useSpeakerThreshold";
const Speaker_Container = () => {
const { t } = useTranslation();
diff --git a/src-ui/app/config_page/topbar/Topbar.jsx b/src-ui/app/config_page/topbar/Topbar.jsx
index cd1284d8..421cb373 100644
--- a/src-ui/app/config_page/topbar/Topbar.jsx
+++ b/src-ui/app/config_page/topbar/Topbar.jsx
@@ -1,7 +1,7 @@
import clsx from "clsx";
import styles from "./Topbar.module.scss";
-import { useIsOpenedConfigPage } from "@logics_common/useIsOpenedConfigPage";
+import { useIsOpenedConfigPage } from "@logics_common";
import ArrowLeftSvg from "@images/arrow_left.svg?react";
import { TitleBox } from "./title_box/TitleBox";
diff --git a/src-ui/app/main_page/MainPage.jsx b/src-ui/app/main_page/MainPage.jsx
index 58850e55..a83ef09a 100644
--- a/src-ui/app/main_page/MainPage.jsx
+++ b/src-ui/app/main_page/MainPage.jsx
@@ -2,7 +2,7 @@ import clsx from "clsx";
import styles from "./MainPage.module.scss";
import { SidebarSection } from "./sidebar_section/SidebarSection";
import { MainSection } from "./main_section/MainSection";
-import { useIsOpenedConfigPage } from "@logics_common/useIsOpenedConfigPage";
+import { useIsOpenedConfigPage } from "@logics_common";
export const MainPage = () => {
const { currentIsOpenedConfigPage } = useIsOpenedConfigPage();
diff --git a/src-ui/app/main_page/main_section/MainSection.jsx b/src-ui/app/main_page/main_section/MainSection.jsx
index abb83218..a61df63d 100644
--- a/src-ui/app/main_page/main_section/MainSection.jsx
+++ b/src-ui/app/main_page/main_section/MainSection.jsx
@@ -5,6 +5,7 @@ import { MessageContainer } from "./message_container/MessageContainer";
import { LanguageSelector } from "./language_selector/LanguageSelector";
import { useStore_IsOpenedLanguageSelector } from "@store";
+import { useLanguageSettings } from "@logics_main";
export const MainSection = () => {
@@ -18,7 +19,6 @@ export const MainSection = () => {
};
-import { useLanguageSettings } from "@logics_main/useLanguageSettings";
const HandleLanguageSelector = () => {
const { currentIsOpenedLanguageSelector, updateIsOpenedLanguageSelector } = useStore_IsOpenedLanguageSelector();
const {
diff --git a/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx b/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx
index 3f956590..177b92a7 100644
--- a/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx
+++ b/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx
@@ -1,6 +1,6 @@
import { useTranslation } from "react-i18next";
-import { useSelectableLanguageList } from "@logics_main/useSelectableLanguageList";
+import { useSelectableLanguageList } from "@logics_main";
import styles from "./LanguageSelector.module.scss";
import { LanguageSelectorTopBar } from "./language_selector_top_bar/LanguageSelectorTopBar";
diff --git a/src-ui/app/main_page/main_section/message_container/MessageContainer.jsx b/src-ui/app/main_page/main_section/message_container/MessageContainer.jsx
index 45693788..944c3fcc 100644
--- a/src-ui/app/main_page/main_section/message_container/MessageContainer.jsx
+++ b/src-ui/app/main_page/main_section/message_container/MessageContainer.jsx
@@ -4,7 +4,7 @@ import styles from "./MessageContainer.module.scss";
import { appWindow } from "@tauri-apps/api/window"; // Tauriのwindow APIをインポート
import { LogBox } from "./log_box/LogBox";
import { MessageInputBox } from "./message_input_box/MessageInputBox";
-import { useMessageInputBoxRatio } from "@logics_main/useMessageInputBoxRatio";
+import { useMessageInputBoxRatio } from "@logics_main";
export const MessageContainer = () => {
const { currentMessageInputBoxRatio, setMessageInputBoxRatio } = useMessageInputBoxRatio();
diff --git a/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx b/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx
index 5df72203..ac886269 100644
--- a/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx
+++ b/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx
@@ -3,7 +3,7 @@ import styles from "./LogBox.module.scss";
import { store } from "@store";
import { MessageContainer } from "./message_container/MessageContainer";
import { scrollToBottom } from "@utils/scrollToBottom";
-import { useMessage } from "@logics_common/useMessage";
+import { useMessage } from "@logics_common";
export const LogBox = () => {
const { currentMessageLogs } = useMessage();
@@ -49,7 +49,7 @@ export const LogBox = () => {
);
};
-import { useMessageLogUiScaling } from "@logics_configs/useMessageLogUiScaling";
+import { useMessageLogUiScaling } from "@logics_configs";
const MessageLogUiSizeController = () => {
const { currentMessageLogUiScaling } = useMessageLogUiScaling();
const font_size = currentMessageLogUiScaling.data / 100;
diff --git a/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx b/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx
index 3419b803..9e008f0d 100644
--- a/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx
+++ b/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx
@@ -1,11 +1,13 @@
import { useState } from "react";
import styles from "./MessageInputBox.module.scss";
import SendMessageSvg from "@images/send_message.svg?react";
-import { useMessage } from "@logics_common/useMessage";
+import { useMessage } from "@logics_common";
import { store } from "@store";
import { scrollToBottom } from "@utils/scrollToBottom";
-import { useSendMessageButtonType } from "@logics_configs/useSendMessageButtonType";
-import { useEnableAutoClearMessageBox } from "@logics_configs/useEnableAutoClearMessageBox";
+import {
+ useSendMessageButtonType,
+ useEnableAutoClearMessageBox,
+} from "@logics_configs";
export const MessageInputBox = () => {
const [inputValue, setInputValue] = useState("");
diff --git a/src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx b/src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx
index 83dfdd12..4d12d94c 100644
--- a/src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx
+++ b/src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx
@@ -1,7 +1,7 @@
import clsx from "clsx";
import styles from "./SidebarCompactModeButton.module.scss";
-import { useIsMainPageCompactMode } from "@logics_main/useIsMainPageCompactMode";
+import { useIsMainPageCompactMode } from "@logics_main";
import ArrowLeftSvg from "@images/arrow_left.svg?react";
export const SidebarCompactModeButton = () => {
diff --git a/src-ui/app/main_page/sidebar_section/SidebarSection.jsx b/src-ui/app/main_page/sidebar_section/SidebarSection.jsx
index 16119c06..65f154ce 100644
--- a/src-ui/app/main_page/sidebar_section/SidebarSection.jsx
+++ b/src-ui/app/main_page/sidebar_section/SidebarSection.jsx
@@ -2,7 +2,7 @@ import clsx from "clsx";
import styles from "./SidebarSection.module.scss";
import { useStore_IsOpenedLanguageSelector } from "@store";
-import { useIsMainPageCompactMode } from "@logics_main/useIsMainPageCompactMode";
+import { useIsMainPageCompactMode } from "@logics_main";
import { Logo } from "./logo/Logo";
import { MainFunctionSwitch } from "./main_function_switch/MainFunctionSwitch";
diff --git a/src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx b/src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx
index 3a1bd4b0..03715d9c 100644
--- a/src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx
+++ b/src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx
@@ -23,8 +23,10 @@ export const LanguageSettings = () => {
import MicSvg from "@images/mic.svg?react";
import HeadphonesSvg from "@images/headphones.svg?react";
import { useStore_IsOpenedLanguageSelector } from "@store";
-import { useMainFunction } from "@logics_main/useMainFunction";
-import { useLanguageSettings } from "@logics_main/useLanguageSettings";
+import {
+ useMainFunction,
+ useLanguageSettings,
+} from "@logics_main";
// 言語セレクターをトグルする処理を関数化
const toggleSelector = (selector, currentStatus, updateSelector) => {
diff --git a/src-ui/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.jsx b/src-ui/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.jsx
index 3a4d374d..dd479a65 100644
--- a/src-ui/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.jsx
+++ b/src-ui/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.jsx
@@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
import styles from "./LanguageSwapButton.module.scss";
import NarrowArrowDownSvg from "@images/narrow_arrow_down.svg?react";
-import { useLanguageSettings } from "@logics_main/useLanguageSettings";
+import { useLanguageSettings } from "@logics_main";
export const LanguageSwapButton = () => {
const [isHovered, setIsHovered] = useState(false);
diff --git a/src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx b/src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx
index 2d3b6b06..70fca67d 100644
--- a/src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx
+++ b/src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx
@@ -12,7 +12,7 @@ export const PresetTabSelector = () => {
import clsx from "clsx";
-import { useLanguageSettings } from "@logics_main/useLanguageSettings";
+import { useLanguageSettings } from "@logics_main";
const Tab = (props) => {
const { currentSelectedPresetTabNumber, setSelectedPresetTabNumber } = useLanguageSettings();
diff --git a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx
index ff063cbf..a82b9f90 100644
--- a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx
+++ b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx
@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
import styles from "./TranslatorSelectorOpenButton.module.scss";
import { TranslatorSelector } from "./translator_selector/TranslatorSelector";
import { useStore_IsOpenedTranslatorSelector } from "@store";
-import { useLanguageSettings } from "@logics_main/useLanguageSettings";
+import { useLanguageSettings } from "@logics_main";
export const TranslatorSelectorOpenButton = () => {
const { t } = useTranslation();
diff --git a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx
index 5368f988..53f893fb 100644
--- a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx
+++ b/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx
@@ -1,8 +1,9 @@
+import clsx from "clsx";
import styles from "./TranslatorSelector.module.scss";
import { chunkArray } from "@utils/chunkArray";
import { useStore_IsOpenedTranslatorSelector } from "@store";
-import { useLanguageSettings } from "@logics_main/useLanguageSettings";
+import { useLanguageSettings } from "@logics_main";
export const TranslatorSelector = ({selected_translator_id, translation_engines}) => {
const columns = (translation_engines.data !== undefined) ? chunkArray(translation_engines.data, 2) : [];
@@ -28,7 +29,6 @@ export const TranslatorSelector = ({selected_translator_id, translation_engines}
);
};
-import clsx from "clsx";
const TranslatorBox = (props) => {
const { currentSelectedPresetTabNumber, currentSelectedTranslationEngines, setSelectedTranslationEngines} = useLanguageSettings();
const { updateIsOpenedTranslatorSelector} = useStore_IsOpenedTranslatorSelector();
diff --git a/src-ui/app/main_page/sidebar_section/logo/Logo.jsx b/src-ui/app/main_page/sidebar_section/logo/Logo.jsx
index 9518c007..0c8ecc2e 100644
--- a/src-ui/app/main_page/sidebar_section/logo/Logo.jsx
+++ b/src-ui/app/main_page/sidebar_section/logo/Logo.jsx
@@ -11,7 +11,7 @@ export const Logo = () => {
import vrct_logo from "@images/vrct_logo_for_dark_mode.png";
import chato_img from "@images/chato_white.png";
-import { useIsMainPageCompactMode } from "@logics_main/useIsMainPageCompactMode";
+import { useIsMainPageCompactMode } from "@logics_main";
export const LogoBox = () => {
const { currentIsMainPageCompactMode } = useIsMainPageCompactMode();
diff --git a/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx b/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx
index 45eae936..8ffde771 100644
--- a/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx
+++ b/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx
@@ -5,9 +5,10 @@ import TranslationSvg from "@images/translation.svg?react";
import MicSvg from "@images/mic.svg?react";
import HeadphonesSvg from "@images/headphones.svg?react";
import ForegroundSvg from "@images/foreground.svg?react";
-import { useIsMainPageCompactMode } from "@logics_main/useIsMainPageCompactMode";
-
-import { useMainFunction } from "@logics_main/useMainFunction";
+import {
+ useIsMainPageCompactMode,
+ useMainFunction,
+} from "@logics_main";
export const MainFunctionSwitch = () => {
const { t } = useTranslation();
diff --git a/src-ui/app/main_page/sidebar_section/open_settings/OpenSettings.jsx b/src-ui/app/main_page/sidebar_section/open_settings/OpenSettings.jsx
index 2379c56e..5d9225d8 100644
--- a/src-ui/app/main_page/sidebar_section/open_settings/OpenSettings.jsx
+++ b/src-ui/app/main_page/sidebar_section/open_settings/OpenSettings.jsx
@@ -1,5 +1,5 @@
import styles from "./OpenSettings.module.scss";
-import { useIsOpenedConfigPage } from "@logics_common/useIsOpenedConfigPage";
+import { useIsOpenedConfigPage } from "@logics_common";
import ConfigurationSvg from "@images/configuration.svg?react";
export const OpenSettings = () => {
diff --git a/src-ui/logics/common/index.js b/src-ui/logics/common/index.js
new file mode 100644
index 00000000..e8f3b975
--- /dev/null
+++ b/src-ui/logics/common/index.js
@@ -0,0 +1,3 @@
+export { useIsOpenedConfigPage } from "./useIsOpenedConfigPage";
+export { useMessage } from "./useMessage";
+export { useVolume } from "./useVolume";
\ No newline at end of file
diff --git a/src-ui/logics/common/useIsOpenedConfigPage.js b/src-ui/logics/common/useIsOpenedConfigPage.js
index 08e1e833..588dcf78 100644
--- a/src-ui/logics/common/useIsOpenedConfigPage.js
+++ b/src-ui/logics/common/useIsOpenedConfigPage.js
@@ -1,17 +1,10 @@
import { useStore_IsOpenedConfigPage } from "@store";
-import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useIsOpenedConfigPage = () => {
- const { asyncStdoutToPython } = useStdoutToPython();
const { currentIsOpenedConfigPage, updateIsOpenedConfigPage } = useStore_IsOpenedConfigPage();
const setIsOpenedConfigPage = (is_opened) => {
updateIsOpenedConfigPage(is_opened);
- // if (is_opened) {
- // asyncStdoutToPython("/set/enable/config_window");
- // } else {
- // asyncStdoutToPython("/set/disable/config_window");
- // }
};
return {
diff --git a/src-ui/logics/configs/useMessageLogUiScaling.js b/src-ui/logics/configs/appearance/useMessageLogUiScaling.js
similarity index 100%
rename from src-ui/logics/configs/useMessageLogUiScaling.js
rename to src-ui/logics/configs/appearance/useMessageLogUiScaling.js
diff --git a/src-ui/logics/configs/useSelectedFontFamily.js b/src-ui/logics/configs/appearance/useSelectedFontFamily.js
similarity index 100%
rename from src-ui/logics/configs/useSelectedFontFamily.js
rename to src-ui/logics/configs/appearance/useSelectedFontFamily.js
diff --git a/src-ui/logics/configs/useSendMessageButtonType.js b/src-ui/logics/configs/appearance/useSendMessageButtonType.js
similarity index 100%
rename from src-ui/logics/configs/useSendMessageButtonType.js
rename to src-ui/logics/configs/appearance/useSendMessageButtonType.js
diff --git a/src-ui/logics/configs/useTransparency.js b/src-ui/logics/configs/appearance/useTransparency.js
similarity index 100%
rename from src-ui/logics/configs/useTransparency.js
rename to src-ui/logics/configs/appearance/useTransparency.js
diff --git a/src-ui/logics/configs/useUiLanguage.js b/src-ui/logics/configs/appearance/useUiLanguage.js
similarity index 100%
rename from src-ui/logics/configs/useUiLanguage.js
rename to src-ui/logics/configs/appearance/useUiLanguage.js
diff --git a/src-ui/logics/configs/useUiScaling.js b/src-ui/logics/configs/appearance/useUiScaling.js
similarity index 100%
rename from src-ui/logics/configs/useUiScaling.js
rename to src-ui/logics/configs/appearance/useUiScaling.js
diff --git a/src-ui/logics/configs/useEnableAutoMicSelect.js b/src-ui/logics/configs/device/useEnableAutoMicSelect.js
similarity index 100%
rename from src-ui/logics/configs/useEnableAutoMicSelect.js
rename to src-ui/logics/configs/device/useEnableAutoMicSelect.js
diff --git a/src-ui/logics/configs/useEnableAutoSpeakerSelect.js b/src-ui/logics/configs/device/useEnableAutoSpeakerSelect.js
similarity index 100%
rename from src-ui/logics/configs/useEnableAutoSpeakerSelect.js
rename to src-ui/logics/configs/device/useEnableAutoSpeakerSelect.js
diff --git a/src-ui/logics/configs/useMicDeviceList.js b/src-ui/logics/configs/device/useMicDeviceList.js
similarity index 100%
rename from src-ui/logics/configs/useMicDeviceList.js
rename to src-ui/logics/configs/device/useMicDeviceList.js
diff --git a/src-ui/logics/configs/useMicHostList.js b/src-ui/logics/configs/device/useMicHostList.js
similarity index 100%
rename from src-ui/logics/configs/useMicHostList.js
rename to src-ui/logics/configs/device/useMicHostList.js
diff --git a/src-ui/logics/configs/useMicThreshold.js b/src-ui/logics/configs/device/useMicThreshold.js
similarity index 100%
rename from src-ui/logics/configs/useMicThreshold.js
rename to src-ui/logics/configs/device/useMicThreshold.js
diff --git a/src-ui/logics/configs/useSelectedMicDevice.js b/src-ui/logics/configs/device/useSelectedMicDevice.js
similarity index 100%
rename from src-ui/logics/configs/useSelectedMicDevice.js
rename to src-ui/logics/configs/device/useSelectedMicDevice.js
diff --git a/src-ui/logics/configs/useSelectedMicHost.js b/src-ui/logics/configs/device/useSelectedMicHost.js
similarity index 100%
rename from src-ui/logics/configs/useSelectedMicHost.js
rename to src-ui/logics/configs/device/useSelectedMicHost.js
diff --git a/src-ui/logics/configs/useSelectedSpeakerDevice.js b/src-ui/logics/configs/device/useSelectedSpeakerDevice.js
similarity index 100%
rename from src-ui/logics/configs/useSelectedSpeakerDevice.js
rename to src-ui/logics/configs/device/useSelectedSpeakerDevice.js
diff --git a/src-ui/logics/configs/useSpeakerDeviceList.js b/src-ui/logics/configs/device/useSpeakerDeviceList.js
similarity index 100%
rename from src-ui/logics/configs/useSpeakerDeviceList.js
rename to src-ui/logics/configs/device/useSpeakerDeviceList.js
diff --git a/src-ui/logics/configs/useSpeakerThreshold.js b/src-ui/logics/configs/device/useSpeakerThreshold.js
similarity index 100%
rename from src-ui/logics/configs/useSpeakerThreshold.js
rename to src-ui/logics/configs/device/useSpeakerThreshold.js
diff --git a/src-ui/logics/configs/index.js b/src-ui/logics/configs/index.js
new file mode 100644
index 00000000..53edfb1a
--- /dev/null
+++ b/src-ui/logics/configs/index.js
@@ -0,0 +1,21 @@
+export { useEnableAutoMicSelect } from "./device/useEnableAutoMicSelect";
+export { useEnableAutoSpeakerSelect } from "./device/useEnableAutoSpeakerSelect";
+export { useMicDeviceList } from "./device/useMicDeviceList";
+export { useMicHostList } from "./device/useMicHostList";
+export { useMicThreshold } from "./device/useMicThreshold";
+export { useSelectedMicDevice } from "./device/useSelectedMicDevice";
+export { useSelectedMicHost } from "./device/useSelectedMicHost";
+export { useSelectedSpeakerDevice } from "./device/useSelectedSpeakerDevice";
+export { useSpeakerDeviceList } from "./device/useSpeakerDeviceList";
+export { useSpeakerThreshold } from "./device/useSpeakerThreshold";
+
+export { useMessageLogUiScaling } from "./appearance/useMessageLogUiScaling";
+export { useSelectedFontFamily } from "./appearance/useSelectedFontFamily";
+export { useSendMessageButtonType } from "./appearance/useSendMessageButtonType";
+export { useTransparency } from "./appearance/useTransparency";
+export { useUiLanguage } from "./appearance/useUiLanguage";
+export { useUiScaling } from "./appearance/useUiScaling";
+
+export { useEnableAutoClearMessageBox } from "./others/useEnableAutoClearMessageBox";
+
+export { useSoftwareVersion } from "./useSoftwareVersion";
\ No newline at end of file
diff --git a/src-ui/logics/configs/useEnableAutoClearMessageBox.js b/src-ui/logics/configs/others/useEnableAutoClearMessageBox.js
similarity index 100%
rename from src-ui/logics/configs/useEnableAutoClearMessageBox.js
rename to src-ui/logics/configs/others/useEnableAutoClearMessageBox.js
diff --git a/src-ui/logics/main/index.js b/src-ui/logics/main/index.js
new file mode 100644
index 00000000..a86b3484
--- /dev/null
+++ b/src-ui/logics/main/index.js
@@ -0,0 +1,5 @@
+export { useIsMainPageCompactMode } from "./useIsMainPageCompactMode";
+export { useLanguageSettings } from "./useLanguageSettings";
+export { useMainFunction } from "./useMainFunction";
+export { useMessageInputBoxRatio } from "./useMessageInputBoxRatio";
+export { useSelectableLanguageList } from "./useSelectableLanguageList";
\ No newline at end of file
diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js
index 06887605..da3ae189 100644
--- a/src-ui/logics/useReceiveRoutes.js
+++ b/src-ui/logics/useReceiveRoutes.js
@@ -1,36 +1,39 @@
import { translator_status } from "@data";
-
import { arrayToObject } from "@utils/arrayToObject";
-import { useMessage } from "@logics_common/useMessage";
-import { useVolume } from "@logics_common/useVolume";
+import {
+ useMessage,
+ useVolume,
+} from "@logics_common";
-import { useMainFunction } from "@logics_main/useMainFunction";
-import { useSelectableLanguageList } from "@logics_main/useSelectableLanguageList";
-import { useLanguageSettings } from "@logics_main/useLanguageSettings";
-import { useIsMainPageCompactMode } from "@logics_main/useIsMainPageCompactMode";
-import { useMessageInputBoxRatio } from "@logics_main/useMessageInputBoxRatio";
+import {
+ useMainFunction,
+ useSelectableLanguageList,
+ useLanguageSettings,
+ useIsMainPageCompactMode,
+ useMessageInputBoxRatio,
+} from "@logics_main";
-
-import { useSoftwareVersion } from "@logics_configs/useSoftwareVersion";
-import { useEnableAutoMicSelect } from "@logics_configs/useEnableAutoMicSelect";
-import { useEnableAutoSpeakerSelect } from "@logics_configs/useEnableAutoSpeakerSelect";
-import { useMicHostList } from "@logics_configs/useMicHostList";
-import { useSelectedMicHost } from "@logics_configs/useSelectedMicHost";
-import { useMicDeviceList } from "@logics_configs/useMicDeviceList";
-import { useSelectedMicDevice } from "@logics_configs/useSelectedMicDevice";
-import { useSpeakerDeviceList } from "@logics_configs/useSpeakerDeviceList";
-import { useSelectedSpeakerDevice } from "@logics_configs/useSelectedSpeakerDevice";
-import { useMicThreshold } from "@logics_configs/useMicThreshold";
-import { useSpeakerThreshold } from "@logics_configs/useSpeakerThreshold";
-import { useEnableAutoClearMessageBox } from "@logics_configs/useEnableAutoClearMessageBox";
-import { useSendMessageButtonType } from "@logics_configs/useSendMessageButtonType";
-import { useSelectedFontFamily } from "@logics_configs/useSelectedFontFamily";
-
-import { useUiLanguage } from "@logics_configs/useUiLanguage";
-import { useUiScaling } from "@logics_configs/useUiScaling";
-import { useMessageLogUiScaling } from "@logics_configs/useMessageLogUiScaling";
-import { useTransparency } from "@logics_configs/useTransparency";
+import {
+ useSoftwareVersion,
+ useEnableAutoMicSelect,
+ useEnableAutoSpeakerSelect,
+ useMicHostList,
+ useSelectedMicHost,
+ useMicDeviceList,
+ useSelectedMicDevice,
+ useSpeakerDeviceList,
+ useSelectedSpeakerDevice,
+ useMicThreshold,
+ useSpeakerThreshold,
+ useEnableAutoClearMessageBox,
+ useSendMessageButtonType,
+ useSelectedFontFamily,
+ useUiLanguage,
+ useUiScaling,
+ useMessageLogUiScaling,
+ useTransparency,
+} from "@logics_configs";
export const useReceiveRoutes = () => {
const { updateIsMainPageCompactMode } = useIsMainPageCompactMode();