[Refactor] Refactor the way import files.

Organize some codes.
This commit is contained in:
Sakamoto Shiina
2024-10-11 00:23:52 +09:00
parent 4de48edbc1
commit d44c2dd7d9
44 changed files with 157 additions and 114 deletions

View File

@@ -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();

View File

@@ -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();

View File

@@ -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 (
<div className={styles.container}>
@@ -14,8 +21,7 @@ export const ThresholdComponent = (props) => {
</div>
);
};
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,

View File

@@ -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();

View File

@@ -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 = () => {
</div>
);
};
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();

View File

@@ -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";

View File

@@ -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();

View File

@@ -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 {

View File

@@ -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";

View File

@@ -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();

View File

@@ -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;

View File

@@ -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("");

View File

@@ -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 = () => {

View File

@@ -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";

View File

@@ -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) => {

View File

@@ -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);

View File

@@ -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();

View File

@@ -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();

View File

@@ -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();

View File

@@ -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();

View File

@@ -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();

View File

@@ -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 = () => {

View File

@@ -0,0 +1,3 @@
export { useIsOpenedConfigPage } from "./useIsOpenedConfigPage";
export { useMessage } from "./useMessage";
export { useVolume } from "./useVolume";

View File

@@ -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 {

View File

@@ -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";

View File

@@ -0,0 +1,5 @@
export { useIsMainPageCompactMode } from "./useIsMainPageCompactMode";
export { useLanguageSettings } from "./useLanguageSettings";
export { useMainFunction } from "./useMainFunction";
export { useMessageInputBoxRatio } from "./useMessageInputBoxRatio";
export { useSelectableLanguageList } from "./useSelectableLanguageList";

View File

@@ -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();